From patchwork Mon Jun 7 06:31:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang An X-Patchwork-Id: 93946 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1B661A034F; Mon, 7 Jun 2021 08:21:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1476E40DF4; Mon, 7 Jun 2021 08:21:24 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 9A69D4003E for ; Mon, 7 Jun 2021 08:21:21 +0200 (CEST) IronPort-SDR: r4aEnqiFrSU7cqGcaeUTisxxOsAx0vqiaqEt0rTCEgsH2+fTo7vshxVVxiUl3YHGZfJyZ9+/+0 tY8USILFfp0g== X-IronPort-AV: E=McAfee;i="6200,9189,10007"; a="184249347" X-IronPort-AV: E=Sophos;i="5.83,254,1616482800"; d="scan'208";a="184249347" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2021 23:21:08 -0700 IronPort-SDR: KSHqsUlfRjSSa8unR0ORWPUUJnc2MJwGOBUoBA9qpVaRZ/BXnN/RPmy5iIqgqV9kXTvEbtLgur wj24Kz6BIwQA== X-IronPort-AV: E=Sophos;i="5.83,254,1616482800"; d="scan'208";a="481400214" Received: from unknown (HELO dpdk-zhaohy-t.sh.intel.com) ([10.240.183.68]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2021 23:21:06 -0700 From: Xiang An To: dts@dpdk.org Cc: yuan.peng@intel.com, Xiang An Date: Mon, 7 Jun 2021 14:31:18 +0800 Message-Id: <1623047479-221222-2-git-send-email-xiangx.an@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1623047479-221222-1-git-send-email-xiangx.an@intel.com> References: <1623047479-221222-1-git-send-email-xiangx.an@intel.com> Subject: [dts] [PATCH V5 1/2] tests/cvl_advanced_rss_gtpogre: add case parse_pfcp_over_gre_packet X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Signed-off-by: Xiang An --- 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) From patchwork Mon Jun 7 06:31:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiang An X-Patchwork-Id: 93947 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4C6D2A0C3F; Mon, 7 Jun 2021 08:21:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 440A2410F3; Mon, 7 Jun 2021 08:21:25 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id D074940DF4 for ; Mon, 7 Jun 2021 08:21:21 +0200 (CEST) IronPort-SDR: oZ7kqi3IDDrXKZPOkP5FL6/RXLEWGBWxEyh9wytX6k9xMqNxjmXVeKy1ejFlRBtz1RyztRTnz3 QZsEm/8/f9og== X-IronPort-AV: E=McAfee;i="6200,9189,10007"; a="184249353" X-IronPort-AV: E=Sophos;i="5.83,254,1616482800"; d="scan'208";a="184249353" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2021 23:21:11 -0700 IronPort-SDR: RZi79oRrZcRZ07xEM5qws18qBZaw0ZsPtmPuPYqUzmD/l3VksReqv4jmgzw8DYa0oL9QB3uVHb lS2U/KuhHJog== X-IronPort-AV: E=Sophos;i="5.83,254,1616482800"; d="scan'208";a="481400236" Received: from unknown (HELO dpdk-zhaohy-t.sh.intel.com) ([10.240.183.68]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2021 23:21:09 -0700 From: Xiang An To: dts@dpdk.org Cc: yuan.peng@intel.com, Xiang An Date: Mon, 7 Jun 2021 14:31:19 +0800 Message-Id: <1623047479-221222-3-git-send-email-xiangx.an@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1623047479-221222-1-git-send-email-xiangx.an@intel.com> References: <1623047479-221222-1-git-send-email-xiangx.an@intel.com> Subject: [dts] [PATCH V5 2/2] tests/cvl_advanced_iavf_rss_gtpogre: add case parse_pfcp_over_gre_packet X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Signed-off-by: Xiang An --- tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py | 55 ++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py b/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py index 5d5d7ee..193c478 100755 --- a/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py +++ b/tests/TestSuite_cvl_advanced_iavf_rss_gtpogre.py @@ -2532,7 +2532,62 @@ 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", "# ") + self.dut.send_expect("rm -rf drivers/net/iavf/iavf_rxtx_vec_avx2.c", "# ") + self.dut.send_expect("cp -rf drivers/net/iavf/iavf_rxtx_vec_avx2.c_bak drivers/net/iavf/iavf_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(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)