Use refcounter for secure session #17599
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
PR #17599: Size comparison from eeb9434 to 98a4066 Increases above 0.2%:
Increases (26 builds for cc13x2_26x2, cyw30739, k32w, linux, mbed, p6, telink)
Decreases (1 build for telink)
Full report (26 builds for cc13x2_26x2, cyw30739, k32w, linux, mbed, p6, telink)
|
|
PR #17599: Size comparison from eeb9434 to 9cfdd9e Increases above 0.2%:
Increases (29 builds for cc13x2_26x2, cyw30739, efr32, k32w, linux, mbed, p6, telink)
Decreases (1 build for telink)
Full report (29 builds for cc13x2_26x2, cyw30739, efr32, k32w, linux, mbed, p6, telink)
|
|
PR #17599: Size comparison from 6109d14 to 2c1e1ae Increases above 0.2%:
Increases (23 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (1 build for telink)
Full report (23 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
|
@kghost The RAM increases here are a lot more than I was expecting, given we only have 16 secure sessions around.... |
|
Hmm, I need to take a deep look into it |
|
Here is the layout of class SecureSession : public Session, public ReferenceCounted<chip::Transport::SecureSession, chip::Transport::SecureSessionDeleter, 0> {
/* class Session <ancestor>; */ /* 0 16 */
/* XXX last struct has 3 bytes of padding */
/* class ReferenceCounted<chip::Transport::SecureSession, chip::Transport::SecureSessionDeleter, 0> <ancestor>; */ /* 16 4 */
enum State mState; /* 20 1 */
const enum Type mSecureSessionType; /* 21 1 */
/* XXX 2 bytes hole, try to pack */
class SecureSessionTable & mTable; /* 24 4 */
/* XXX 4 bytes hole, try to pack */
NodeId mPeerNodeId; /* 32 8 */
struct CATValues mPeerCATs; /* 40 12 */
const uint16_t mLocalSessionId; /* 52 2 */
uint16_t mPeerSessionId; /* 54 2 */
class PeerAddress mPeerAddress; /* 56 24 */
/* --- cacheline 1 boundary (64 bytes) was 16 bytes ago --- */
Timestamp mLastActivityTime; /* 80 8 */
Timestamp mLastPeerActivityTime; /* 88 8 */
struct ReliableMessageProtocolConfig mMRPConfig; /* 96 8 */
class CryptoContext mCryptoContext; /* 104 60 */
/* --- cacheline 2 boundary (128 bytes) was 36 bytes ago --- */
class SessionMessageCounter mSessionMessageCounter; /* 164 20 */
/* size: 184, cachelines: 3, members: 15 */
/* sum members: 158, holes: 2, sum holes: 6 */
/* paddings: 1, sum paddings: 3 */
/* last cacheline: 56 bytes */
}This PR adds 9 bytes to the object and also introduce 7 padding. Total increased 16 bytes per object |
|
PR #17599: Size comparison from 6109d14 to 4ccc30a Increases above 0.2%:
Increases (23 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (2 builds for cc13x2_26x2)
Full report (23 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
|
PR #17599: Size comparison from 6109d14 to e32156d Increases above 0.2%:
Increases (23 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (2 builds for cc13x2_26x2)
Full report (23 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
|
PR #17599: Size comparison from 7ce2a05 to 93042f3 Increases above 0.2%:
Increases (7 builds for cyw30739, linux, mbed, telink)
Full report (7 builds for cyw30739, linux, mbed, telink)
|
|
PR #17599: Size comparison from 7ce2a05 to f1352f0 Increases above 0.2%:
Increases (32 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (2 builds for cc13x2_26x2)
Full report (32 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
pullapprove
bot
requested review from
andy31415,
anush-apple,
austinh0,
Byungjoo-Lee,
bzbarsky-apple and
carol-apple
|
PR #17599: Size comparison from 44dd01b to 448656a Increases above 0.2%:
Increases (34 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (4 builds for cc13x2_26x2)
Full report (34 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
mrjerryjohns
reviewed
May 9, 2022
|
PR #17599: Size comparison from 2580fb3 to 652f285 Increases above 0.2%:
Increases (25 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (4 builds for cc13x2_26x2)
Full report (25 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
2 tasks
|
PR #17599: Size comparison from a777a80 to 9906f95 Increases above 0.2%:
Increases (37 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (5 builds for cc13x2_26x2)
Full report (37 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
|
PR #17599: Size comparison from f360a70 to c8074e1 Increases above 0.2%:
Increases (31 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Full report (31 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
|
PR #17599: Size comparison from d222519 to e40750e Increases above 0.2%:
Increases (37 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
Decreases (5 builds for cc13x2_26x2)
Full report (37 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
|
mrjerryjohns
approved these changes
May 20, 2022
|
fast track because open for 29 days. |
kghost
added a commit
to kghost/connectedhomeip
that referenced
this pull request
Jun 7, 2022
kghost
added a commit
to kghost/connectedhomeip
that referenced
this pull request
Jun 8, 2022
kghost
added a commit
to kghost/connectedhomeip
that referenced
this pull request
Jun 8, 2022
bzbarsky-apple
pushed a commit
that referenced
this pull request
Jun 8, 2022
mkardous-silabs
pushed a commit
to mkardous-silabs/connectedhomeip
that referenced
this pull request
Jun 10, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Fix #17558
Use ref counter for secure session, here are how it works:
SecureSessionstarts at 0 refPairingSession::mSecureSessionHolderis its first refSecureSession::Activateit obtain a ref for itselfSecureSession::MarkForRemovalrelease the ref at step 3.SecureSession::MarkForRemovalwill clear all session holder, and prevent any future holder grabbing the sessionSessionHandleis released, the ref count of the session will be decreased to 0Change overview
kPairing,kActive,kPendingRemovalkPairing(waskPending) fromSessionTypeSessionTypeis assigned at beginning of pairing, shifted fromActivateTesting
WIP