net/tcp_fastopen: remove tcp_fastopen_ctx_lock
Subsystems (3)
PATCH 1/1 net/tcp_fastopen: remove tcp_fastopen_ctx_lock
From: Eric Dumazet <[email protected]>
Remove the (per netns) spinlock in favor of xchg() atomic operations.
Signed-off-by Eric Dumazet <[email protected]>
Cc Wei Wang <[email protected]>
Cc Yuchung Cheng <[email protected]>
Cc Neal Cardwell <[email protected]>
--- include/net/netns/ipv4.h | 1 - net/ipv4/tcp_fastopen.c | 17 +++-------------- net/ipv4/tcp_ipv4.c | 1 - 3 files changed, 3 insertions(+), 16 deletions(-)
include/net/netns/ipv4.h +0 -1
@@ -174,7 +174,6 @@ struct netns_ipv4 {int sysctl_tcp_fastopen;const struct tcp_congestion_ops __rcu *tcp_congestion_control;struct tcp_fastopen_context __rcu *tcp_fastopen_ctx; -spinlock_t tcp_fastopen_ctx_lock;unsigned int sysctl_tcp_fastopen_blackhole_timeout;atomic_t tfo_active_disable_times;unsigned long tfo_active_disable_stamp;
net/ipv4/tcp_fastopen.c +3 -14
@@ -55,12 +55,7 @@ void tcp_fastopen_ctx_destroy(struct net *net) {struct tcp_fastopen_context *ctxt; -spin_lock (&net->ipv4.tcp_fastopen_ctx_lock); - - ctxt =rcu_dereference_protected (net->ipv4.tcp_fastopen_ctx, -lockdep_is_held (&net->ipv4.tcp_fastopen_ctx_lock)); -rcu_assign_pointer (net->ipv4.tcp_fastopen_ctx,NULL ); -spin_unlock (&net->ipv4.tcp_fastopen_ctx_lock); + ctxt =xchg ((__force struct tcp_fastopen_context **)&net->ipv4.tcp_fastopen_ctx,NULL );if (ctxt)call_rcu (&ctxt->rcu, tcp_fastopen_ctx_free);
@@ -89,18 +84,12 @@ int tcp_fastopen_reset_cipher(struct net *net, struct sock *sk, ctx->num =1 ; } -spin_lock (&net->ipv4.tcp_fastopen_ctx_lock);if (sk) { q = &inet_csk (sk)->icsk_accept_queue.fastopenq; - octx =rcu_dereference_protected (q->ctx, -lockdep_is_held (&net->ipv4.tcp_fastopen_ctx_lock)); -rcu_assign_pointer (q->ctx, ctx); + octx =xchg ((__force struct tcp_fastopen_context **)&q->ctx, ctx); }else { - octx =rcu_dereference_protected (net->ipv4.tcp_fastopen_ctx, -lockdep_is_held (&net->ipv4.tcp_fastopen_ctx_lock)); -rcu_assign_pointer (net->ipv4.tcp_fastopen_ctx, ctx); + octx =xchg ((__force struct tcp_fastopen_context **)&net->ipv4.tcp_fastopen_ctx, ctx); } -spin_unlock (&net->ipv4.tcp_fastopen_ctx_lock);if (octx)call_rcu (&octx->rcu, tcp_fastopen_ctx_free);
net/ipv4/tcp_ipv4.c +0 -1
@@ -2964,7 +2964,6 @@ static int __net_init tcp_sk_init(struct net *net) net->ipv4.sysctl_tcp_comp_sack_slack_ns =100 *NSEC_PER_USEC ; net->ipv4.sysctl_tcp_comp_sack_nr =44 ; net->ipv4.sysctl_tcp_fastopen =TFO_CLIENT_ENABLE ; -spin_lock_init (&net->ipv4.tcp_fastopen_ctx_lock); net->ipv4.sysctl_tcp_fastopen_blackhole_timeout =60 *60 ;atomic_set (&net->ipv4.tfo_active_disable_times,0 );
Signature · 1 line
2.32.0.402.g57bb445576-goog
Quoted 10 lines · Eric Dumazet
From: Eric Dumazet <[email protected]>
Remove the (per netns) spinlock in favor of
xchg()atomic operations.Signed-off-by Eric Dumazet <[email protected]>Cc Wei Wang <[email protected]>Cc Yuchung Cheng <[email protected]>Cc Neal Cardwell <[email protected]>---
Acked-by Wei Wang <[email protected]>
Quoted 71 lines
include/net/netns/ipv4.h | 1 - net/ipv4/tcp_fastopen.c | 17 +++-------------- net/ipv4/tcp_ipv4.c | 1 - 3 files changed, 3 insertions(+), 16 deletions(-)include/net/netns/ipv4.h +0
-1@@ -174,7 +174,6 @@ struct netns_ipv4 {int sysctl_tcp_fastopen;const struct tcp_congestion_ops __rcu *tcp_congestion_control;struct tcp_fastopen_context __rcu *tcp_fastopen_ctx; -spinlock_t tcp_fastopen_ctx_lock;unsigned int sysctl_tcp_fastopen_blackhole_timeout;atomic_t tfo_active_disable_times;unsigned long tfo_active_disable_stamp;net/ipv4/tcp_fastopen.c +3
-14@@ -55,12 +55,7 @@ void tcp_fastopen_ctx_destroy(struct net *net) {struct tcp_fastopen_context *ctxt; -spin_lock (&net->ipv4.tcp_fastopen_ctx_lock); - - ctxt =rcu_dereference_protected (net->ipv4.tcp_fastopen_ctx, -lockdep_is_held (&net->ipv4.tcp_fastopen_ctx_lock)); -rcu_assign_pointer (net->ipv4.tcp_fastopen_ctx,NULL ); -spin_unlock (&net->ipv4.tcp_fastopen_ctx_lock); + ctxt =xchg ((__force struct tcp_fastopen_context **)&net->ipv4.tcp_fastopen_ctx,NULL );if (ctxt)call_rcu (&ctxt->rcu, tcp_fastopen_ctx_free);@@ -89,18 +84,12 @@ int tcp_fastopen_reset_cipher(struct net *net, struct sock *sk, ctx->num =1 ; } -spin_lock (&net->ipv4.tcp_fastopen_ctx_lock);if (sk) { q = &inet_csk (sk)->icsk_accept_queue.fastopenq; - octx =rcu_dereference_protected (q->ctx, -lockdep_is_held (&net->ipv4.tcp_fastopen_ctx_lock)); -rcu_assign_pointer (q->ctx, ctx); + octx =xchg ((__force struct tcp_fastopen_context **)&q->ctx, ctx); }else { - octx =rcu_dereference_protected (net->ipv4.tcp_fastopen_ctx, -lockdep_is_held (&net->ipv4.tcp_fastopen_ctx_lock)); -rcu_assign_pointer (net->ipv4.tcp_fastopen_ctx, ctx); + octx =xchg ((__force struct tcp_fastopen_context **)&net->ipv4.tcp_fastopen_ctx, ctx); } -spin_unlock (&net->ipv4.tcp_fastopen_ctx_lock);if (octx)call_rcu (&octx->rcu, tcp_fastopen_ctx_free);net/ipv4/tcp_ipv4.c +0
-2@@ -2964,7 +2964,6 @@ static int __net_init tcp_sk_init(struct net *net) net->ipv4.sysctl_tcp_comp_sack_slack_ns =100 *NSEC_PER_USEC ; net->ipv4.sysctl_tcp_comp_sack_nr =44 ; net->ipv4.sysctl_tcp_fastopen =TFO_CLIENT_ENABLE ; -spin_lock_init (&net->ipv4.tcp_fastopen_ctx_lock); net->ipv4.sysctl_tcp_fastopen_blackhole_timeout =60 *60 ;atomic_set (&net->ipv4.tfo_active_disable_times,0 ); --2.32.0.402.g57bb445576-goog
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 10 lines · On Mon, 19 Jul 2021 03:11:07 -0700 you wrote:
From: Eric Dumazet <[email protected]>
Remove the (per netns) spinlock in favor of
xchg()atomic operations.Signed-off-by Eric Dumazet <[email protected]>Cc Wei Wang <[email protected]>Cc Yuchung Cheng <[email protected]>Cc Neal Cardwell <[email protected]>[...]
Here is the summary with links:
- [net-next] net/tcp_fastopen: remove tcp_fastopen_ctx_lock
https://git.kernel.org/netdev/net-next/c/e93abb840a2c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html