diff mbox series

selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh

Message ID 20220616074046.49349-1-jie2x.zhou@intel.com
State Accepted
Commit 5d79d8af8dec58bf709b3124d09d9572edd9c617
Headers show
Series selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh | expand

Commit Message

Jie2x Zhou June 16, 2022, 7:40 a.m. UTC
Before change:
make -C netfilter
 TEST: performance
   net,port                                                      [SKIP]
   perf not supported
   port,net                                                      [SKIP]
   perf not supported
   net6,port                                                     [SKIP]
   perf not supported
   port,proto                                                    [SKIP]
   perf not supported
   net6,port,mac                                                 [SKIP]
   perf not supported
   net6,port,mac,proto                                           [SKIP]
   perf not supported
   net,mac                                                       [SKIP]
   perf not supported

After change:
   net,mac                                                       [ OK ]
     baseline (drop from netdev hook):               2061098pps
     baseline hash (non-ranged entries):             1606741pps
     baseline rbtree (match on first field only):    1191607pps
     set with  1000 full, ranged entries:            1639119pps
ok 8 selftests: netfilter: nft_concat_range.sh

Fixes: 611973c1e06f ("selftests: netfilter: Introduce tests for sets with range concatenation")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Jie2x Zhou <jie2x.zhou@intel.com>
---
 tools/testing/selftests/netfilter/nft_concat_range.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Pablo Neira Ayuso June 16, 2022, 9:53 a.m. UTC | #1
Cc'ing netfilter-devel and Stefano Brivio.

On Thu, Jun 16, 2022 at 03:40:46PM +0800, Jie2x Zhou wrote:
> Before change:
> make -C netfilter
>  TEST: performance
>    net,port                                                      [SKIP]
>    perf not supported
>    port,net                                                      [SKIP]
>    perf not supported
>    net6,port                                                     [SKIP]
>    perf not supported
>    port,proto                                                    [SKIP]
>    perf not supported
>    net6,port,mac                                                 [SKIP]
>    perf not supported
>    net6,port,mac,proto                                           [SKIP]
>    perf not supported
>    net,mac                                                       [SKIP]
>    perf not supported
> 
> After change:
>    net,mac                                                       [ OK ]
>      baseline (drop from netdev hook):               2061098pps
>      baseline hash (non-ranged entries):             1606741pps
>      baseline rbtree (match on first field only):    1191607pps
>      set with  1000 full, ranged entries:            1639119pps
> ok 8 selftests: netfilter: nft_concat_range.sh
> 
> Fixes: 611973c1e06f ("selftests: netfilter: Introduce tests for sets with range concatenation")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Jie2x Zhou <jie2x.zhou@intel.com>
> ---
>  tools/testing/selftests/netfilter/nft_concat_range.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/netfilter/nft_concat_range.sh b/tools/testing/selftests/netfilter/nft_concat_range.sh
> index b35010cc7f6a..a6991877e50c 100755
> --- a/tools/testing/selftests/netfilter/nft_concat_range.sh
> +++ b/tools/testing/selftests/netfilter/nft_concat_range.sh
> @@ -31,7 +31,7 @@ BUGS="flush_remove_add reload"
>  
>  # List of possible paths to pktgen script from kernel tree for performance tests
>  PKTGEN_SCRIPT_PATHS="
> -	../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
> +	../../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
>  	pktgen/pktgen_bench_xmit_mode_netif_receive.sh"
>  
>  # Definition of set types:
> -- 
> 2.34.1
>
Stefano Brivio June 16, 2022, 1:46 p.m. UTC | #2
Hi Jie2x,

On Thu, 16 Jun 2022 11:53:41 +0200
Pablo Neira Ayuso <pablo@netfilter.org> wrote:

> Cc'ing netfilter-devel and Stefano Brivio.
> 
> On Thu, Jun 16, 2022 at 03:40:46PM +0800, Jie2x Zhou wrote:
> > Before change:
> > make -C netfilter
> >  TEST: performance
> >    net,port                                                      [SKIP]
> >    perf not supported
> >    port,net                                                      [SKIP]
> >    perf not supported
> >    net6,port                                                     [SKIP]
> >    perf not supported
> >    port,proto                                                    [SKIP]
> >    perf not supported
> >    net6,port,mac                                                 [SKIP]
> >    perf not supported
> >    net6,port,mac,proto                                           [SKIP]
> >    perf not supported
> >    net,mac                                                       [SKIP]
> >    perf not supported
> > 
> > After change:
> >    net,mac                                                       [ OK ]
> >      baseline (drop from netdev hook):               2061098pps
> >      baseline hash (non-ranged entries):             1606741pps
> >      baseline rbtree (match on first field only):    1191607pps
> >      set with  1000 full, ranged entries:            1639119pps
> > ok 8 selftests: netfilter: nft_concat_range.sh
> > 
> > Fixes: 611973c1e06f ("selftests: netfilter: Introduce tests for sets with range concatenation")
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Jie2x Zhou <jie2x.zhou@intel.com>
> > ---
> >  tools/testing/selftests/netfilter/nft_concat_range.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/testing/selftests/netfilter/nft_concat_range.sh b/tools/testing/selftests/netfilter/nft_concat_range.sh
> > index b35010cc7f6a..a6991877e50c 100755
> > --- a/tools/testing/selftests/netfilter/nft_concat_range.sh
> > +++ b/tools/testing/selftests/netfilter/nft_concat_range.sh
> > @@ -31,7 +31,7 @@ BUGS="flush_remove_add reload"
> >  
> >  # List of possible paths to pktgen script from kernel tree for performance tests
> >  PKTGEN_SCRIPT_PATHS="
> > -	../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
> > +	../../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh

This came from the fact that I used, for testing, to copy the
directories 'samples' and 'selftests' to the root of a filesystem
on a virtual machine, instead of copying the full 'tools' directory.

It was a very arbitrary usage though, also given that 'selftests' is
typically biggest directory in 'tools', so there's no need to keep the
previous path.

Thanks for fixing this,

Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
diff mbox series

Patch

diff --git a/tools/testing/selftests/netfilter/nft_concat_range.sh b/tools/testing/selftests/netfilter/nft_concat_range.sh
index b35010cc7f6a..a6991877e50c 100755
--- a/tools/testing/selftests/netfilter/nft_concat_range.sh
+++ b/tools/testing/selftests/netfilter/nft_concat_range.sh
@@ -31,7 +31,7 @@  BUGS="flush_remove_add reload"
 
 # List of possible paths to pktgen script from kernel tree for performance tests
 PKTGEN_SCRIPT_PATHS="
-	../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
+	../../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
 	pktgen/pktgen_bench_xmit_mode_netif_receive.sh"
 
 # Definition of set types: