linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh
@ 2022-06-16  7:40 Jie2x Zhou
  2022-06-16  9:53 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 3+ messages in thread
From: Jie2x Zhou @ 2022-06-16  7:40 UTC (permalink / raw)
  To: jie2x.zhou, shuah, pablo, sbrivio, liuhangbin, fw
  Cc: linux-kselftest, linux-kernel, Philip Li, kernel test robot

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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh
  2022-06-16  7:40 [PATCH] selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh Jie2x Zhou
@ 2022-06-16  9:53 ` Pablo Neira Ayuso
  2022-06-16 13:46   ` Stefano Brivio
  0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2022-06-16  9:53 UTC (permalink / raw)
  To: Jie2x Zhou
  Cc: shuah, sbrivio, liuhangbin, fw, linux-kselftest, linux-kernel,
	Philip Li, kernel test robot, netfilter-devel

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
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh
  2022-06-16  9:53 ` Pablo Neira Ayuso
@ 2022-06-16 13:46   ` Stefano Brivio
  0 siblings, 0 replies; 3+ messages in thread
From: Stefano Brivio @ 2022-06-16 13:46 UTC (permalink / raw)
  To: Jie2x Zhou
  Cc: Pablo Neira Ayuso, shuah, liuhangbin, fw, linux-kselftest,
	linux-kernel, Philip Li, kernel test robot, netfilter-devel

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>

-- 
Stefano


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-06-16 13:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-16  7:40 [PATCH] selftests: netfilter: correct PKTGEN_SCRIPT_PATHS in nft_concat_range.sh Jie2x Zhou
2022-06-16  9:53 ` Pablo Neira Ayuso
2022-06-16 13:46   ` Stefano Brivio

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).