138 lines
3.8 KiB
Diff
138 lines
3.8 KiB
Diff
From 7c48cb0176c6d6d3b55029f7ff4ffa05faee6446 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 21 Jan 2022 11:09:50 +0100
|
|
Subject: [PATCH] xdp: add frags support to xdp_return_{buff/frame}
|
|
|
|
Take into account if the received xdp_buff/xdp_frame is non-linear
|
|
recycling/returning the frame memory to the allocator or into
|
|
xdp_frame_bulk.
|
|
|
|
Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com>
|
|
Acked-by: John Fastabend <john.fastabend@gmail.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://lore.kernel.org/r/a961069febc868508ce1bdf5e53a343eb4e57cb2.1642758637.git.lorenzo@kernel.org
|
|
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|
---
|
|
include/net/xdp.h | 18 ++++++++++++++--
|
|
net/core/xdp.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-
|
|
2 files changed, 69 insertions(+), 3 deletions(-)
|
|
|
|
--- a/include/net/xdp.h
|
|
+++ b/include/net/xdp.h
|
|
@@ -275,10 +275,24 @@ void __xdp_release_frame(void *data, str
|
|
static inline void xdp_release_frame(struct xdp_frame *xdpf)
|
|
{
|
|
struct xdp_mem_info *mem = &xdpf->mem;
|
|
+ struct skb_shared_info *sinfo;
|
|
+ int i;
|
|
|
|
/* Curr only page_pool needs this */
|
|
- if (mem->type == MEM_TYPE_PAGE_POOL)
|
|
- __xdp_release_frame(xdpf->data, mem);
|
|
+ if (mem->type != MEM_TYPE_PAGE_POOL)
|
|
+ return;
|
|
+
|
|
+ if (likely(!xdp_frame_has_frags(xdpf)))
|
|
+ goto out;
|
|
+
|
|
+ sinfo = xdp_get_shared_info_from_frame(xdpf);
|
|
+ for (i = 0; i < sinfo->nr_frags; i++) {
|
|
+ struct page *page = skb_frag_page(&sinfo->frags[i]);
|
|
+
|
|
+ __xdp_release_frame(page_address(page), mem);
|
|
+ }
|
|
+out:
|
|
+ __xdp_release_frame(xdpf->data, mem);
|
|
}
|
|
|
|
int xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq,
|
|
--- a/net/core/xdp.c
|
|
+++ b/net/core/xdp.c
|
|
@@ -409,12 +409,38 @@ static void __xdp_return(void *data, str
|
|
|
|
void xdp_return_frame(struct xdp_frame *xdpf)
|
|
{
|
|
+ struct skb_shared_info *sinfo;
|
|
+ int i;
|
|
+
|
|
+ if (likely(!xdp_frame_has_frags(xdpf)))
|
|
+ goto out;
|
|
+
|
|
+ sinfo = xdp_get_shared_info_from_frame(xdpf);
|
|
+ for (i = 0; i < sinfo->nr_frags; i++) {
|
|
+ struct page *page = skb_frag_page(&sinfo->frags[i]);
|
|
+
|
|
+ __xdp_return(page_address(page), &xdpf->mem, false, NULL);
|
|
+ }
|
|
+out:
|
|
__xdp_return(xdpf->data, &xdpf->mem, false, NULL);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xdp_return_frame);
|
|
|
|
void xdp_return_frame_rx_napi(struct xdp_frame *xdpf)
|
|
{
|
|
+ struct skb_shared_info *sinfo;
|
|
+ int i;
|
|
+
|
|
+ if (likely(!xdp_frame_has_frags(xdpf)))
|
|
+ goto out;
|
|
+
|
|
+ sinfo = xdp_get_shared_info_from_frame(xdpf);
|
|
+ for (i = 0; i < sinfo->nr_frags; i++) {
|
|
+ struct page *page = skb_frag_page(&sinfo->frags[i]);
|
|
+
|
|
+ __xdp_return(page_address(page), &xdpf->mem, true, NULL);
|
|
+ }
|
|
+out:
|
|
__xdp_return(xdpf->data, &xdpf->mem, true, NULL);
|
|
}
|
|
EXPORT_SYMBOL_GPL(xdp_return_frame_rx_napi);
|
|
@@ -450,7 +476,7 @@ void xdp_return_frame_bulk(struct xdp_fr
|
|
struct xdp_mem_allocator *xa;
|
|
|
|
if (mem->type != MEM_TYPE_PAGE_POOL) {
|
|
- __xdp_return(xdpf->data, &xdpf->mem, false, NULL);
|
|
+ xdp_return_frame(xdpf);
|
|
return;
|
|
}
|
|
|
|
@@ -469,12 +495,38 @@ void xdp_return_frame_bulk(struct xdp_fr
|
|
bq->xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params);
|
|
}
|
|
|
|
+ if (unlikely(xdp_frame_has_frags(xdpf))) {
|
|
+ struct skb_shared_info *sinfo;
|
|
+ int i;
|
|
+
|
|
+ sinfo = xdp_get_shared_info_from_frame(xdpf);
|
|
+ for (i = 0; i < sinfo->nr_frags; i++) {
|
|
+ skb_frag_t *frag = &sinfo->frags[i];
|
|
+
|
|
+ bq->q[bq->count++] = skb_frag_address(frag);
|
|
+ if (bq->count == XDP_BULK_QUEUE_SIZE)
|
|
+ xdp_flush_frame_bulk(bq);
|
|
+ }
|
|
+ }
|
|
bq->q[bq->count++] = xdpf->data;
|
|
}
|
|
EXPORT_SYMBOL_GPL(xdp_return_frame_bulk);
|
|
|
|
void xdp_return_buff(struct xdp_buff *xdp)
|
|
{
|
|
+ struct skb_shared_info *sinfo;
|
|
+ int i;
|
|
+
|
|
+ if (likely(!xdp_buff_has_frags(xdp)))
|
|
+ goto out;
|
|
+
|
|
+ sinfo = xdp_get_shared_info_from_buff(xdp);
|
|
+ for (i = 0; i < sinfo->nr_frags; i++) {
|
|
+ struct page *page = skb_frag_page(&sinfo->frags[i]);
|
|
+
|
|
+ __xdp_return(page_address(page), &xdp->rxq->mem, true, xdp);
|
|
+ }
|
|
+out:
|
|
__xdp_return(xdp->data, &xdp->rxq->mem, true, xdp);
|
|
}
|
|
|