tcp: tcp_wfree() refactoring
Subsystems (3)
PATCH 1/1 tcp: tcp_wfree() refactoring
Use try_cmpxchg() (instead of cmpxchg()) in a more readable way.
oval = smp_load_acquire(&sk->sk_tsq_flags);
do {
...
} while (!try_cmpxchg(&sk->sk_tsq_flags, &oval, nval));Reduce indentation level.
Signed-off-by Eric Dumazet <[email protected]>
--- net/ipv4/tcp_output.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-)
net/ipv4/tcp_output.c +14 -17
@@ -1139,6 +1139,8 @@ void tcp_wfree(struct sk_buff *skb)struct sock *sk = skb->sk;struct tcp_sock *tp =tcp_sk (sk);unsigned long flags, nval, oval; +struct tsq_tasklet *tsq; +bool empty;/* Keep one reference on sk_wmem_alloc. * Will be released by sk_free() from here or tcp_tasklet_func()
@@ -1155,28 +1157,23 @@ void tcp_wfree(struct sk_buff *skb)if (refcount_read (&sk->sk_wmem_alloc) >=SKB_TRUESIZE (1 ) &&this_cpu_ksoftirqd () == current) goto out; -for (oval =READ_ONCE (sk->sk_tsq_flags);; oval = nval) { -struct tsq_tasklet *tsq; -bool empty; - + oval =smp_load_acquire (&sk->sk_tsq_flags); +do {if (!(oval &TSQF_THROTTLED ) || (oval &TSQF_QUEUED )) goto out; nval = (oval & ~TSQF_THROTTLED ) |TSQF_QUEUED ; - nval =cmpxchg (&sk->sk_tsq_flags, oval, nval); -if (nval != oval) -continue ; + }while (!try_cmpxchg (&sk->sk_tsq_flags, &oval, nval)); -/* queue this socket to tasklet queue */ -local_irq_save (flags); - tsq =this_cpu_ptr (&tsq_tasklet); - empty =list_empty (&tsq->head); -list_add (&tp->tsq_node, &tsq->head); -if (empty) -tasklet_schedule (&tsq->tasklet); -local_irq_restore (flags); -return ; - } +/* queue this socket to tasklet queue */ +local_irq_save (flags); + tsq =this_cpu_ptr (&tsq_tasklet); + empty =list_empty (&tsq->head); +list_add (&tp->tsq_node, &tsq->head); +if (empty) +tasklet_schedule (&tsq->tasklet); +local_irq_restore (flags); +return ; out:sk_free (sk); }
Signature · 1 line
2.38.1.431.g37b22c650d-goog
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 10 Nov 2022 19:02:39 +0000 you wrote:
Use
try_cmpxchg()(instead ofcmpxchg()) in a more readable way.oval =
smp_load_acquire(&sk->sk_tsq_flags);do { ... } while (!try_cmpxchg(&sk->sk_tsq_flags, &oval, nval));[...]
Here is the summary with links:
- [net-next] tcp: tcp_wfree() refactoring
https://git.kernel.org/netdev/net-next/c/b548b17a93fd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html