Skip to content

xdp: fix page_pool leaks #6091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

xdp: fix page_pool leaks #6091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2797286
xdp: update xdp_rxq_info's mem type in XDP generic hook
mfijalko Oct 3, 2025
47483c0
veth: update mem type in xdp_buff
mfijalko Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions drivers/net/veth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,8 @@ static struct sk_buff *veth_xdp_rcv_skb(struct veth_rq *rq,
orig_data = xdp->data;
orig_data_end = xdp->data_end;

xdp_update_mem_type(xdp);

act = bpf_prog_run_xdp(xdp_prog, xdp);

switch (act) {
Expand Down
7 changes: 7 additions & 0 deletions include/net/xdp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,13 @@ xdp_update_skb_frags_info(struct sk_buff *skb, u8 nr_frags,
skb->unreadable |= !!(xdp_flags & XDP_FLAGS_FRAGS_UNREADABLE);
}

static inline void
xdp_update_mem_type(struct xdp_buff *xdp)
{
xdp->rxq->mem.type = page_pool_page_is_pp(virt_to_page(xdp->data)) ?
MEM_TYPE_PAGE_POOL : MEM_TYPE_PAGE_SHARED;
}

/* Avoids inlining WARN macro in fast-path */
void xdp_warn(const char *msg, const char *func, const int line);
#define XDP_WARN(msg) xdp_warn(msg, __func__, __LINE__)
Expand Down
2 changes: 2 additions & 0 deletions net/core/dev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5357,6 +5357,8 @@ u32 bpf_prog_run_generic_xdp(struct sk_buff *skb, struct xdp_buff *xdp,
orig_bcast = is_multicast_ether_addr_64bits(eth->h_dest);
orig_eth_type = eth->h_proto;

xdp_update_mem_type(xdp);

act = bpf_prog_run_xdp(xdp_prog, xdp);

/* check if bpf_xdp_adjust_head was used */
Expand Down
Loading