diff mbox series

[bpf,V8,2/7] selftests/bpf: Add counters to xdp_hw_metadata

Message ID 168130336725.150247.12193228778654006957.stgit@firesoul (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series XDP-hints: API change for RX-hash kfunc bpf_xdp_metadata_rx_hash | expand

Checks

Context Check Description
bpf/vmtest-bpf-VM_Test-36 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-37 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-VM_Test-2 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-VM_Test-3 success Logs for build for aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-5 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-VM_Test-6 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-7 success Logs for set-matrix
bpf/vmtest-bpf-VM_Test-4 success Logs for build for s390x with gcc
bpf/vmtest-bpf-VM_Test-8 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-9 success Logs for test_maps on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-11 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-12 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-13 success Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-14 fail Logs for test_progs on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-16 fail Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-17 fail Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-18 success Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-19 success Logs for test_progs_no_alu32 on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-20 success Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-VM_Test-21 fail Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-22 fail Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-23 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-24 success Logs for test_progs_no_alu32_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-25 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-26 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-27 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-28 success Logs for test_progs_parallel on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-29 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-30 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-31 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-VM_Test-32 success Logs for test_verifier on aarch64 with llvm-16
bpf/vmtest-bpf-VM_Test-33 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-VM_Test-34 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-VM_Test-35 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-VM_Test-10 success Logs for test_maps on s390x with gcc
bpf/vmtest-bpf-VM_Test-15 success Logs for test_progs on s390x with gcc
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for bpf, async
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: 18 this patch: 18
netdev/cc_maintainers warning 10 maintainers not CCed: mykolal@fb.com andrii@kernel.org song@kernel.org shuah@kernel.org haoluo@google.com yhs@fb.com kpsingh@kernel.org jolsa@kernel.org martin.lau@linux.dev linux-kselftest@vger.kernel.org
netdev/build_clang success Errors and warnings before: 18 this patch: 18
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 No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 18 this patch: 18
netdev/checkpatch warning WARNING: Use of volatile is usually wrong: see Documentation/process/volatile-considered-harmful.rst
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Jesper Dangaard Brouer April 12, 2023, 12:42 p.m. UTC 
Add counters for skipped, failed and redirected packets.
The xdp_hw_metadata program only redirects UDP port 9091.
This helps users to quickly identify then packets are
skipped and identify failures of bpf_xdp_adjust_meta.

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
 .../testing/selftests/bpf/progs/xdp_hw_metadata.c  |   15 +++++++++++++--
 tools/testing/selftests/bpf/xdp_hw_metadata.c      |    4 +++-
 2 files changed, 16 insertions(+), 3 deletions(-)

Comments

Stanislav Fomichev April 12, 2023, 4:56 p.m. UTC | #1 
On 04/12, Jesper Dangaard Brouer wrote:
> Add counters for skipped, failed and redirected packets.
> The xdp_hw_metadata program only redirects UDP port 9091.
> This helps users to quickly identify then packets are
> skipped and identify failures of bpf_xdp_adjust_meta.
> 
> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
> ---
>  .../testing/selftests/bpf/progs/xdp_hw_metadata.c  |   15 +++++++++++++--
>  tools/testing/selftests/bpf/xdp_hw_metadata.c      |    4 +++-
>  2 files changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> index b0104763405a..a07ef7534013 100644
> --- a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> +++ b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> @@ -25,6 +25,10 @@ struct {
>  	__type(value, __u32);
>  } xsk SEC(".maps");
>  
> +volatile __u64 pkts_skip = 0;
> +volatile __u64 pkts_fail = 0;
> +volatile __u64 pkts_redir = 0;
> +
>  extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx,
>  					 __u64 *timestamp) __ksym;
>  extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx,
> @@ -59,16 +63,21 @@ int rx(struct xdp_md *ctx)
>  			udp = NULL;
>  	}
>  
> -	if (!udp)
> +	if (!udp) {
> +		pkts_skip++;
>  		return XDP_PASS;
> +	}
>  
>  	/* Forwarding UDP:9091 to AF_XDP */
> -	if (udp->dest != bpf_htons(9091))
> +	if (udp->dest != bpf_htons(9091)) {
> +		pkts_skip++;
>  		return XDP_PASS;
> +	}
>  
>  	ret = bpf_xdp_adjust_meta(ctx, -(int)sizeof(struct xdp_meta));
>  	if (ret != 0) {

[..]

>  		bpf_printk("bpf_xdp_adjust_meta returned %d", ret);

Maybe let's remove these completely? Merge patch 1 and 2, remove printk,
add counters. We can add more counters in the future if the existing
ones are not enough.. WDYT?

> +		pkts_fail++;
>  		return XDP_PASS;
>  	}
>  
> @@ -78,6 +87,7 @@ int rx(struct xdp_md *ctx)
>  
>  	if (meta + 1 > data) {
>  		bpf_printk("bpf_xdp_adjust_meta doesn't appear to work");
> +		pkts_fail++;
>  		return XDP_PASS;
>  	}
>  
> @@ -91,6 +101,7 @@ int rx(struct xdp_md *ctx)
>  	else
>  		meta->rx_hash = 0; /* Used by AF_XDP as not avail signal */
>  
> +	pkts_redir++;
>  	return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS);
>  }
>  
> diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c
> index 1c8acb68b977..3b942ef7297b 100644
> --- a/tools/testing/selftests/bpf/xdp_hw_metadata.c
> +++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c
> @@ -212,7 +212,9 @@ static int verify_metadata(struct xsk *rx_xsk, int rxq, int server_fd)
>  	while (true) {
>  		errno = 0;
>  		ret = poll(fds, rxq + 1, 1000);
> -		printf("poll: %d (%d)\n", ret, errno);
> +		printf("poll: %d (%d) skip=%llu fail=%llu redir=%llu\n",
> +		       ret, errno, bpf_obj->bss->pkts_skip,
> +		       bpf_obj->bss->pkts_fail, bpf_obj->bss->pkts_redir);
>  		if (ret < 0)
>  			break;
>  		if (ret == 0)
> 
>
Jesper Dangaard Brouer April 12, 2023, 5:52 p.m. UTC | #2 
On 12/04/2023 18.56, Stanislav Fomichev wrote:
> On 04/12, Jesper Dangaard Brouer wrote:
>> Add counters for skipped, failed and redirected packets.
>> The xdp_hw_metadata program only redirects UDP port 9091.
>> This helps users to quickly identify then packets are
>> skipped and identify failures of bpf_xdp_adjust_meta.
>>
>> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
>> ---
>>   .../testing/selftests/bpf/progs/xdp_hw_metadata.c  |   15 +++++++++++++--
>>   tools/testing/selftests/bpf/xdp_hw_metadata.c      |    4 +++-
>>   2 files changed, 16 insertions(+), 3 deletions(-)
>>
>> diff --git a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
>> index b0104763405a..a07ef7534013 100644
>> --- a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
>> +++ b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
>> @@ -25,6 +25,10 @@ struct {
>>   	__type(value, __u32);
>>   } xsk SEC(".maps");
>>   
>> +volatile __u64 pkts_skip = 0;
>> +volatile __u64 pkts_fail = 0;
>> +volatile __u64 pkts_redir = 0;
>> +
>>   extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx,
>>   					 __u64 *timestamp) __ksym;
>>   extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx,
>> @@ -59,16 +63,21 @@ int rx(struct xdp_md *ctx)
>>   			udp = NULL;
>>   	}
>>   
>> -	if (!udp)
>> +	if (!udp) {
>> +		pkts_skip++;
>>   		return XDP_PASS;
>> +	}
>>   
>>   	/* Forwarding UDP:9091 to AF_XDP */
>> -	if (udp->dest != bpf_htons(9091))
>> +	if (udp->dest != bpf_htons(9091)) {
>> +		pkts_skip++;
>>   		return XDP_PASS;
>> +	}
>>   
>>   	ret = bpf_xdp_adjust_meta(ctx, -(int)sizeof(struct xdp_meta));
>>   	if (ret != 0) {
> 
> [..]
> 
>>   		bpf_printk("bpf_xdp_adjust_meta returned %d", ret);
> 
> Maybe let's remove these completely? Merge patch 1 and 2, remove printk,
> add counters. We can add more counters in the future if the existing
> ones are not enough.. WDYT?
> 

Sure, lets just remove all of the bpf_printk, and add these counter instead.
Rolling V9.

>> +		pkts_fail++;

This fail counter should be enough for driver devel to realize that they
also need to implement/setup XDP metadata pointers correctly (for
bpf_xdp_adjust_meta to work).

>>   		return XDP_PASS;
>>   	}
Stanislav Fomichev April 12, 2023, 5:56 p.m. UTC | #3 
On Wed, Apr 12, 2023 at 10:52 AM Jesper Dangaard Brouer
<jbrouer@redhat.com> wrote:
>
>
> On 12/04/2023 18.56, Stanislav Fomichev wrote:
> > On 04/12, Jesper Dangaard Brouer wrote:
> >> Add counters for skipped, failed and redirected packets.
> >> The xdp_hw_metadata program only redirects UDP port 9091.
> >> This helps users to quickly identify then packets are
> >> skipped and identify failures of bpf_xdp_adjust_meta.
> >>
> >> Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
> >> ---
> >>   .../testing/selftests/bpf/progs/xdp_hw_metadata.c  |   15 +++++++++++++--
> >>   tools/testing/selftests/bpf/xdp_hw_metadata.c      |    4 +++-
> >>   2 files changed, 16 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> >> index b0104763405a..a07ef7534013 100644
> >> --- a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> >> +++ b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
> >> @@ -25,6 +25,10 @@ struct {
> >>      __type(value, __u32);
> >>   } xsk SEC(".maps");
> >>
> >> +volatile __u64 pkts_skip = 0;
> >> +volatile __u64 pkts_fail = 0;
> >> +volatile __u64 pkts_redir = 0;
> >> +
> >>   extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx,
> >>                                       __u64 *timestamp) __ksym;
> >>   extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx,
> >> @@ -59,16 +63,21 @@ int rx(struct xdp_md *ctx)
> >>                      udp = NULL;
> >>      }
> >>
> >> -    if (!udp)
> >> +    if (!udp) {
> >> +            pkts_skip++;
> >>              return XDP_PASS;
> >> +    }
> >>
> >>      /* Forwarding UDP:9091 to AF_XDP */
> >> -    if (udp->dest != bpf_htons(9091))
> >> +    if (udp->dest != bpf_htons(9091)) {
> >> +            pkts_skip++;
> >>              return XDP_PASS;
> >> +    }
> >>
> >>      ret = bpf_xdp_adjust_meta(ctx, -(int)sizeof(struct xdp_meta));
> >>      if (ret != 0) {
> >
> > [..]
> >
> >>              bpf_printk("bpf_xdp_adjust_meta returned %d", ret);
> >
> > Maybe let's remove these completely? Merge patch 1 and 2, remove printk,
> > add counters. We can add more counters in the future if the existing
> > ones are not enough.. WDYT?
> >
>
> Sure, lets just remove all of the bpf_printk, and add these counter instead.
> Rolling V9.
>
> >> +            pkts_fail++;
>
> This fail counter should be enough for driver devel to realize that they
> also need to implement/setup XDP metadata pointers correctly (for
> bpf_xdp_adjust_meta to work).

Agreed. As long as we have a clear signal "something's not working"
(instead of failing silently), that should be enough to get to the
bottom of it..

> >>              return XDP_PASS;
> >>      }
>
diff mbox series

Patch

diff --git a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
index b0104763405a..a07ef7534013 100644
--- a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
+++ b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c
@@ -25,6 +25,10 @@  struct {
 	__type(value, __u32);
 } xsk SEC(".maps");
 
+volatile __u64 pkts_skip = 0;
+volatile __u64 pkts_fail = 0;
+volatile __u64 pkts_redir = 0;
+
 extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx,
 					 __u64 *timestamp) __ksym;
 extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx,
@@ -59,16 +63,21 @@  int rx(struct xdp_md *ctx)
 			udp = NULL;
 	}
 
-	if (!udp)
+	if (!udp) {
+		pkts_skip++;
 		return XDP_PASS;
+	}
 
 	/* Forwarding UDP:9091 to AF_XDP */
-	if (udp->dest != bpf_htons(9091))
+	if (udp->dest != bpf_htons(9091)) {
+		pkts_skip++;
 		return XDP_PASS;
+	}
 
 	ret = bpf_xdp_adjust_meta(ctx, -(int)sizeof(struct xdp_meta));
 	if (ret != 0) {
 		bpf_printk("bpf_xdp_adjust_meta returned %d", ret);
+		pkts_fail++;
 		return XDP_PASS;
 	}
 
@@ -78,6 +87,7 @@  int rx(struct xdp_md *ctx)
 
 	if (meta + 1 > data) {
 		bpf_printk("bpf_xdp_adjust_meta doesn't appear to work");
+		pkts_fail++;
 		return XDP_PASS;
 	}
 
@@ -91,6 +101,7 @@  int rx(struct xdp_md *ctx)
 	else
 		meta->rx_hash = 0; /* Used by AF_XDP as not avail signal */
 
+	pkts_redir++;
 	return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS);
 }
 
diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c
index 1c8acb68b977..3b942ef7297b 100644
--- a/tools/testing/selftests/bpf/xdp_hw_metadata.c
+++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c
@@ -212,7 +212,9 @@  static int verify_metadata(struct xsk *rx_xsk, int rxq, int server_fd)
 	while (true) {
 		errno = 0;
 		ret = poll(fds, rxq + 1, 1000);
-		printf("poll: %d (%d)\n", ret, errno);
+		printf("poll: %d (%d) skip=%llu fail=%llu redir=%llu\n",
+		       ret, errno, bpf_obj->bss->pkts_skip,
+		       bpf_obj->bss->pkts_fail, bpf_obj->bss->pkts_redir);
 		if (ret < 0)
 			break;
 		if (ret == 0)