Skip to content

Commit 9b9969c

Browse files
Stanislav Fomichevborkmann
authored andcommitted
selftests/bpf: Add XDP_UMEM_TX_METADATA_LEN to XSK TX metadata test
This flag is now required to use tx_metadata_len. Fixes: 40808a2 ("selftests/bpf: Add TX side to xdp_metadata") Reported-by: Julian Schindel <[email protected]> Signed-off-by: Stanislav Fomichev <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Reviewed-by: Maciej Fijalkowski <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent d5e726d commit 9b9969c

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

tools/include/uapi/linux/if_xdp.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
*/
4242
#define XDP_UMEM_TX_SW_CSUM (1 << 1)
4343

44+
/* Request to reserve tx_metadata_len bytes of per-chunk metadata.
45+
*/
46+
#define XDP_UMEM_TX_METADATA_LEN (1 << 2)
47+
4448
struct sockaddr_xdp {
4549
__u16 sxdp_family;
4650
__u16 sxdp_flags;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ static int open_xsk(int ifindex, struct xsk *xsk)
6868
.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
6969
.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,
7070
.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE,
71-
.flags = XDP_UMEM_UNALIGNED_CHUNK_FLAG | XDP_UMEM_TX_SW_CSUM,
71+
.flags = XDP_UMEM_UNALIGNED_CHUNK_FLAG | XDP_UMEM_TX_SW_CSUM |
72+
XDP_UMEM_TX_METADATA_LEN,
7273
.tx_metadata_len = sizeof(struct xsk_tx_metadata),
7374
};
7475
__u32 idx;

0 commit comments

Comments
 (0)