From: Alexander Lobakin <aleksander.lobakin@intel.com>
To: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: "Alexander Lobakin" <aleksander.lobakin@intel.com>,
"Alexei Starovoitov" <ast@kernel.org>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"John Fastabend" <john.fastabend@gmail.com>,
"Andrii Nakryiko" <andrii@kernel.org>,
"Peter Zijlstra" <peterz@infradead.org>,
"Josh Poimboeuf" <jpoimboe@kernel.org>,
"Jose E. Marchesi" <jose.marchesi@oracle.com>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
"Magnus Karlsson" <magnus.karlsson@intel.com>,
"Maciej Fijalkowski" <maciej.fijalkowski@intel.com>,
"Przemek Kitszel" <przemyslaw.kitszel@intel.com>,
"Jason Baron" <jbaron@akamai.com>,
"Casey Schaufler" <casey@schaufler-ca.com>,
"Nathan Chancellor" <nathan@kernel.org>,
nex.sw.ncis.osdt.itp.upstreaming@intel.com, bpf@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 09/12] page_pool: add a couple of netmem counterparts
Date: Wed, 11 Dec 2024 18:26:46 +0100 [thread overview]
Message-ID: <20241211172649.761483-10-aleksander.lobakin@intel.com> (raw)
In-Reply-To: <20241211172649.761483-1-aleksander.lobakin@intel.com>
Add the following Page Pool netmem wrappers to be able to implement
an MP-agnostic driver:
* page_pool{,_dev}_alloc_best_fit_netmem()
Same as page_pool{,_dev}_alloc(). Make the latter a wrapper around
the new helper (as a page is always a netmem, but not vice versa).
'page_pool_alloc_netmem' is already busy, hence '_best_fit' (which
also says what the helper tries to do).
* page_pool_dma_sync_for_cpu_netmem()
Same as page_pool_dma_sync_for_cpu(). Performs DMA sync only if
the netmem comes from the host.
Signed-off-by: Alexander Lobakin <aleksander.lobakin@intel.com>
---
include/net/page_pool/helpers.h | 46 ++++++++++++++++++++++++++-------
1 file changed, 37 insertions(+), 9 deletions(-)
diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h
index 26caa2c20912..d75d10678958 100644
--- a/include/net/page_pool/helpers.h
+++ b/include/net/page_pool/helpers.h
@@ -115,22 +115,22 @@ static inline struct page *page_pool_dev_alloc_frag(struct page_pool *pool,
return page_pool_alloc_frag(pool, offset, size, gfp);
}
-static inline struct page *page_pool_alloc(struct page_pool *pool,
- unsigned int *offset,
- unsigned int *size, gfp_t gfp)
+static inline netmem_ref
+page_pool_alloc_best_fit_netmem(struct page_pool *pool, unsigned int *offset,
+ unsigned int *size, gfp_t gfp)
{
unsigned int max_size = PAGE_SIZE << pool->p.order;
- struct page *page;
+ netmem_ref netmem;
if ((*size << 1) > max_size) {
*size = max_size;
*offset = 0;
- return page_pool_alloc_pages(pool, gfp);
+ return page_pool_alloc_netmem(pool, gfp);
}
- page = page_pool_alloc_frag(pool, offset, *size, gfp);
- if (unlikely(!page))
- return NULL;
+ netmem = page_pool_alloc_frag_netmem(pool, offset, *size, gfp);
+ if (unlikely(!netmem))
+ return 0;
/* There is very likely not enough space for another fragment, so append
* the remaining size to the current fragment to avoid truesize
@@ -141,7 +141,25 @@ static inline struct page *page_pool_alloc(struct page_pool *pool,
pool->frag_offset = max_size;
}
- return page;
+ return netmem;
+}
+
+static inline netmem_ref
+page_pool_dev_alloc_best_fit_netmem(struct page_pool *pool,
+ unsigned int *offset,
+ unsigned int *size)
+{
+ gfp_t gfp = GFP_ATOMIC | __GFP_NOWARN;
+
+ return page_pool_alloc_best_fit_netmem(pool, offset, size, gfp);
+}
+
+static inline struct page *page_pool_alloc(struct page_pool *pool,
+ unsigned int *offset,
+ unsigned int *size, gfp_t gfp)
+{
+ return netmem_to_page(page_pool_alloc_best_fit_netmem(pool, offset,
+ size, gfp));
}
/**
@@ -440,6 +458,16 @@ static inline void page_pool_dma_sync_for_cpu(const struct page_pool *pool,
page_pool_get_dma_dir(pool));
}
+static inline void
+page_pool_dma_sync_for_cpu_netmem(const struct page_pool *pool,
+ netmem_ref netmem, u32 offset,
+ u32 dma_sync_size)
+{
+ if (!netmem_is_net_iov(netmem))
+ page_pool_dma_sync_for_cpu(pool, netmem_to_page(netmem),
+ offset, dma_sync_size);
+}
+
static inline bool page_pool_put(struct page_pool *pool)
{
return refcount_dec_and_test(&pool->user_cnt);
--
2.47.1
next prev parent reply other threads:[~2024-12-11 17:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-11 17:26 [PATCH net-next 00/12] xdp: a fistful of generic changes pt. II Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 01/12] page_pool: allow mixing PPs within one bulk Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 02/12] xdp: get rid of xdp_frame::mem.id Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 03/12] xdp: make __xdp_return() MP-agnostic Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 04/12] xdp: add generic xdp_buff_add_frag() Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 05/12] xdp: add generic xdp_build_skb_from_buff() Alexander Lobakin
2024-12-13 2:11 ` Jakub Kicinski
2024-12-13 17:25 ` Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 06/12] xsk: make xsk_buff_add_frag really add the frag via __xdp_buff_add_frag() Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 07/12] xsk: add generic XSk &xdp_buff -> skb conversion Alexander Lobakin
2024-12-13 2:19 ` Jakub Kicinski
2024-12-13 17:31 ` Alexander Lobakin
2024-12-14 2:31 ` Jakub Kicinski
2024-12-11 17:26 ` [PATCH net-next 08/12] xsk: add helper to get &xdp_desc's DMA and meta pointer in one go Alexander Lobakin
2024-12-11 17:26 ` Alexander Lobakin [this message]
2024-12-13 19:13 ` [PATCH net-next 09/12] page_pool: add a couple of netmem counterparts Mina Almasry
2024-12-16 15:58 ` Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 10/12] skbuff: allow 2-4-argument skb_frag_dma_map() Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 11/12] jump_label: export static_key_slow_{inc,dec}_cpuslocked() Alexander Lobakin
2024-12-11 17:40 ` Josh Poimboeuf
2024-12-13 17:22 ` Alexander Lobakin
2024-12-14 3:24 ` Josh Poimboeuf
2024-12-16 16:02 ` Alexander Lobakin
2024-12-11 17:26 ` [PATCH net-next 12/12] unroll: add generic loop unroll helpers Alexander Lobakin
2024-12-13 2:50 ` [PATCH net-next 00/12] xdp: a fistful of generic changes pt. II 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=20241211172649.761483-10-aleksander.lobakin@intel.com \
--to=aleksander.lobakin@intel.com \
--cc=andrew+netdev@lunn.ch \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=casey@schaufler-ca.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jbaron@akamai.com \
--cc=john.fastabend@gmail.com \
--cc=jose.marchesi@oracle.com \
--cc=jpoimboe@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=nathan@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nex.sw.ncis.osdt.itp.upstreaming@intel.com \
--cc=pabeni@redhat.com \
--cc=peterz@infradead.org \
--cc=przemyslaw.kitszel@intel.com \
--cc=toke@redhat.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