[dts] [PATCH V4 0/2] tests/rss_gtpogre: add a new case to PF and VF gtpogre

[dts] [PATCH V4 0/2] tests/rss_gtpogre: add a new case to PF and VF gtpogre

[Xiang An]

v4:
- optimize the dts script with add a print for dpdk

v3:
- Revised title

v2:
- fix the Trailing blanks in suite: cvl_advanced_rss_gtpogre

v1:
- add a case 'parse_pfcp_over_gre_packet'

Xiang An (2):
  tests/cvl_advanced_rss_gtpogre: add case parse_pfcp_over_gre_packet
  tests/cvl_advanced_iavf_rss_gtpogre: add case
    parse_pfcp_over_gre_packet

 tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py | 53 +++++++++++++++++++++++
 tests/TestSuite_cvl_advanced_rss_gtpogre.py      | 55 ++++++++++++++++++++++++
 2 files changed, 108 insertions(+)

-- 
1.8.3.1

[dts] [PATCH V4 1/2] tests/cvl_advanced_rss_gtpogre: add case parse_pfcp_over_gre_packet

[Xiang An]

Signed-off-by: Xiang An <xiangx.an@intel.com>
---
 tests/TestSuite_cvl_advanced_rss_gtpogre.py | 55 +++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/tests/TestSuite_cvl_advanced_rss_gtpogre.py b/tests/TestSuite_cvl_advanced_rss_gtpogre.py
index 4a889ea..17029a8 100755
--- a/tests/TestSuite_cvl_advanced_rss_gtpogre.py
+++ b/tests/TestSuite_cvl_advanced_rss_gtpogre.py
@@ -3503,7 +3503,62 @@ class TestCVLAdvancedRSSGTPoGRE(TestCase):
         self.switch_testpmd(enable_rss=True)
         self.rssprocess.handle_rss_distribute_cases(cases_info=inner_l4_protocal_hash)
 
+    def change_dpdk_code(self):
+        """
+            change dpdk's code to show the PFCP ptype
+        """
+        file1 = "drivers/net/ice/ice_rxtx.c"
+        file2 = "drivers/net/ice/ice_rxtx_vec_avx2.c"
+        match1 = "rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0)\];"
+        match2 = "const uint16_t ptype0 = _mm256_extract_epi16(ptypes0_1, 1);"
+        insert1 = "printf(\"ptype: %d\\\\n\", ICE_RX_FLEX_DESC_PTYPE_M & rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0));"
+        insert2 = "printf(\"ptype: %d\\\\n\", ptype0);"
+
+        self.dut.send_expect("rm -rf drivers/net/ice/ice_rxtx.c_bak", "# ")
+        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx.c drivers/net/ice/ice_rxtx.c_bak", "# ")
+        self.dut.send_expect("rm -rf drivers/net/ice/ice_rxtx_vec_avx2.c_bak", "# ")
+        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx_vec_avx2.c drivers/net/ice/ice_rxtx_vec_avx2.c_bak", "# ")
+        self.dut.send_expect("sed -i '/%s/a\%s' %s"%(match1,insert1,file1), "# ")
+        self.dut.send_expect("sed -i '/%s/a\%s' %s"%(match2,insert2,file2), "# ")
+
+    def recovery_dpdk_code(self):
+        """
+             Recovery dpdk's code after the case finished
+        """
+        self.dut.send_expect("rm -rf drivers/net/ice/ice_rxtx.c", "# ")
+        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx.c_bak drivers/net/ice/ice_rxtx.c", "# ")
+        self.dut.send_expect("rm -rf drivers/net/ice/ice_rxtx_vec_avx2.c", "# ")
+        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx_vec_avx2.c_bak drivers/net/ice/ice_rxtx_vec_avx2.c", "# ")
+
+    def test_parse_pfcp_over_gre_packet(self):
+        self.pmd_output.quit()
+        self.change_dpdk_code()
+        self.dut.build_install_dpdk(self.dut.target)
+
+        pkt1 = 'Ether(dst="00:11:22:33:44:55")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(sport=22, dport=8805)/PFCP(S=0)'
+        pkt2 = 'Ether(dst="00:11:22:33:44:55")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(sport=22, dport=8805)/PFCP(S=1, seid=123)'
+        pkt3 = 'Ether(dst="00:11:22:33:44:55")/IPv6(nh=0x2F)/GRE(proto=0x86dd)/IPv6()/UDP(sport=22, dport=8805)/PFCP(S=0)'
+        pkt4 = 'Ether(dst="00:11:22:33:44:55")/IPv6(nh=0x2F)/GRE(proto=0x86dd)/IPv6()/UDP(sport=22, dport=8805)/PFCP(S=1, seid=256)'
+        pkts = [pkt1, pkt2, pkt3, pkt4]
+        p = Packet()
+        for i in pkts:
+            p.append_pkt(i)
+        self.switch_testpmd(enable_rss=True)
+        p.send_pkt(self.tester, tx_port=self.tester_iface0)
+        out = self.pmd_output.get_output(timeout=1)
+
+        self.verify('ptype: 351' in out,'some subcase failed')
+        self.verify('ptype: 352' in out,'some subcase failed')
+        self.verify('ptype: 353' in out,'some subcase failed')
+        self.verify('ptype: 354' in out,'some subcase failed')
+
     def tear_down(self):
+        #Judge the currently running case
+        if self.running_case == "test_parse_pfcp_over_gre_packet" :
+            self.pmd_output.quit()
+            self.recovery_dpdk_code()
+            self.dut.build_install_dpdk(self.dut.target)
+            self.switch_testpmd(enable_rss=False)
         # destroy all flow rule on port 0
         self.dut.send_command("flow flush 0", timeout=1)
         self.dut.send_command("clear port stats all", timeout=1)
-- 
1.8.3.1

[dts] [PATCH V4 2/2] tests/cvl_advanced_iavf_rss_gtpogre: add case parse_pfcp_over_gre_packet

[Xiang An]

Signed-off-by: Xiang An <xiangx.an@intel.com>
---
 tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py | 53 ++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py b/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py
index 5d5d7ee..7f4aac0 100755
--- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py
+++ b/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py
@@ -2532,7 +2532,60 @@ class TestCVLAdvancedIAVFRSSGTPoGRE(TestCase):
         self.switch_testpmd(symmetric=True)
         self.rssprocess.handle_rss_distribute_cases(cases_info=inner_l4_protocal_hash)
 
+    def change_dpdk_code(self):
+        """
+            change dpdk's code to show the PFCP ptype
+        """
+        file1 = "drivers/net/iavf/iavf_rxtx.c"
+        file2 = "drivers/net/iavf/iavf_rxtx_vec_avx2.c"
+        match1 = "rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0)\];"
+        insert1 = "printf(\"ptype: %d\\\\n\", IAVF_RX_FLEX_DESC_PTYPE_M & rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0));"
+        match2 = "const uint16_t ptype0 = _mm256_extract_epi16(ptypes0_1, 1);"
+        insert2 = "printf(\"ptype: %d\\\\n\", ptype0);"
+
+        self.dut.send_expect("rm -rf drivers/net/iavf/iavf_rxtx.c_bak", "# ")
+        self.dut.send_expect("cp -rf drivers/net/iavf/iavf_rxtx.c drivers/net/iavf/iavf_rxtx.c_bak", "# ")
+        self.dut.send_expect("sed -i '/%s/a\%s' %s" % (match1, insert1, file1), "# ")
+        self.dut.send_expect("rm -rf drivers/net/iavf/iavf_rxtx_vec_avx2.c_bak", "# ")
+        self.dut.send_expect("cp -rf drivers/net/iavf/iavf_rxtx_vec_avx2.c drivers/net/iavf/iavf_rxtx_vec_avx2.c_bak", "# ")
+        self.dut.send_expect("sed -i '/%s/a\%s' %s" % (match2, insert2, file2), "# ")
+
+    def recovery_dpdk_code(self):
+        """
+             Recovery dpdk's code after the case finished
+        """
+        self.dut.send_expect("rm -rf drivers/net/iavf/iavf_rxtx.c", "# ")
+        self.dut.send_expect("cp -rf drivers/net/iavf/iavf_rxtx.c_bak drivers/net/iavf/iavf_rxtx.c", "# ")
+
+    def test_parse_pfcp_over_gre_packet(self):
+        self.pmd_output.quit()
+        self.change_dpdk_code()
+        self.dut.build_install_dpdk(self.dut.target)
+
+        pkt1 = 'Ether(dst="00:11:22:33:44:55")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(sport=22, dport=8805)/PFCP(S=0)'
+        pkt2 = 'Ether(dst="00:11:22:33:44:55")/IP(proto=0x2F)/GRE(proto=0x0800)/IP()/UDP(sport=22, dport=8805)/PFCP(S=1, seid=123)'
+        pkt3 = 'Ether(dst="00:11:22:33:44:55")/IPv6(nh=0x2F)/GRE(proto=0x86dd)/IPv6()/UDP(sport=22, dport=8805)/PFCP(S=0)'
+        pkt4 = 'Ether(dst="00:11:22:33:44:55")/IPv6(nh=0x2F)/GRE(proto=0x86dd)/IPv6()/UDP(sport=22, dport=8805)/PFCP(S=1, seid=256)'
+        pkts = [pkt1, pkt2, pkt3, pkt4]
+        p = Packet()
+        for i in pkts:
+            p.append_pkt(i)
+        self.switch_testpmd(symmetric=True)
+        p.send_pkt(self.tester, tx_port=self.tester_iface0)
+        out = self.pmd_output.get_output(timeout=1)
+
+        self.verify('ptype: 351' in out, 'some subcase failed')
+        self.verify('ptype: 352' in out, 'some subcase failed')
+        self.verify('ptype: 353' in out, 'some subcase failed')
+        self.verify('ptype: 354' in out, 'some subcase failed')
+
     def tear_down(self):
+        # Judge the currently running case
+        if self.running_case == "test_parse_pfcp_over_gre_packet":
+            self.pmd_output.quit()
+            self.recovery_dpdk_code()
+            self.dut.build_install_dpdk(self.dut.target)
+            self.switch_testpmd(symmetric=True)
         # destroy all flow rule on port 0
         self.dut.send_command("flow flush 0", timeout=1)
         self.dut.send_command("clear port stats all", timeout=1)
-- 
1.8.3.1

Re: [dts] [PATCH V4 1/2] tests/cvl_advanced_rss_gtpogre: add case parse_pfcp_over_gre_packet

[David Marchand]

On Mon, Jun 7, 2021 at 5:13 AM Xiang An <xiangx.an@intel.com> wrote:
>

Empty commitlog...


> Signed-off-by: Xiang An <xiangx.an@intel.com>
> ---
>  tests/TestSuite_cvl_advanced_rss_gtpogre.py | 55 +++++++++++++++++++++++++++++
>  1 file changed, 55 insertions(+)
>
> diff --git a/tests/TestSuite_cvl_advanced_rss_gtpogre.py b/tests/TestSuite_cvl_advanced_rss_gtpogre.py
> index 4a889ea..17029a8 100755
> --- a/tests/TestSuite_cvl_advanced_rss_gtpogre.py
> +++ b/tests/TestSuite_cvl_advanced_rss_gtpogre.py
> @@ -3503,7 +3503,62 @@ class TestCVLAdvancedRSSGTPoGRE(TestCase):
>          self.switch_testpmd(enable_rss=True)
>          self.rssprocess.handle_rss_distribute_cases(cases_info=inner_l4_protocal_hash)
>
> +    def change_dpdk_code(self):
> +        """
> +            change dpdk's code to show the PFCP ptype
> +        """
> +        file1 = "drivers/net/ice/ice_rxtx.c"
> +        file2 = "drivers/net/ice/ice_rxtx_vec_avx2.c"
> +        match1 = "rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0)\];"
> +        match2 = "const uint16_t ptype0 = _mm256_extract_epi16(ptypes0_1, 1);"
> +        insert1 = "printf(\"ptype: %d\\\\n\", ICE_RX_FLEX_DESC_PTYPE_M & rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0));"
> +        insert2 = "printf(\"ptype: %d\\\\n\", ptype0);"
> +
> +        self.dut.send_expect("rm -rf drivers/net/ice/ice_rxtx.c_bak", "# ")
> +        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx.c drivers/net/ice/ice_rxtx.c_bak", "# ")
> +        self.dut.send_expect("rm -rf drivers/net/ice/ice_rxtx_vec_avx2.c_bak", "# ")
> +        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx_vec_avx2.c drivers/net/ice/ice_rxtx_vec_avx2.c_bak", "# ")
> +        self.dut.send_expect("sed -i '/%s/a\%s' %s"%(match1,insert1,file1), "# ")
> +        self.dut.send_expect("sed -i '/%s/a\%s' %s"%(match2,insert2,file2), "# ")

And changing driver code.

NAK.


-- 
David Marchand

Re: [dts] [PATCH V4 1/2] tests/cvl_advanced_rss_gtpogre: add case parse_pfcp_over_gre_packet

[Honnappa Nagarahalli]

<snip>

> 
> On Mon, Jun 7, 2021 at 5:13 AM Xiang An <xiangx.an@intel.com> wrote:
> >
> 
> Empty commitlog...
> 
> 
> > Signed-off-by: Xiang An <xiangx.an@intel.com>
> > ---
> >  tests/TestSuite_cvl_advanced_rss_gtpogre.py | 55
> +++++++++++++++++++++++++++++
> >  1 file changed, 55 insertions(+)
> >
> > diff --git a/tests/TestSuite_cvl_advanced_rss_gtpogre.py
> b/tests/TestSuite_cvl_advanced_rss_gtpogre.py
> > index 4a889ea..17029a8 100755
> > --- a/tests/TestSuite_cvl_advanced_rss_gtpogre.py
> > +++ b/tests/TestSuite_cvl_advanced_rss_gtpogre.py
> > @@ -3503,7 +3503,62 @@ class TestCVLAdvancedRSSGTPoGRE(TestCase):
> >          self.switch_testpmd(enable_rss=True)
> >
> self.rssprocess.handle_rss_distribute_cases(cases_info=inner_l4_protocal_has
> h)
> >
> > +    def change_dpdk_code(self):
> > +        """
> > +            change dpdk's code to show the PFCP ptype
> > +        """
> > +        file1 = "drivers/net/ice/ice_rxtx.c"
> > +        file2 = "drivers/net/ice/ice_rxtx_vec_avx2.c"
> > +        match1 = "rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0)\];"
> > +        match2 = "const uint16_t ptype0 = _mm256_extract_epi16(ptypes0_1,
> 1);"
> > +        insert1 = "printf(\"ptype: %d\\\\n\", ICE_RX_FLEX_DESC_PTYPE_M &
> rte_le_to_cpu_16(rxdp\[j\].wb.ptype_flex_flags0));"
> > +        insert2 = "printf(\"ptype: %d\\\\n\", ptype0);"
Would not this approach fail badly if the code changes in the future?

> > +
> > +        self.dut.send_expect("rm -rf drivers/net/ice/ice_rxtx.c_bak", "# ")
> > +        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx.c
> drivers/net/ice/ice_rxtx.c_bak", "# ")
> > +        self.dut.send_expect("rm -rf
> drivers/net/ice/ice_rxtx_vec_avx2.c_bak", "# ")
> > +        self.dut.send_expect("cp -rf drivers/net/ice/ice_rxtx_vec_avx2.c
> drivers/net/ice/ice_rxtx_vec_avx2.c_bak", "# ")
> > +        self.dut.send_expect("sed -i '/%s/a\%s' %s"%(match1,insert1,file1), "#
> ")
> > +        self.dut.send_expect("sed -i '/%s/a\%s' %s"%(match2,insert2,file2), "#
> ")
> 
> And changing driver code.
> 
> NAK.
> 
> 
> --
> David Marchand