APPLIED: [SRU][N][PATCH 0/1] Fix missing XDP_UMEM_TX_METADATA_LEN in selftests/bpf

[Edoardo Canepa]

Applied to N:linux/master-next. Thanks.

On 7/1/26 07:25, Aaron Jauregui via kernel-team wrote:
> BugLink: https://bugs.launchpad.net/bugs/2139686
>
> [ Impact ]
>
> ubuntu_bpf is failing on noble due to
> tools/testing/selftests/bpf/xdp_hw_metadata.c referencing
> XDP_UMEM_TX_METADATA_LEN, but the tools copy of include/uapi/if_xdp.h
> does not define it.
>
> Upstream commit d5e726d9143c was a series of 3 patches, but patch #3 of
> the series was dropped when cherry-picking. This third patch defines the
> symbol.
>
> [ Test Plan ]
>
> Build noble's bpf selftests, and check that the pre-existing error
> message (xdp_hw_metadata.c:82:26: error: 'XDP_UMEM_TX_METADATA_LEN'
> undeclared) no longer fires and the build completes successfully.
>
> [ Where problems could occur ]
>
> The change is not very invasive, only being comprised of 6 added lines
> across two files in tools/. Worst case scenario is a regression in the
> selftest that would show up as a test failure. Upstream patch has no
> follow-up fixes and has been in mainline since v6.11
>
> [ Other Info ]
>
> This is patch 3/3 of the original series sdf@ posted as
> https://lore.kernel.org/bpf/20240713015253.121248-1-sdf@fomichev.me. The
> other two patches are already in Noble, and this completes the series.
>
> Stanislav Fomichev (1):
>    selftests/bpf: Add XDP_UMEM_TX_METADATA_LEN to XSK TX metadata test
>
>   tools/include/uapi/linux/if_xdp.h                     | 4 ++++
>   tools/testing/selftests/bpf/prog_tests/xdp_metadata.c | 3 ++-
>   2 files changed, 6 insertions(+), 1 deletion(-)
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20260730/43ad8f42/attachment-0001.sig>