]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: use napi_skb_cache even in process context
authorEric Dumazet <edumazet@google.com>
Sun, 16 Nov 2025 20:27:17 +0000 (20:27 +0000)
committerJakub Kicinski <kuba@kernel.org>
Wed, 19 Nov 2025 02:25:47 +0000 (18:25 -0800)
This is a followup of commit e20dfbad8aab ("net: fix napi_consume_skb()
with alien skbs").

Now the per-cpu napi_skb_cache is populated from TX completion path,
we can make use of this cache, especially for cpus not used
from a driver NAPI poll (primary user of napi_cache).

We can use the napi_skb_cache only if current context is not from hard irq.

With this patch, I consistently reach 130 Mpps on my UDP tx stress test
and reduce SLUB spinlock contention to smaller values.

Note there is still some SLUB contention for skb->head allocations.

I had to tune /sys/kernel/slab/skbuff_small_head/cpu_partial
and /sys/kernel/slab/skbuff_small_head/min_partial depending
on the platform taxonomy.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Jason Xing <kerneljasonxing@gmail.com>
Tested-by: Jason Xing <kerneljasonxing@gmail.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20251116202717.1542829-4-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/skbuff.c

index 8a0a4ca7fa5dbb2fa3044ee45bb0b9c8c3ca85ea..9feea830a4dbb61c1c661e802ed315eaeebcc809 100644 (file)
@@ -666,7 +666,12 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
                skb = napi_skb_cache_get(true);
                if (unlikely(!skb))
                        return NULL;
+       } else if (!in_hardirq() && !irqs_disabled()) {
+               local_bh_disable();
+               skb = napi_skb_cache_get(false);
+               local_bh_enable();
        }
+
        if (!skb) {
 fallback:
                skb = kmem_cache_alloc_node(cache, gfp_mask & ~GFP_DMA, node);