]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'xsk-respect-the-offsets-when-copying-frags'
authorJakub Kicinski <kuba@kernel.org>
Tue, 29 Apr 2025 21:26:29 +0000 (14:26 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 29 Apr 2025 21:26:30 +0000 (14:26 -0700)
Bui Quang Minh says:

====================
xsk: respect the offsets when copying frags

In commit 560d958c6c68 ("xsk: add generic XSk &xdp_buff -> skb
conversion"), we introduce a helper to convert zerocopy xdp_buff to skb.
However, in the frag copy, we mistakenly ignore the frag's offset. This
series adds the missing offset when copying frags in
xdp_copy_frags_from_zc(). This function is not used anywhere so no
backport is needed.

This series also makes xdp_copy_frags_from_zc() use page allocation API
page_pool_dev_alloc() instead of page_pool_dev_alloc_netmem() to avoid
possible confusion of the returned value.
====================

Link: https://patch.msgid.link/20250426081220.40689-1-minhquangbui99@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge