diff mbox series

[bpf] selftests/bpf: add XDP_UMEM_TX_METADATA_LEN flag to umem_config

Message ID 20241220091806.1856223-1-wei.fang@nxp.com (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series [bpf] selftests/bpf: add XDP_UMEM_TX_METADATA_LEN flag to umem_config | expand

Checks

Context Check Description
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-VM_Test-3 success Logs for Validate matrix.py
bpf/vmtest-bpf-VM_Test-11 success Logs for aarch64-gcc / veristat-meta
bpf/vmtest-bpf-VM_Test-12 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-VM_Test-10 success Logs for aarch64-gcc / veristat-kernel
bpf/vmtest-bpf-VM_Test-13 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-VM_Test-17 success Logs for s390x-gcc / veristat-kernel
bpf/vmtest-bpf-VM_Test-18 success Logs for s390x-gcc / veristat-meta
bpf/vmtest-bpf-VM_Test-19 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-20 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-21 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-VM_Test-27 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-30 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-31 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-VM_Test-36 success Logs for x86_64-llvm-17 / veristat-kernel
bpf/vmtest-bpf-VM_Test-37 success Logs for x86_64-llvm-17 / veristat-meta
bpf/vmtest-bpf-VM_Test-38 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-39 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-VM_Test-46 success Logs for x86_64-llvm-18 / veristat-meta
bpf/vmtest-bpf-VM_Test-45 success Logs for x86_64-llvm-18 / veristat-kernel
bpf/vmtest-bpf-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-16 success Logs for s390x-gcc / test (test_verifier, false, 360) / test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-22 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-23 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-25 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-26 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-28 success Logs for x86_64-gcc / veristat-kernel / x86_64-gcc veristat_kernel
bpf/vmtest-bpf-VM_Test-29 success Logs for x86_64-gcc / veristat-meta / x86_64-gcc veristat_meta
bpf/vmtest-bpf-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-33 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-34 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-35 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-42 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-41 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-43 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-VM_Test-44 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag present in non-next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/build_tools success Errors and warnings before: 0 (+0) this patch: 0 (+0)
netdev/cc_maintainers fail 1 blamed authors not CCed: maciej.fijalkowski@intel.com; 1 maintainers not CCed: maciej.fijalkowski@intel.com
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-14 success Logs for s390x-gcc / test (test_progs, false, 360) / test_progs on s390x with gcc
bpf/vmtest-bpf-VM_Test-15 success Logs for s390x-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on s390x with gcc

Commit Message

Wei Fang Dec. 20, 2024, 9:18 a.m. UTC 
The Tx metadata test has been broken since the commit d5e726d9143c ("xsk:
Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len"). Because
this change requires XDP_UMEM_TX_METADATA_LEN flag to be set, otherwise
xsk_buff_pool::tx_metadata_len will be initialized to 0, which means that
the driver cannot get Tx metadata and cannot execute AF_XDP Tx metadata
hooks.

Fixes: d5e726d9143c ("xsk: Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len")
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
 tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stanislav Fomichev Dec. 20, 2024, 3:26 p.m. UTC | #1 
On 12/20, Wei Fang wrote:
> The Tx metadata test has been broken since the commit d5e726d9143c ("xsk:
> Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len"). Because
> this change requires XDP_UMEM_TX_METADATA_LEN flag to be set, otherwise
> xsk_buff_pool::tx_metadata_len will be initialized to 0, which means that
> the driver cannot get Tx metadata and cannot execute AF_XDP Tx metadata
> hooks.
> 
> Fixes: d5e726d9143c ("xsk: Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len")
> Signed-off-by: Wei Fang <wei.fang@nxp.com>

Thanks for the patch, but it should have been fixed recently in:
https://lore.kernel.org/bpf/20241205044258.3155799-1-yoong.siang.song@intel.com/#t
Frank Li Dec. 20, 2024, 4:10 p.m. UTC | #2 
On Fri, Dec 20, 2024 at 05:18:06PM +0800, Wei Fang wrote:
> The Tx metadata test has been broken since the commit d5e726d9143c ("xsk:
> Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len").

Nit:

Fixes tag already include this information.

The Tx metadata test has been broken becasue XDP_UMEM_TX_METADATA_LEN flag
is not set ....

> Because
> this change requires XDP_UMEM_TX_METADATA_LEN flag to be set, otherwise
> xsk_buff_pool::tx_metadata_len will be initialized to 0, which means that
> the driver cannot get Tx metadata and cannot execute AF_XDP Tx metadata
> hooks.
>
> Fixes: d5e726d9143c ("xsk: Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len")
> Signed-off-by: Wei Fang <wei.fang@nxp.com>
> ---
>  tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c
> index 6f9956eed797..ad6c08dfd6c8 100644
> --- a/tools/testing/selftests/bpf/xdp_hw_metadata.c
> +++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c
> @@ -79,7 +79,7 @@ static int open_xsk(int ifindex, struct xsk *xsk, __u32 queue_id)
>  		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
>  		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,
>  		.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE,
> -		.flags = XSK_UMEM__DEFAULT_FLAGS,
> +		.flags = XDP_UMEM_TX_METADATA_LEN,

look like "XSK_UMEM__DEFAULT_FLAGS | XDP_UMEM_TX_METADATA_LEN"

You clean other flags, does it what you what?

Frank

>  		.tx_metadata_len = sizeof(struct xsk_tx_metadata),
>  	};
>  	__u32 idx = 0;
> --
> 2.34.1
>
Wei Fang Dec. 21, 2024, 1:54 a.m. UTC | #3 
> On 12/20, Wei Fang wrote:
> > The Tx metadata test has been broken since the commit d5e726d9143c
> ("xsk:
> > Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len").
> Because
> > this change requires XDP_UMEM_TX_METADATA_LEN flag to be set,
> > otherwise xsk_buff_pool::tx_metadata_len will be initialized to 0,
> > which means that the driver cannot get Tx metadata and cannot execute
> > AF_XDP Tx metadata hooks.
> >
> > Fixes: d5e726d9143c ("xsk: Require XDP_UMEM_TX_METADATA_LEN to
> actuate
> > tx_metadata_len")
> > Signed-off-by: Wei Fang <wei.fang@nxp.com>
> 
> Thanks for the patch, but it should have been fixed recently in:

Oh, I was not aware of that the same patch had been applied to
bpf-next tree, thanks for reminder.
Wei Fang Dec. 21, 2024, 1:56 a.m. UTC | #4 
> On Fri, Dec 20, 2024 at 05:18:06PM +0800, Wei Fang wrote:
> > The Tx metadata test has been broken since the commit d5e726d9143c
> ("xsk:
> > Require XDP_UMEM_TX_METADATA_LEN to actuate tx_metadata_len").
> 
> Nit:
> 
> Fixes tag already include this information.
> 
> The Tx metadata test has been broken becasue
> XDP_UMEM_TX_METADATA_LEN flag is not set ....
> 
> > Because
> > this change requires XDP_UMEM_TX_METADATA_LEN flag to be set,
> > otherwise xsk_buff_pool::tx_metadata_len will be initialized to 0,
> > which means that the driver cannot get Tx metadata and cannot execute
> > AF_XDP Tx metadata hooks.
> >
> > Fixes: d5e726d9143c ("xsk: Require XDP_UMEM_TX_METADATA_LEN to
> actuate
> > tx_metadata_len")
> > Signed-off-by: Wei Fang <wei.fang@nxp.com>
> > ---
> >  tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c
> > b/tools/testing/selftests/bpf/xdp_hw_metadata.c
> > index 6f9956eed797..ad6c08dfd6c8 100644
> > --- a/tools/testing/selftests/bpf/xdp_hw_metadata.c
> > +++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c
> > @@ -79,7 +79,7 @@ static int open_xsk(int ifindex, struct xsk *xsk, __u32
> queue_id)
> >  		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
> >  		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,
> >  		.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE,
> > -		.flags = XSK_UMEM__DEFAULT_FLAGS,
> > +		.flags = XDP_UMEM_TX_METADATA_LEN,
> 
> look like "XSK_UMEM__DEFAULT_FLAGS | XDP_UMEM_TX_METADATA_LEN"
> 
> You clean other flags, does it what you what?
> 

XSK_UMEM__DEFAULT_FLAGS is 0, so no need anymore. The same patch
had been applied to bpf-next tree [1], so please ignore this one.

[1] https://lore.kernel.org/bpf/20241205044258.3155799-1-yoong.siang.song@intel.com/#t

> 
> >  		.tx_metadata_len = sizeof(struct xsk_tx_metadata),
> >  	};
> >  	__u32 idx = 0;
> > --
> > 2.34.1
> >
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c
index 6f9956eed797..ad6c08dfd6c8 100644
--- a/tools/testing/selftests/bpf/xdp_hw_metadata.c
+++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c
@@ -79,7 +79,7 @@  static int open_xsk(int ifindex, struct xsk *xsk, __u32 queue_id)
 		.fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS,
 		.comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS,
 		.frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE,
-		.flags = XSK_UMEM__DEFAULT_FLAGS,
+		.flags = XDP_UMEM_TX_METADATA_LEN,
 		.tx_metadata_len = sizeof(struct xsk_tx_metadata),
 	};
 	__u32 idx = 0;