From: Yunsheng Lin <linyunsheng@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>
Cc: <alexander.duyck@gmail.com>, <linux@armlinux.org.uk>,
<mw@semihalf.com>, <linuxarm@openeuler.org>,
<yisen.zhuang@huawei.com>, <salil.mehta@huawei.com>,
<thomas.petazzoni@bootlin.com>, <hawk@kernel.org>,
<ilias.apalodimas@linaro.org>, <ast@kernel.org>,
<daniel@iogearbox.net>, <john.fastabend@gmail.com>,
<akpm@linux-foundation.org>, <peterz@infradead.org>,
<will@kernel.org>, <willy@infradead.org>, <vbabka@suse.cz>,
<fenghua.yu@intel.com>, <guro@fb.com>, <peterx@redhat.com>,
<feng.tang@intel.com>, <jgg@ziepe.ca>, <mcroce@microsoft.com>,
<hughd@google.com>, <jonathan.lemon@gmail.com>, <alobakin@pm.me>,
<willemb@google.com>, <wenxu@ucloud.cn>,
<cong.wang@bytedance.com>, <haokexin@gmail.com>,
<nogikh@google.com>, <elver@google.com>, <yhs@fb.com>,
<kpsingh@kernel.org>, <andrii@kernel.org>, <kafai@fb.com>,
<songliubraving@fb.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <bpf@vger.kernel.org>,
<chenhao288@hisilicon.com>, <edumazet@google.com>,
<yoshfuji@linux-ipv6.org>, <dsahern@kernel.org>,
<memxor@gmail.com>, <linux@rempel-privat.de>,
<atenart@kernel.org>, <weiwan@google.com>, <ap420073@gmail.com>,
<arnd@arndb.de>, <mathew.j.martineau@linux.intel.com>,
<aahringo@redhat.com>, <ceggers@arri.de>, <yangbo.lu@nxp.com>,
<fw@strlen.de>, <xiangxia.m.yue@gmail.com>,
<linmiaohe@huawei.com>
Subject: [PATCH RFC 4/7] net: pfrag_pool: add pfrag pool support based on page pool
Date: Wed, 18 Aug 2021 11:32:20 +0800 [thread overview]
Message-ID: <1629257542-36145-5-git-send-email-linyunsheng@huawei.com> (raw)
In-Reply-To: <1629257542-36145-1-git-send-email-linyunsheng@huawei.com>
This patch add the pfrag pool support based on page pool.
Caller need to call pfrag_pool_updata_napi() to connect the
pfrag pool to the page pool through napi.
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
---
include/net/pfrag_pool.h | 24 +++++++++++++
net/core/Makefile | 1 +
net/core/pfrag_pool.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 117 insertions(+)
create mode 100644 include/net/pfrag_pool.h
create mode 100644 net/core/pfrag_pool.c
diff --git a/include/net/pfrag_pool.h b/include/net/pfrag_pool.h
new file mode 100644
index 0000000..2abea26
--- /dev/null
+++ b/include/net/pfrag_pool.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _PAGE_FRAG_H
+#define _PAGE_FRAG_H
+
+#include <linux/gfp.h>
+#include <linux/llist.h>
+#include <linux/mm_types_task.h>
+#include <net/page_pool.h>
+
+struct pfrag_pool {
+ struct page_frag frag;
+ long frag_users;
+ unsigned int napi_id;
+ struct page_pool *pp;
+ struct pp_alloc_cache alloc;
+};
+
+void pfrag_pool_updata_napi(struct pfrag_pool *pool,
+ unsigned int napi_id);
+struct page_frag *pfrag_pool_refill(struct pfrag_pool *pool, gfp_t gfp);
+void pfrag_pool_commit(struct pfrag_pool *pool, unsigned int sz,
+ bool merge);
+void pfrag_pool_flush(struct pfrag_pool *pool);
+#endif
diff --git a/net/core/Makefile b/net/core/Makefile
index 35ced62..171f839 100644
--- a/net/core/Makefile
+++ b/net/core/Makefile
@@ -14,6 +14,7 @@ obj-y += dev.o dev_addr_lists.o dst.o netevent.o \
fib_notifier.o xdp.o flow_offload.o
obj-y += net-sysfs.o
+obj-y += pfrag_pool.o
obj-$(CONFIG_PAGE_POOL) += page_pool.o
obj-$(CONFIG_PROC_FS) += net-procfs.o
obj-$(CONFIG_NET_PKTGEN) += pktgen.o
diff --git a/net/core/pfrag_pool.c b/net/core/pfrag_pool.c
new file mode 100644
index 0000000..6ad1383
--- /dev/null
+++ b/net/core/pfrag_pool.c
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/align.h>
+#include <linux/dma-mapping.h>
+#include <linux/mm.h>
+#include <linux/netdevice.h>
+#include <net/pfrag_pool.h>
+
+#define BAIS_MAX (LONG_MAX / 2)
+
+void pfrag_pool_updata_napi(struct pfrag_pool *pool,
+ unsigned int napi_id)
+{
+ struct page_pool *pp;
+
+ if (!pool || pool->napi_id == napi_id)
+ return;
+
+ pr_info("frag pool %pK's napi id changed from %u to %u\n",
+ pool, pool->napi_id, napi_id);
+
+ rcu_read_lock();
+ pp = page_pool_get_by_napi_id(napi_id);
+ if (!pp) {
+ rcu_read_unlock();
+ return;
+ }
+
+ pool->napi_id = napi_id;
+ pool->pp = pp;
+ rcu_read_unlock();
+}
+EXPORT_SYMBOL(pfrag_pool_updata_napi);
+
+struct page_frag *pfrag_pool_refill(struct pfrag_pool *pool, gfp_t gfp)
+{
+ struct page_frag *pfrag = &pool->frag;
+
+ if (!pool || !pool->pp)
+ return NULL;
+
+ if (pfrag->page) {
+ long drain_users;
+
+ if (pfrag->offset < pfrag->size)
+ return pfrag;
+
+ drain_users = BAIS_MAX - pool->frag_users;
+ if (page_pool_drain_frag(pool->pp, pfrag->page, drain_users))
+ goto out;
+ }
+
+ pfrag->page = __page_pool_alloc_pages(pool->pp, &pool->alloc, gfp);
+ if (unlikely(!pfrag->page))
+ return NULL;
+
+out:
+ page_pool_set_frag_count(pfrag->page, BAIS_MAX);
+ pfrag->size = page_size(pfrag->page);
+ pool->frag_users = 0;
+ pfrag->offset = 0;
+ return pfrag;
+}
+EXPORT_SYMBOL(pfrag_pool_refill);
+
+void pfrag_pool_commit(struct pfrag_pool *pool, unsigned int sz,
+ bool merge)
+{
+ struct page_frag *pfrag = &pool->frag;
+
+ pfrag->offset += ALIGN(sz, dma_get_cache_alignment());
+ WARN_ON(pfrag->offset > pfrag->size);
+
+ if (!merge)
+ pool->frag_users++;
+}
+EXPORT_SYMBOL(pfrag_pool_commit);
+
+void pfrag_pool_flush(struct pfrag_pool *pool)
+{
+ struct page_frag *pfrag = &pool->frag;
+
+ page_pool_empty_alloc_cache_once(pool->pp, &pool->alloc);
+
+ if (!pfrag->page)
+ return;
+
+ page_pool_free_frag(pool->pp, pfrag->page,
+ BAIS_MAX - pool->frag_users);
+ pfrag->page = NULL;
+}
+EXPORT_SYMBOL(pfrag_pool_flush);
--
2.7.4
next prev parent reply other threads:[~2021-08-18 3:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 3:32 [PATCH RFC 0/7] add socket to netdev page frag recycling support Yunsheng Lin
2021-08-18 3:32 ` [PATCH RFC 1/7] page_pool: refactor the page pool to support multi alloc context Yunsheng Lin
2021-08-18 3:32 ` [PATCH RFC 2/7] skbuff: add interface to manipulate frag count for tx recycling Yunsheng Lin
2021-08-18 3:32 ` [PATCH RFC 3/7] net: add NAPI api to register and retrieve the page pool ptr Yunsheng Lin
2021-08-18 3:32 ` Yunsheng Lin [this message]
2021-08-18 3:32 ` [PATCH RFC 5/7] sock: support refilling pfrag from pfrag_pool Yunsheng Lin
2021-08-18 3:32 ` [PATCH RFC 6/7] net: hns3: support tx recycling in the hns3 driver Yunsheng Lin
2021-08-18 8:57 ` [PATCH RFC 0/7] add socket to netdev page frag recycling support Eric Dumazet
2021-08-18 9:36 ` Yunsheng Lin
2021-08-23 9:25 ` [Linuxarm] " Yunsheng Lin
2021-08-23 15:04 ` Eric Dumazet
2021-08-24 8:03 ` Yunsheng Lin
2021-08-25 16:29 ` David Ahern
2021-08-25 16:32 ` Eric Dumazet
2021-08-25 16:38 ` David Ahern
2021-08-25 17:24 ` Eric Dumazet
2021-08-26 4:05 ` David Ahern
2021-08-18 22:05 ` David Ahern
2021-08-19 8:18 ` Yunsheng Lin
2021-08-20 14:35 ` David Ahern
2021-08-23 3:32 ` Yunsheng Lin
2021-08-24 3:34 ` David Ahern
2021-08-24 8:41 ` Yunsheng Lin
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=1629257542-36145-5-git-send-email-linyunsheng@huawei.com \
--to=linyunsheng@huawei.com \
--cc=aahringo@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.duyck@gmail.com \
--cc=alobakin@pm.me \
--cc=andrii@kernel.org \
--cc=ap420073@gmail.com \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=atenart@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=ceggers@arri.de \
--cc=chenhao288@hisilicon.com \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=elver@google.com \
--cc=feng.tang@intel.com \
--cc=fenghua.yu@intel.com \
--cc=fw@strlen.de \
--cc=guro@fb.com \
--cc=haokexin@gmail.com \
--cc=hawk@kernel.org \
--cc=hughd@google.com \
--cc=ilias.apalodimas@linaro.org \
--cc=jgg@ziepe.ca \
--cc=john.fastabend@gmail.com \
--cc=jonathan.lemon@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@rempel-privat.de \
--cc=linuxarm@openeuler.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=mcroce@microsoft.com \
--cc=memxor@gmail.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=nogikh@google.com \
--cc=peterx@redhat.com \
--cc=peterz@infradead.org \
--cc=salil.mehta@huawei.com \
--cc=songliubraving@fb.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=vbabka@suse.cz \
--cc=weiwan@google.com \
--cc=wenxu@ucloud.cn \
--cc=will@kernel.org \
--cc=willemb@google.com \
--cc=willy@infradead.org \
--cc=xiangxia.m.yue@gmail.com \
--cc=yangbo.lu@nxp.com \
--cc=yhs@fb.com \
--cc=yisen.zhuang@huawei.com \
--cc=yoshfuji@linux-ipv6.org \
/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).