From: Alexander Lobakin <alobakin@pm.me>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: "Jonathan Lemon" <jonathan.lemon@gmail.com>,
"Eric Dumazet" <edumazet@google.com>,
"Dmitry Vyukov" <dvyukov@google.com>,
"Willem de Bruijn" <willemb@google.com>,
"Alexander Lobakin" <alobakin@pm.me>,
"Randy Dunlap" <rdunlap@infradead.org>,
"Kevin Hao" <haokexin@gmail.com>,
"Pablo Neira Ayuso" <pablo@netfilter.org>,
"Jakub Sitnicki" <jakub@cloudflare.com>,
"Marco Elver" <elver@google.com>,
"Dexuan Cui" <decui@microsoft.com>,
"Paolo Abeni" <pabeni@redhat.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Alexander Duyck" <alexanderduyck@fb.com>,
"Alexander Duyck" <alexander.duyck@gmail.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Andrii Nakryiko" <andriin@fb.com>,
"Taehee Yoo" <ap420073@gmail.com>, "Wei Wang" <weiwan@google.com>,
"Cong Wang" <xiyou.wangcong@gmail.com>,
"Björn Töpel" <bjorn@kernel.org>,
"Miaohe Lin" <linmiaohe@huawei.com>,
"Guillaume Nault" <gnault@redhat.com>,
"Florian Westphal" <fw@strlen.de>,
"Edward Cree" <ecree.xilinx@gmail.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v6 net-next 09/11] skbuff: allow to optionally use NAPI cache from __alloc_skb()
Date: Sat, 13 Feb 2021 14:12:38 +0000 [thread overview]
Message-ID: <20210213141021.87840-10-alobakin@pm.me> (raw)
In-Reply-To: <20210213141021.87840-1-alobakin@pm.me>
Reuse the old and forgotten SKB_ALLOC_NAPI to add an option to get
an skbuff_head from the NAPI cache instead of inplace allocation
inside __alloc_skb().
This implies that the function is called from softirq or BH-off
context, not for allocating a clone or from a distant node.
Cc: Alexander Duyck <alexander.duyck@gmail.com> # Simplified flags check
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
net/core/skbuff.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9e1a8ded4acc..a80581eed7fc 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -405,7 +405,11 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
gfp_mask |= __GFP_MEMALLOC;
/* Get the HEAD */
- skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
+ if ((flags & (SKB_ALLOC_FCLONE | SKB_ALLOC_NAPI)) == SKB_ALLOC_NAPI &&
+ likely(node == NUMA_NO_NODE || node == numa_mem_id()))
+ skb = napi_skb_cache_get();
+ else
+ skb = kmem_cache_alloc_node(cache, gfp_mask & ~GFP_DMA, node);
if (unlikely(!skb))
return NULL;
prefetchw(skb);
--
2.30.1
next prev parent reply other threads:[~2021-02-13 14:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-13 14:10 [PATCH v6 net-next 00/11] skbuff: introduce skbuff_heads bulking and reusing Alexander Lobakin
2021-02-13 14:11 ` [PATCH v6 net-next 01/11] skbuff: move __alloc_skb() next to the other skb allocation functions Alexander Lobakin
2021-02-13 14:11 ` [PATCH v6 net-next 02/11] skbuff: simplify kmalloc_reserve() Alexander Lobakin
2021-02-13 14:11 ` [PATCH v6 net-next 03/11] skbuff: make __build_skb_around() return void Alexander Lobakin
2021-02-13 14:11 ` [PATCH v6 net-next 04/11] skbuff: simplify __alloc_skb() a bit Alexander Lobakin
2021-02-13 14:11 ` [PATCH v6 net-next 05/11] skbuff: use __build_skb_around() in __alloc_skb() Alexander Lobakin
2021-02-13 14:12 ` [PATCH v6 net-next 06/11] skbuff: remove __kfree_skb_flush() Alexander Lobakin
2021-02-13 14:12 ` [PATCH v6 net-next 07/11] skbuff: move NAPI cache declarations upper in the file Alexander Lobakin
2021-02-13 14:12 ` [PATCH v6 net-next 08/11] skbuff: introduce {,__}napi_build_skb() which reuses NAPI cache heads Alexander Lobakin
2021-02-13 14:12 ` Alexander Lobakin [this message]
2021-02-13 14:12 ` [PATCH v6 net-next 10/11] skbuff: allow to use NAPI cache from __napi_alloc_skb() Alexander Lobakin
2021-02-13 14:13 ` [PATCH v6 net-next 11/11] skbuff: queue NAPI_MERGED_FREE skbs into NAPI cache instead of freeing Alexander Lobakin
2021-02-13 20:30 ` [PATCH v6 net-next 00/11] skbuff: introduce skbuff_heads bulking and reusing Alexander Duyck
2021-02-13 22:50 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210213141021.87840-10-alobakin@pm.me \
--to=alobakin@pm.me \
--cc=alexander.duyck@gmail.com \
--cc=alexanderduyck@fb.com \
--cc=andriin@fb.com \
--cc=ap420073@gmail.com \
--cc=ast@kernel.org \
--cc=bjorn@kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=dvyukov@google.com \
--cc=ecree.xilinx@gmail.com \
--cc=edumazet@google.com \
--cc=elver@google.com \
--cc=fw@strlen.de \
--cc=gnault@redhat.com \
--cc=haokexin@gmail.com \
--cc=jakub@cloudflare.com \
--cc=jonathan.lemon@gmail.com \
--cc=kuba@kernel.org \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pablo@netfilter.org \
--cc=rdunlap@infradead.org \
--cc=weiwan@google.com \
--cc=willemb@google.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).