Commit 9b9969c4 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Daniel Borkmann
Browse files

selftests/bpf: Add XDP_UMEM_TX_METADATA_LEN to XSK TX metadata test 



This flag is now required to use tx_metadata_len.

Fixes: 40808a23 ("selftests/bpf: Add TX side to xdp_metadata")
Reported-by: default avatarJulian Schindel <mail@arctic-alpaca.de>
Signed-off-by: default avatarStanislav Fomichev <sdf@fomichev.me>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/bpf/20240713015253.121248-3-sdf@fomichev.me
parent d5e726d9

tools/include/uapi/linux/if_xdp.h

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 
 */

#define XDP_UMEM_TX_SW_CSUM		(1 << 1)



/* Request to reserve tx_metadata_len bytes of per-chunk metadata.

 */

#define XDP_UMEM_TX_METADATA_LEN	(1 << 2)



struct sockaddr_xdp {

	__u16 sxdp_family;

	__u16 sxdp_flags;

tools/testing/selftests/bpf/prog_tests/xdp_metadata.c

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ static int open_xsk(int ifindex, struct xsk *xsk) 
		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,

		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,

		.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE,

		.flags = XDP_UMEM_UNALIGNED_CHUNK_FLAG | XDP_UMEM_TX_SW_CSUM,

		.flags = XDP_UMEM_UNALIGNED_CHUNK_FLAG | XDP_UMEM_TX_SW_CSUM |

			 XDP_UMEM_TX_METADATA_LEN,

		.tx_metadata_len = sizeof(struct xsk_tx_metadata),

	};

	__u32 idx;