| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 18 Aug 2021 11:32:20 +0800
From: Yunsheng Lin <linyunsheng@...wei.com>
To: <davem@...emloft.net>, <kuba@...nel.org>
CC: <alexander.duyck@...il.com>, <linux@...linux.org.uk>,
<mw@...ihalf.com>, <linuxarm@...neuler.org>,
<yisen.zhuang@...wei.com>, <salil.mehta@...wei.com>,
<thomas.petazzoni@...tlin.com>, <hawk@...nel.org>,
<ilias.apalodimas@...aro.org>, <ast@...nel.org>,
<daniel@...earbox.net>, <john.fastabend@...il.com>,
<akpm@...ux-foundation.org>, <peterz@...radead.org>,
<will@...nel.org>, <willy@...radead.org>, <vbabka@...e.cz>,
<fenghua.yu@...el.com>, <guro@...com>, <peterx@...hat.com>,
<feng.tang@...el.com>, <jgg@...pe.ca>, <mcroce@...rosoft.com>,
<hughd@...gle.com>, <jonathan.lemon@...il.com>, <alobakin@...me>,
<willemb@...gle.com>, <wenxu@...oud.cn>, <cong.wang@...edance.com>,
<haokexin@...il.com>, <nogikh@...gle.com>, <elver@...gle.com>,
<yhs@...com>, <kpsingh@...nel.org>, <andrii@...nel.org>,
<kafai@...com>, <songliubraving@...com>, <netdev@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <bpf@...r.kernel.org>,
<chenhao288@...ilicon.com>, <edumazet@...gle.com>,
<yoshfuji@...ux-ipv6.org>, <dsahern@...nel.org>,
<memxor@...il.com>, <linux@...pel-privat.de>, <atenart@...nel.org>,
<weiwan@...gle.com>, <ap420073@...il.com>, <arnd@...db.de>,
<mathew.j.martineau@...ux.intel.com>, <aahringo@...hat.com>,
<ceggers@...i.de>, <yangbo.lu@....com>, <fw@...len.de>,
<xiangxia.m.yue@...il.com>, <linmiaohe@...wei.com>
Subject: [PATCH RFC 4/7] net: pfrag_pool: add pfrag pool support based on page pool
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@...wei.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
Powered by blists - more mailing lists