| Message ID | 5533e6e3-b94b-4fdf-a4b9-a4fcda4ec09e@163.com |
|---|---|
| State | Accepted, archived |
| Commit | fc7e4b80941e8b91091fa86c2a8d2d5a4d89f367 |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | mptcp: fix pr_debug in mptcp_token_new_connect | expand |
On Tue, 2021-04-20 at 18:08 +0800, Jianguo Wu wrote: > From: Jianguo Wu <wujianguo@chinatelecom.cn> > > After commit 2c5ebd001d4f ("mptcp: refactor token container"), > pr_debug() is called before mptcp_crypto_key_gen_sha() in > mptcp_token_new_connect(), so the output local_key, token and > idsn are 0, like: > MPTCP: ssk=00000000f6b3c4a2, local_key=0, token=0, idsn=0 > > Move pr_debug() after mptcp_crypto_key_gen_sha(). > > Fixes: 2c5ebd001d4f ("mptcp: refactor token container") > Signed-off-by: Jianguo Wu <wujianguo@chinatelecom.cn> > --- > net/mptcp/token.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/mptcp/token.c b/net/mptcp/token.c > index 8f0270a..72a24e6 100644 > --- a/net/mptcp/token.c > +++ b/net/mptcp/token.c > @@ -156,9 +156,6 @@ int mptcp_token_new_connect(struct sock *sk) > int retries = TOKEN_MAX_RETRIES; > struct token_bucket *bucket; > > - pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n", > - sk, subflow->local_key, subflow->token, subflow->idsn); > - > again: > mptcp_crypto_key_gen_sha(&subflow->local_key, &subflow->token, > &subflow->idsn); > @@ -172,6 +169,9 @@ int mptcp_token_new_connect(struct sock *sk) > goto again; > } > > + pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n", > + sk, subflow->local_key, subflow->token, subflow->idsn); > + > WRITE_ONCE(msk->token, subflow->token); > __sk_nulls_add_node_rcu((struct sock *)msk, &bucket->msk_chain); > bucket->chain_len++; The patch LGTM, thanks. Paolo
Hi Jianguo, Paolo, On 20/04/2021 12:08, Jianguo Wu wrote: > From: Jianguo Wu <wujianguo@chinatelecom.cn> > > After commit 2c5ebd001d4f ("mptcp: refactor token container"), > pr_debug() is called before mptcp_crypto_key_gen_sha() in > mptcp_token_new_connect(), so the output local_key, token and > idsn are 0, like: > MPTCP: ssk=00000000f6b3c4a2, local_key=0, token=0, idsn=0 > > Move pr_debug() after mptcp_crypto_key_gen_sha(). Just applied in our tree with Paolo's Acked-by tag: - fc7e4b80941e: mptcp: fix pr_debug in mptcp_token_new_connect - Results: e69889ce0094..1545a167aafe Builds and tests are now in progress: - https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210420T202113 - https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210420T202113 Cheers, Matt
diff --git a/net/mptcp/token.c b/net/mptcp/token.c index 8f0270a..72a24e6 100644 --- a/net/mptcp/token.c +++ b/net/mptcp/token.c @@ -156,9 +156,6 @@ int mptcp_token_new_connect(struct sock *sk) int retries = TOKEN_MAX_RETRIES; struct token_bucket *bucket; - pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n", - sk, subflow->local_key, subflow->token, subflow->idsn); - again: mptcp_crypto_key_gen_sha(&subflow->local_key, &subflow->token, &subflow->idsn); @@ -172,6 +169,9 @@ int mptcp_token_new_connect(struct sock *sk) goto again; } + pr_debug("ssk=%p, local_key=%llu, token=%u, idsn=%llu\n", + sk, subflow->local_key, subflow->token, subflow->idsn); + WRITE_ONCE(msk->token, subflow->token); __sk_nulls_add_node_rcu((struct sock *)msk, &bucket->msk_chain); bucket->chain_len++;