RE: [dts][PATCH V1 2/2] tests/l3fwdacl: merge l3fwd-acl with l3fwd and fix to support different force-max-simd-bitwidth

RE: [dts][PATCH V1 2/2] tests/l3fwdacl: merge l3fwd-acl with l3fwd and fix to support different force-max-simd-bitwidth

[Chen, LingliX]

> -----Original Message-----
> From: Jiang, YuX <yux.jiang@intel.com>
> Sent: Wednesday, June 15, 2022 8:48 PM
> To: Tu, Lijuan <lijuan.tu@intel.com>; dts@dpdk.org
> Cc: Jiang, YuX <yux.jiang@intel.com>; Chen, LingliX <linglix.chen@intel.com>
> Subject: [dts][PATCH V1 2/2] tests/l3fwdacl: merge l3fwd-acl with l3fwd and fix
> to support different force-max-simd-bitwidth
> 
> 1, According to dpdk22.07rc1 commit id 6de0ea50e("examples/l3fwd: merge
> l3fwd-acl example"), modify l3fwdacl suite.
> 2, Since DTS commit "7eaf4b60 tests/l3fwdacl: modify pmd param for acl" has
> incorrect usage,  fix script to support different rx_mode.
> 
> Signed-off-by: Lingli Chen <linglix.chen@intel.com>
> Signed-off-by: Yu Jiang <yux.jiang@intel.com>

Tested-by: Lingli Chen <linglix.chen@intel.com>

[dts][PATCH V1 2/2] tests/l3fwdacl: merge l3fwd-acl with l3fwd and fix to support different force-max-simd-bitwidth

[lijuan.tu]

On Wed, 15 Jun 2022 12:48:21 +0000, Yu Jiang <yux.jiang@intel.com> wrote:
> 1, According to dpdk22.07rc1 commit id 6de0ea50e("examples/l3fwd: merge l3fwd-acl example"),
> modify l3fwdacl suite.
> 2, Since DTS commit "7eaf4b60 tests/l3fwdacl: modify pmd param for acl" has incorrect usage,
>  fix script to support different rx_mode.
> 
> Signed-off-by: Lingli Chen <linglix.chen@intel.com>
> Signed-off-by: Yu Jiang <yux.jiang@intel.com>


Series applied, thanks

[dts][PATCH V1 0/2] l3fwdacl: merge l3fwd-acl with l3fwd

[Yu Jiang]

l3fwdacl: merge l3fwd-acl with l3fwd

Yu Jiang (2):
  test_plans/l3fwdacl: merge l3fwd-acl wtih l3fwd
  tests/l3fwdacl: merge l3fwd-acl with l3fwd and fix to support
    different force-max-simd-bitwidth

 conf/app_name.cfg                 |  3 +-
 test_plans/l3fwdacl_test_plan.rst | 69 +++++++++++++++++++++----------
 tests/TestSuite_l3fwdacl.py       | 49 +++++++++++++---------
 3 files changed, 77 insertions(+), 44 deletions(-)

-- 
2.25.1

[dts][PATCH V1 1/2] test_plans/l3fwdacl: merge l3fwd-acl with l3fwd

[Yu Jiang]

According to dpdk22.07rc1 commit id 6de0ea50e("examples/l3fwd: merge l3fwd-acl example"),
modify l3fwdacl test plan.

Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 test_plans/l3fwdacl_test_plan.rst | 69 +++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 22 deletions(-)

diff --git a/test_plans/l3fwdacl_test_plan.rst b/test_plans/l3fwdacl_test_plan.rst
index cf838ac0..34f978bc 100644
--- a/test_plans/l3fwdacl_test_plan.rst
+++ b/test_plans/l3fwdacl_test_plan.rst
@@ -12,6 +12,8 @@ This document contains the test plan and results for testing
 ``l3fwd-acl`` using the ACL library for access control and L3
 forwarding.
 
+Refer to http://git.dpdk.org/dpdk/tree/doc/guides/sample_app_ug/l3_forward.rst
+
 The ``l3fwd-acl`` application uses an IPv4 5-tuple syntax for packet
 matching. The 5-tuple consist of source IP address, destination IP
 address, source port, destination port and a protocol identifier.
@@ -44,12 +46,35 @@ Prerequisites
     insmod  ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko
     ./usertools/dpdk-devbind.py --bind=igb_uio 04:00.0 04:00.1
 
-Build dpdk and examples=l3fwd-acl:
-   CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static <build_target>
-   ninja -C <build_target>
-
-   meson configure -Dexamples=l3fwd-acl <build_target>
-   ninja -C <build_target>
+3. Build dpdk and examples=l3fwd::
+
+    CC=gcc meson -Denable_kmods=True -Dlibdir=lib  --default-library=static <build_target>
+    ninja -C <build_target>
+    meson configure -Dexamples=l3fwd <build_target>
+    ninja -C <build_target>
+
+4. Run l3fwd-acl by using "--lookup acl" on L3FWD::
+
+    The application has a number of command line options:
+    ./<build_target>/examples/dpdk-l3fwd [EAL options] -- -p PORTMASK
+                             --rule_ipv4=FILE
+                             --rule_ipv6=FILE
+                             [-P]
+                             [--lookup LOOKUP_METHOD]
+                             --config(port,queue,lcore)[,(port,queue,lcore)]
+                             [--eth-dest=X,MM:MM:MM:MM:MM:MM]
+                             [--max-pkt-len PKTLEN]
+                             [--no-numa]
+                             [--hash-entry-num]
+                             [--ipv6]
+                             [--parse-ptype]
+                             [--per-port-pool]
+                             [--mode]
+                             [--eventq-sched]
+                             [--event-eth-rxqs]
+                             [--event-vector [--event-vector-size SIZE] [--event-vector-tmo NS]]
+                             [-E]
+                             [-L]
 
 Test Case: packet match ACL rule
 ================================
@@ -63,7 +88,7 @@ Ipv4 packet match source ip address 200.10.0.1 will be dropped::
     Add one default rule in rule file /root/rule_ipv6.db
     R0:0:0:0:0:0:0:0/0 0:0:0:0:0:0:0:0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv4 packet with source ip address 200.10.0.1 will be dropped.
@@ -78,7 +103,7 @@ Ipv4 packet match destination ip address 100.10.0.1 will be dropped::
     Add one default rule in rule file /root/rule_ipv6.db
     R0:0:0:0:0:0:0:0/0 0:0:0:0:0:0:0:0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv4 packet with destination ip address 100.10.0.1 will be dropped.
@@ -93,7 +118,7 @@ Ipv4 packet match source port 11 will be dropped::
     Add one default rule in rule file /root/rule_ipv6.db
     R0:0:0:0:0:0:0:0/0 0:0:0:0:0:0:0:0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv4 packet with source port 11 will be dropped.
@@ -108,7 +133,7 @@ Ipv4 packet match destination port 101 will be dropped::
     Add one default rule in rule file /root/rule_ipv6.db
     R0:0:0:0:0:0:0:0/0 0:0:0:0:0:0:0:0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv4 packet with destination port 101 will be dropped.
@@ -123,7 +148,7 @@ Ipv4 packet match protocol TCP will be dropped::
     Add one default rule in rule file /root/rule_ipv6.db
     R0:0:0:0:0:0:0:0/0 0:0:0:0:0:0:0:0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one TCP ipv4 packet will be dropped.
@@ -138,7 +163,7 @@ Ipv4 packet match 5-tuple will be dropped::
     Add one default rule in rule file /root/rule_ipv6.db
     R0:0:0:0:0:0:0:0/0 0:0:0:0:0:0:0:0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one TCP ipv4 packet with source ip address 200.10.0.1,
@@ -158,7 +183,7 @@ Ipv6 packet match source ipv6 address 2001:0db8:85a3:08d3:1319:8a2e:0370:7344/12
     Add one default rule in rule file /root/rule_ipv4.db
     R0.0.0.0/0 0.0.0.0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv6 packet with source ip address 2001:0db8:85a3:08d3:1319:8a2e:0370:7344/128 will be dropped.
@@ -173,7 +198,7 @@ Ipv6 packet match destination ipv6 address 2002:0db8:85a3:08d3:1319:8a2e:0370:73
     Add one default rule in rule file /root/rule_ipv4.db
     R0.0.0.0/0 0.0.0.0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv6 packet with destination ip address 2002:0db8:85a3:08d3:1319:8a2e:0370:7344/128 will be dropped.
@@ -188,7 +213,7 @@ Ipv6 packet match source port 11 will be dropped::
     Add one default rule in rule file /root/rule_ipv4.db
     R0.0.0.0/0 0.0.0.0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv6 packet with source port 11 will be dropped.
@@ -203,7 +228,7 @@ Ipv6 packet match destination port 101 will be dropped::
     Add one default rule in rule file /root/rule_ipv4.db
     R0.0.0.0/0 0.0.0.0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one ipv6 packet with destination port 101 will be dropped.
@@ -218,7 +243,7 @@ Ipv6 packet match protocol TCP will be dropped::
     Add one default rule in rule file /root/rule_ipv4.db
     R0.0.0.0/0 0.0.0.0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one TCP ipv6 packet will be dropped.
@@ -233,7 +258,7 @@ Ipv6 packet match 5-tuple will be dropped::
     Add one default rule in rule file /root/rule_ipv4.db
     R0.0.0.0/0 0.0.0.0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
      --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one TCP ipv6 packet with source ip address 2001:0db8:85a3:08d3:1319:8a2e:0370:7344/128,
@@ -259,7 +284,7 @@ Add two exact rule as below in rule_ipv6.db::
 
 Start l3fwd-acl and send packet::
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     Send one TCP ipv4 packet with source ip address 200.10.0.1, destination
@@ -290,7 +315,7 @@ Add two LPM rule as below in rule_ipv6.db::
 
 Start l3fwd-acl and send packet::
 
-	./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+	./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
 	--rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
 	Send one TCP ipv4 packet with destination ip address 1.1.1.1 will be forward to PORT0.
@@ -311,7 +336,7 @@ Packet match 5-tuple will be dropped::
     @2001:0db8:85a3:08d3:1319:8a2e:0370:7344/128 2002:0db8:85a3:08d3:1319:8a2e:0370:7344/101 11 : 11 101 : 101 0x06/0xff
     R0:0:0:0:0:0:0:0/0 0:0:0:0:0:0:0:0/0 0 : 65535 0 : 65535 0x00/0x00 0
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db" --scalar
 
     Send one TCP ipv4 packet with source ip address 200.10.0.1, destination ip address 100.10.0.1,
@@ -341,7 +366,7 @@ Add two ACL rule as below in rule_ipv6.db::
 
 Start l3fwd-acl::
 
-    ./<build_target>/examples/dpdk-l3fwd-acl -c ff -n 3 -- -p 0x3 --config="(0,0,2),(1,0,3)"
+    ./<build_target>/examples/dpdk-l3fwd -c ff -n 3 -- -p 0x3 --lookup acl  --parse-ptype --config="(0,0,2),(1,0,3)"
     --rule_ipv4="/root/rule_ipv4.db" --rule_ipv6="/root/rule_ipv6.db"
 
     The l3fwdacl will not set up because of ivalid ACL rule.
-- 
2.25.1

[dts][PATCH V1 2/2] tests/l3fwdacl: merge l3fwd-acl with l3fwd and fix to support different force-max-simd-bitwidth

[Yu Jiang]

1, According to dpdk22.07rc1 commit id 6de0ea50e("examples/l3fwd: merge l3fwd-acl example"),
modify l3fwdacl suite.
2, Since DTS commit "7eaf4b60 tests/l3fwdacl: modify pmd param for acl" has incorrect usage,
 fix script to support different rx_mode.

Signed-off-by: Lingli Chen <linglix.chen@intel.com>
Signed-off-by: Yu Jiang <yux.jiang@intel.com>
---
 conf/app_name.cfg           |  3 +--
 tests/TestSuite_l3fwdacl.py | 49 ++++++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/conf/app_name.cfg b/conf/app_name.cfg
index 5d3244da..84f65c92 100644
--- a/conf/app_name.cfg
+++ b/conf/app_name.cfg
@@ -37,7 +37,6 @@ l2fwd-event=target/examples/dpdk-l2fwd-event
 l2fwd-jobstats=target/examples/dpdk-l2fwd-jobstats
 l2fwd-keepalive=target/examples/dpdk-l2fwd-keepalive
 l3fwd=target/examples/dpdk-l3fwd
-l3fwd-acl=target/examples/dpdk-l3fwd-acl
 l3fwd-power=target/examples/dpdk-l3fwd-power
 link_status_interrupt=target/examples/dpdk-link_status_interrupt
 ntb=target/examples/dpdk-ntb
@@ -68,4 +67,4 @@ node=target/examples/dpdk-efd_node
 server=target/examples/dpdk-efd_server
 testpmd_vf=target/app/dpdk-testpmd-vf
 vm_power_manager=target/examples/dpdk-vm_power_manager
-guest_cli=target/examples/dpdk-guest_cli
\ No newline at end of file
+guest_cli=target/examples/dpdk-guest_cli
diff --git a/tests/TestSuite_l3fwdacl.py b/tests/TestSuite_l3fwdacl.py
index 0876b978..58e23886 100644
--- a/tests/TestSuite_l3fwdacl.py
+++ b/tests/TestSuite_l3fwdacl.py
@@ -355,7 +355,7 @@ class TestL3fwdacl(TestCase):
             extra_args = '--alg="scalar"'
 
         cmdline = (
-            '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s'
+            '%s %s -- -p %s --lookup acl --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s --parse-ptype'
             % (
                 self.app_l3fwd_acl_path,
                 self.eal_para,
@@ -447,6 +447,9 @@ class TestL3fwdacl(TestCase):
         """
         tx_interface = self.tester.get_interface(tx_port)
         rx_interface = self.tester.get_interface(rx_port)
+        # wait tester's interface up
+        for intfx in [tx_interface, rx_interface]:
+            self.tester.is_interface_up(intf=intfx)
         if rule["sIpAddr"] != "ALL":
             rule["sIpAddr"] = self.create_ipv4_ip_not_match(rule["sIpAddr"])
         if rule["dIpAddr"] != "ALL":
@@ -478,6 +481,9 @@ class TestL3fwdacl(TestCase):
         """
         tx_interface = self.tester.get_interface(tx_port)
         rx_interface = self.tester.get_interface(rx_port)
+        # wait tester's interface up
+        for intfx in [tx_interface, rx_interface]:
+            self.tester.is_interface_up(intf=intfx)
         if rule["sIpAddr"] != "ALL":
             rule["sIpAddr"] = self.create_ipv6_ip_not_match(rule["sIpAddr"])
         if rule["dIpAddr"] != "ALL":
@@ -499,7 +505,6 @@ class TestL3fwdacl(TestCase):
         pkt = packet.Packet()
         pkt.append_pkt(ethernet_str)
         pkt.send_pkt(crb=self.tester, tx_port=tx_interface, timeout=30)
-
         out = self.remove_dhcp_from_revpackets(inst)
         return len(out)
 
@@ -509,6 +514,9 @@ class TestL3fwdacl(TestCase):
         """
         tx_interface = self.tester.get_interface(tx_port)
         rx_interface = self.tester.get_interface(rx_port)
+        # wait tester's interface up
+        for intfx in [tx_interface, rx_interface]:
+            self.tester.is_interface_up(intf=intfx)
         etherStr = self.create_ipv4_rule_string(rule, "Ether")
 
         dst_filter = {"layer": "ether", "config": {"dst": "not ff:ff:ff:ff:ff:ff"}}
@@ -526,6 +534,9 @@ class TestL3fwdacl(TestCase):
         """
         tx_interface = self.tester.get_interface(tx_port)
         rx_interface = self.tester.get_interface(rx_port)
+        # wait tester's interface up
+        for intfx in [tx_interface, rx_interface]:
+            self.tester.is_interface_up(intf=intfx)
         etherStr = self.create_ipv6_rule_string(rule, "Ether")
 
         fil = [{"layer": "ether", "config": {"dst": "not ff:ff:ff:ff:ff:ff"}}]
@@ -533,7 +544,6 @@ class TestL3fwdacl(TestCase):
         pkt = packet.Packet()
         pkt.append_pkt(etherStr)
         pkt.send_pkt(crb=self.tester, tx_port=tx_interface, timeout=30)
-
         out = self.remove_dhcp_from_revpackets(inst)
         return len(out)
 
@@ -807,7 +817,7 @@ class TestL3fwdacl(TestCase):
         self.create_acl_ipv4_db(rule_list)
 
         cmdline = (
-            '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"'
+            '%s %s -- -p %s --lookup acl --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --parse-ptype'
             % (
                 self.app_l3fwd_acl_path,
                 self.eal_para,
@@ -834,7 +844,7 @@ class TestL3fwdacl(TestCase):
         self.create_acl_ipv6_db(rule_list)
 
         cmdline = (
-            '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s"'
+            '%s %s -- -p %s --lookup acl --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --parse-ptype'
             % (
                 self.app_l3fwd_acl_path,
                 self.eal_para,
@@ -867,14 +877,17 @@ class TestL3fwdacl(TestCase):
         cores = self.get_core_list()
         self.verify(cores is not None, "Insufficient cores for speed testing")
 
-        self.eal_para = self.dut.create_eal_parameters(
-            cores=self.get_core_list(), other_eal_param="force-max-simd-bitwidth"
-        )
+        self.eal_para = self.dut.create_eal_parameters(cores=self.get_core_list())
         self.core_mask = utils.create_mask(cores)
         print("Core mask: %s" % self.core_mask)
-
-        if self.dut.dpdk_version >= "20.11.0":
-            self.eal_para += " --force-max-simd-bitwidth=0"
+        # When execution.cfg set rx_mode=xxx, it should have priority.
+        print("eal_para = {}".format(self.eal_para))
+        if "force-max-simd-bitwidth" in self.eal_para:
+            pass
+        else:
+            # DTS commit 68bb1b92("tests/l3fwdacl: try to use highest available method") when dpdk > 20.11.0 by konstantin.ananyev@intel.com
+            if self.dut.dpdk_version >= "20.11.0":
+                self.eal_para += " --force-max-simd-bitwidth=0"
 
         valid_ports = [port for port in ports if self.tester.get_local_port(port) != -1]
         self.verify(
@@ -889,11 +902,8 @@ class TestL3fwdacl(TestCase):
 
         TestL3fwdacl.default_rule["Port"] = self.dut_ports[1]
 
-        # compile l3fwd-acl
-        out = self.dut.build_dpdk_apps("examples/l3fwd-acl")
-        self.app_l3fwd_acl_path = self.dut.apps_name["l3fwd-acl"]
-        self.verify("Error" not in out, "compilation error 1")
-        self.verify("No such file" not in out, "compilation error 2")
+        # dpdk22.07-rc1 commit 6de0ea50("examples/l3fwd: merge l3fwd-acl example"), compile l3fwd example.
+        self.app_l3fwd_acl_path = self.dut.build_dpdk_apps("examples/l3fwd")
 
     def test_l3fwdacl_acl_rule(self):
         """
@@ -1025,8 +1035,7 @@ class TestL3fwdacl(TestCase):
             TestL3fwdacl.lpm_rule_list_ipv6[1], tx_port, rx_port
         )
 
-        self.dut.send_expect("^C", "#", 20)
-
+        self.dut.send_expect("^C", "#", 30)
         self.verify(out1 >= 1, "Rx port0 not receive expected packet")
         self.verify(out2 >= 1, "Rx port1 not receive expected packet")
 
@@ -1103,7 +1112,7 @@ class TestL3fwdacl(TestCase):
         self.create_acl_ipv4_db(rule_list_ipv4)
 
         cmdline = (
-            '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"'
+            '%s %s -- -p %s --lookup acl --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar" --parse-ptype'
             % (
                 self.app_l3fwd_acl_path,
                 self.eal_para,
@@ -1123,7 +1132,7 @@ class TestL3fwdacl(TestCase):
         self.create_acl_ipv6_db(rule_list_ipv6)
 
         cmdline = (
-            '%s %s -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"'
+            '%s %s -- -p %s --lookup acl --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar" --parse-ptype'
             % (
                 self.app_l3fwd_acl_path,
                 self.eal_para,
-- 
2.25.1

[dts][PATCH V1 2/2] tests/l3fwdacl: merge l3fwd-acl with l3fwd and fix to support different force-max-simd-bitwidth

[lijuan.tu]

On Wed, 15 Jun 2022 12:48:21 +0000, Yu Jiang <yux.jiang@intel.com> wrote:
> 1, According to dpdk22.07rc1 commit id 6de0ea50e("examples/l3fwd: merge l3fwd-acl example"),
> modify l3fwdacl suite.
> 2, Since DTS commit "7eaf4b60 tests/l3fwdacl: modify pmd param for acl" has incorrect usage,
>  fix script to support different rx_mode.
> 
> Signed-off-by: Lingli Chen <linglix.chen@intel.com>
> Signed-off-by: Yu Jiang <yux.jiang@intel.com>


Series applied, thanks