Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/74984/?format=api
{ "id": 74984, "url": "http://patches.dpdk.org/api/patches/74984/?format=api", "web_url": "http://patches.dpdk.org/project/dts/patch/20200729082224.16609-1-box.c.chen@intel.com/", "project": { "id": 3, "url": "http://patches.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20200729082224.16609-1-box.c.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20200729082224.16609-1-box.c.chen@intel.com", "date": "2020-07-29T08:22:24", "name": "[V2] tests/iavf_fdir: Adaptive-dpdk-RSS-algorithm-update", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "020c7483c0ee2dacb9b761ef3289edf5ad761f95", "submitter": { "id": 1819, "url": "http://patches.dpdk.org/api/people/1819/?format=api", "name": "Chen, BoX C", "email": "box.c.chen@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dts/patch/20200729082224.16609-1-box.c.chen@intel.com/mbox/", "series": [ { "id": 11388, "url": "http://patches.dpdk.org/api/series/11388/?format=api", "web_url": "http://patches.dpdk.org/project/dts/list/?series=11388", "date": "2020-07-29T08:22:24", "name": "[V2] tests/iavf_fdir: Adaptive-dpdk-RSS-algorithm-update", "version": 2, "mbox": "http://patches.dpdk.org/series/11388/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/74984/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/74984/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B44CDA052B;\n\tWed, 29 Jul 2020 10:35:19 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 53BAF37B7;\n\tWed, 29 Jul 2020 10:35:19 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by dpdk.org (Postfix) with ESMTP id BFF0EF04\n for <dts@dpdk.org>; Wed, 29 Jul 2020 10:35:17 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 29 Jul 2020 01:35:16 -0700", "from unknown (HELO cb-dts.sh.intel.com) ([10.240.183.58])\n by orsmga002.jf.intel.com with ESMTP; 29 Jul 2020 01:35:14 -0700" ], "IronPort-SDR": [ "\n QbwZQaxIE2Y2qZq1NByF8zGVGldg0HbCqLu3W/JqnhcL02HjcGZk38lpKp+Mdva717WzRqtgee\n THLcorMre1/w==", "\n vEi2i8WRlPEAiesYvBfc3AMLm38JoPGdhkHG7CQJQyAKq/TiCWyqyYnCGjKmz7q4WvJtQLK2Kq\n fnbh7vISg1lA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9696\"; a=\"151359287\"", "E=Sophos;i=\"5.75,409,1589266800\"; d=\"scan'208\";a=\"151359287\"", "E=Sophos;i=\"5.75,409,1589266800\"; d=\"scan'208\";a=\"304153628\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "ChenBo <box.c.chen@intel.com>", "To": "dts@dpdk.org", "Cc": "ChenBo <box.c.chen@intel.com>", "Date": "Wed, 29 Jul 2020 16:22:24 +0800", "Message-Id": "<20200729082224.16609-1-box.c.chen@intel.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[dts] [PATCH V2] tests/iavf_fdir: Adaptive-dpdk-RSS-algorithm-update", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org", "Sender": "\"dts\" <dts-bounces@dpdk.org>" }, "content": "According to DPDK-22058, adaptive dpdk RSS algorithm update\nmerge comment\n\nSigned-off-by: ChenBo <box.c.chen@intel.com>\n---\n tests/TestSuite_iavf_fdir.py | 111 +++++++++++++++++++----------------\n 1 file changed, 62 insertions(+), 49 deletions(-)\n\n self.dut.close_session(self.session_secondary)\n if getattr(self, 'session_third', None):", "diff": "diff --git a/tests/TestSuite_iavf_fdir.py b/tests/TestSuite_iavf_fdir.py\nindex f2004c6..2e02006 100644\n--- a/tests/TestSuite_iavf_fdir.py\n+++ b/tests/TestSuite_iavf_fdir.py\n@@ -750,9 +750,9 @@ tv_mac_ipv6_pay_mark = {\n \n tv_mac_ipv6_udp_queue_index = {\n \"name\": \"test_mac_ipv6_udp_queue_index\",\n- \"rule\": \"flow create 0 ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 hop is 2 tc is 1 / udp src is 22 dst is 23 / end actions queue index 1 / end\",\n+ \"rule\": \"flow create 0 ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 hop is 2 tc is 1 / udp src is 22 dst is 23 / end actions queue index 2 / end\",\n \"scapy_str\": MAC_IPV6_UDP,\n- \"check_param\": {\"port_id\": 0, \"queue\": 1}\n+ \"check_param\": {\"port_id\": 0, \"queue\": 2}\n }\n \n tv_mac_ipv6_udp_queue_group = {\n@@ -792,9 +792,9 @@ tv_mac_ipv6_udp_mark = {\n \n tv_mac_ipv6_tcp_queue_index = {\n \"name\": \"test_mac_ipv6_tcp_queue_index\",\n- \"rule\": \"flow create 0 ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 hop is 2 tc is 1 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\",\n+ \"rule\": \"flow create 0 ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 hop is 2 tc is 1 / tcp src is 22 dst is 23 / end actions queue index 2 / mark / end\",\n \"scapy_str\": MAC_IPV6_TCP,\n- \"check_param\": {\"port_id\": 0, \"queue\": 1, \"mark_id\": 0}\n+ \"check_param\": {\"port_id\": 0, \"queue\": 2, \"mark_id\": 0}\n }\n \n tv_mac_ipv6_tcp_queue_group = {\n@@ -1298,9 +1298,6 @@ class TestIAVFFdir(TestCase):\n self.pkt = Packet()\n self.pmd_output = PmdOutput(self.dut)\n \n- self.re_load_ice_driver()\n- self.setup_2pf_4vf_env()\n-\n self.src_file_dir = 'dep/'\n self.dut_file_dir = '/tmp/'\n self.cvlq_num = CVL_TXQ_RXQ_NUMBER\n@@ -1390,8 +1387,8 @@ class TestIAVFFdir(TestCase):\n self.dut.send_expect(\"rmmod ice\", \"# \", 40)\n ice_driver_file_location = self.suite_config[\"ice_driver_file_location\"]\n self.dut.send_expect(\"insmod %s\" % ice_driver_file_location, \"# \")\n- self.dut.send_expect(\"ifconfig %s up\" % self.dut_ports[0], \"# \", 15)\n- self.dut.send_expect(\"ifconfig %s up\" % self.dut_ports[1], \"# \", 15)\n+ self.dut.send_expect(\"ifconfig %s up\" % self.pf0_intf, \"# \", 15)\n+ self.dut.send_expect(\"ifconfig %s up\" % self.pf1_intf, \"# \", 15)\n \n def config_testpmd(self):\n self.pmd_output.execute_cmd(\"set fwd rxonly\")\n@@ -2135,8 +2132,8 @@ class TestIAVFFdir(TestCase):\n \n rules = [\n \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / tcp src is 22 dst is 23 / end actions rss queues 2 3 end / end\",\n- \"flow create 1 ingress pattern eth / ipv4 src is 192.168.0.22 dst is 192.168.0.23 / udp src is 22 dst is 23 / end actions queue index 5 / mark / end\",\n- \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.22 dst is 192.168.0.23 / udp src is 22 dst is 23 / end actions queue index 5 / mark id 1 / end\",\n+ \"flow create 1 ingress pattern eth / ipv4 src is 192.168.0.22 dst is 192.168.0.23 / udp src is 22 dst is 23 / end actions queue index 6 / mark / end\",\n+ \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.22 dst is 192.168.0.23 / udp src is 22 dst is 23 / end actions queue index 6 / mark id 1 / end\",\n \"flow create 1 ingress pattern eth / ipv4 src is 192.168.0.22 dst is 192.168.0.23 tos is 4 / tcp src is 22 dst is 23 / end actions drop / end\"]\n pkts = {\n \"matched\": [\n@@ -2200,14 +2197,14 @@ class TestIAVFFdir(TestCase):\n out_vf00 = self.send_pkts_getouput(pkts[\"matched\"][0])\n rfc.check_iavf_fdir_mark(out_vf00, pkt_num=1, check_param={\"port_id\": 0, \"queue\": [2, 3]}, stats=True)\n out_vf01 = self.send_pkts_getouput(pkts[\"matched\"][1])\n- rfc.check_iavf_fdir_mark(out_vf01, pkt_num=1, check_param={\"port_id\": 1, \"queue\": 5, \"mark_id\": 0}, stats=True)\n+ rfc.check_iavf_fdir_mark(out_vf01, pkt_num=1, check_param={\"port_id\": 1, \"queue\": 6, \"mark_id\": 0}, stats=True)\n \n self.send_packets(pkts[\"matched\"][2], pf_id=1)\n out_info = self.session_secondary.get_session_before(timeout=2)\n out_pkt = self.session_secondary.send_expect(\"stop\", \"testpmd> \")\n out_vf10 = out_info + out_pkt\n self.session_secondary.send_expect(\"start\", \"testpmd> \")\n- rfc.check_iavf_fdir_mark(out_vf10, pkt_num=1, check_param={\"port_id\": 0, \"queue\": 5, \"mark_id\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out_vf10, pkt_num=1, check_param={\"port_id\": 0, \"queue\": 6, \"mark_id\": 1}, stats=True)\n \n self.send_packets(pkts[\"matched\"][3], pf_id=1)\n out_info = self.session_secondary.get_session_before(timeout=2)\n@@ -2220,14 +2217,14 @@ class TestIAVFFdir(TestCase):\n out_vf00 = self.send_pkts_getouput(pkts[\"mismatched\"][0])\n rfc.check_iavf_fdir_mark(out_vf00, pkt_num=1, check_param={\"port_id\": 0, \"queue\": [2, 3]}, stats=False)\n out_vf01 = self.send_pkts_getouput(pkts[\"mismatched\"][1])\n- rfc.check_iavf_fdir_mark(out_vf01, pkt_num=1, check_param={\"port_id\": 1, \"queue\": 5, \"mark_id\": 0}, stats=False)\n+ rfc.check_iavf_fdir_mark(out_vf01, pkt_num=1, check_param={\"port_id\": 1, \"queue\": 6, \"mark_id\": 0}, stats=False)\n \n self.send_packets(pkts[\"mismatched\"][2], pf_id=1)\n out_info = self.session_secondary.get_session_before(timeout=2)\n out_pkt = self.session_secondary.send_expect(\"stop\", \"testpmd> \")\n out_vf10 = out_info + out_pkt\n self.session_secondary.send_expect(\"start\", \"testpmd> \")\n- rfc.check_iavf_fdir_mark(out_vf10, pkt_num=1, check_param={\"port_id\": 0, \"queue\": 5, \"mark_id\": 1}, stats=False)\n+ rfc.check_iavf_fdir_mark(out_vf10, pkt_num=1, check_param={\"port_id\": 0, \"queue\": 6, \"mark_id\": 1}, stats=False)\n \n self.send_packets(pkts[\"mismatched\"][3], pf_id=1)\n out_info = self.session_secondary.get_session_before(timeout=2)\n@@ -2261,14 +2258,14 @@ class TestIAVFFdir(TestCase):\n out_vf00 = self.send_pkts_getouput(pkts[\"matched\"][0])\n rfc.check_iavf_fdir_mark(out_vf00, pkt_num=1, check_param={\"port_id\": 0, \"queue\": [2, 3]}, stats=False)\n out_vf01 = self.send_pkts_getouput(pkts[\"matched\"][1])\n- rfc.check_iavf_fdir_mark(out_vf01, pkt_num=1, check_param={\"port_id\": 1, \"queue\": 5, \"mark_id\": 0}, stats=False)\n+ rfc.check_iavf_fdir_mark(out_vf01, pkt_num=1, check_param={\"port_id\": 1, \"queue\": 6, \"mark_id\": 0}, stats=False)\n \n self.send_packets(pkts[\"matched\"][2], pf_id=1)\n out_info = self.session_secondary.get_session_before(timeout=2)\n out_pkt = self.session_secondary.send_expect(\"stop\", \"testpmd> \")\n out_vf10 = out_info + out_pkt\n self.session_secondary.send_expect(\"start\", \"testpmd> \")\n- rfc.check_iavf_fdir_mark(out_vf10, pkt_num=1, check_param={\"port_id\": 0, \"queue\": 5, \"mark_id\": 1}, stats=False)\n+ rfc.check_iavf_fdir_mark(out_vf10, pkt_num=1, check_param={\"port_id\": 0, \"queue\": 6, \"mark_id\": 1}, stats=False)\n \n self.send_packets(pkts[\"matched\"][3], pf_id=1)\n out_info = self.session_secondary.get_session_before(timeout=2)\n@@ -2609,19 +2606,27 @@ class TestIAVFFdir(TestCase):\n profile 0 and profile 1 are default profile for specific packet.\n design case with 2*100G card, so only 110 profiles can be used for vf.\n \"\"\"\n+ nex_cnt = 0\n self.destroy_env()\n self.setup_npf_nvf_env(pf_num=1,vf_num=16)\n- self.dut.send_expect('ip link set %s vf 10 mac 00:11:22:33:44:55' % self.pf0_intf, '#')\n+\n+ if len(self.dut_ports) == 4:\n+ nex_cnt = 94 // 8\n+ elif len(self.dut_ports) == 2:\n+ nex_cnt = 110 // 8\n+ else:\n+ self.verify(False, 'The number of ports is not supported')\n+\n+ self.dut.send_expect(\"ip link set {} vf {} mac 00:11:22:33:44:55\".format(self.pf0_intf, nex_cnt), '#')\n command = \"./%s/app/testpmd -c f -n 6 -- -i %s\" % (self.dut.target, \"--rxq=4 --txq=4\")\n self.dut.send_expect(command, \"testpmd> \", 360)\n self.config_testpmd()\n- for port_id in range(11):\n+\n+ for port_id in range(nex_cnt):\n rules = [\n- \"flow create %d ingress pattern eth / ipv4 proto is 255 / end actions queue index 1 / mark / end\" % port_id,\n \"flow create %d ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end\" % port_id,\n \"flow create %d ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\" % port_id,\n \"flow create %d ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / sctp src is 22 dst is 23 / end actions queue index 1 / mark / end\" % port_id,\n- \"flow create %d ingress pattern eth / ipv6 proto is 0 / end actions mark / rss / end\" % port_id,\n \"flow create %d ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end\" % port_id,\n \"flow create %d ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\" % port_id,\n \"flow create %d ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 / sctp src is 22 dst is 23 / end actions queue index 1 / mark / end\" % port_id,\n@@ -2629,17 +2634,25 @@ class TestIAVFFdir(TestCase):\n \"flow create %d ingress pattern eth / ipv4 / udp / pfcp s_field is 0 / end actions queue index 2 / end\" % port_id]\n self.create_fdir_rule(rules, check_stats=True)\n \n- rule = \"flow create 11 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end\"\n+ rules = [\n+ \"flow create {} ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end\".format(nex_cnt),\n+ \"flow create {} ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\".format(nex_cnt),\n+ \"flow create {} ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / sctp src is 22 dst is 23 / end actions queue index 1 / mark / end\".format(nex_cnt),\n+ \"flow create {} ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 / udp src is 22 dst is 23 / end actions queue index 1 / mark / end\".format(nex_cnt),\n+ \"flow create {} ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\".format(nex_cnt),\n+ \"flow create {} ingress pattern eth / ipv6 dst is CDCD:910A:2222:5498:8475:1111:3900:2020 src is 2001::2 / sctp src is 22 dst is 23 / end actions queue index 1 / mark / end\".format(nex_cnt)]\n+ self.create_fdir_rule(rules, check_stats=True)\n+\n+ rule = \"flow create {} ingress pattern eth type is 0x8863 / end actions queue index 1 / mark id 1 / end\".format(nex_cnt)\n self.create_fdir_rule(rule, check_stats=False)\n- self.check_fdir_rule(port_id=11, stats=False)\n pkt = 'Ether(dst=\"00:11:22:33:44:55\")/IP(src=\"192.168.0.20\",dst=\"192.168.0.21\")/UDP(sport=22, dport=23)/ Raw(\"x\" * 80)'\n out = self.send_pkts_getouput(pkts=pkt)\n- rfc.check_iavf_fdir_mark(out, pkt_num=1, check_param={\"port_id\": 10, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out, pkt_num=1, check_param={\"port_id\": nex_cnt, \"mark_id\": 0, \"queue\": 1}, stats=True)\n \n- self.dut.send_expect(\"flow flush 10\", \"testpmd> \")\n- self.check_fdir_rule(port_id=10, stats=False)\n+ self.dut.send_expect(\"flow flush {}\".format(nex_cnt), \"testpmd> \")\n+ self.check_fdir_rule(port_id=(nex_cnt), stats=False)\n out = self.send_pkts_getouput(pkts=pkt)\n- rfc.check_iavf_fdir_mark(out, pkt_num=1, check_param={\"port_id\": 10, \"mark_id\": 0, \"queue\": 1}, stats=False)\n+ rfc.check_iavf_fdir_mark(out, pkt_num=1, check_param={\"port_id\": nex_cnt, \"mark_id\": 0, \"queue\": 1}, stats=False)\n \n self.create_fdir_rule(rule, check_stats=False)\n \n@@ -2665,10 +2678,10 @@ class TestIAVFFdir(TestCase):\n add/delete rules 14336 times on 1 vf\n \"\"\"\n rules = [\n- \"flow create 0 ingress pattern eth / ipv4 proto is 255 / end actions queue index 1 / mark / end\",\n+ \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / udp src is 22 dst is 23 / end actions queue index 6 / mark / end\",\n \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.20 dst is 192.168.0.21 / tcp src is 22 dst is 23 / end actions rss queues 2 3 end / mark id 1 / end\"]\n pkts = [\n- 'Ether(dst=\"00:11:22:33:44:55\")/IP(src=\"192.168.0.20\",dst=\"192.168.0.21\", proto=255)/Raw(\"x\" * 80)',\n+ 'Ether(dst=\"00:11:22:33:44:55\")/IP(src=\"192.168.0.20\",dst=\"192.168.0.21\")/UDP(sport=22,dport=23)/Raw(\"x\" * 80)',\n 'Ether(dst=\"00:11:22:33:44:55\")/IP(src=\"192.168.0.20\",dst=\"192.168.0.21\")/TCP(sport=22,dport=23)/Raw(\"x\" * 80)']\n self.dut.kill_all()\n src_file = 'add_delete_rules_1vf'\n@@ -2690,7 +2703,7 @@ class TestIAVFFdir(TestCase):\n self.check_fdir_rule(port_id=0, stats=False)\n self.create_fdir_rule(rules, check_stats=True)\n out_0 = self.send_pkts_getouput(pkts=pkts[0])\n- rfc.check_iavf_fdir_mark(out_0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out_0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 6}, stats=True)\n out_1 = self.send_pkts_getouput(pkts=pkts[1])\n rfc.check_iavf_fdir_mark(out_1, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 1, \"queue\": [2, 3]}, stats=True)\n \n@@ -2841,16 +2854,16 @@ class TestIAVFFdir(TestCase):\n relaunch testpmd, create same rules, can take effect.\n \"\"\"\n rules = [\n- \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\",\n- \"flow create 1 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\"]\n+ \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 6 / mark / end\",\n+ \"flow create 1 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 6 / mark / end\"]\n pkts = [\n 'Ether(dst=\"00:11:22:33:44:55\")/IP(src=\"192.168.0.0\",dst=\"192.1.0.0\", tos=4)/TCP(sport=22,dport=23)/Raw(\"x\" * 80)',\n 'Ether(dst=\"00:11:22:33:44:66\")/IP(src=\"192.168.0.0\",dst=\"192.1.0.0\", tos=4)/TCP(sport=22,dport=23)/Raw(\"x\" * 80)']\n rule_li = self.create_fdir_rule(rules, check_stats=True)\n out0 = self.send_pkts_getouput(pkts=pkts[0])\n- rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 6}, stats=True)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=True)\n # reset vf\n self.dut.send_expect(\"stop\", \"testpmd> \")\n self.dut.send_expect(\"port stop 0\", \"testpmd> \")\n@@ -2863,22 +2876,22 @@ class TestIAVFFdir(TestCase):\n out0 = self.send_pkts_getouput(pkts=pkts[0])\n rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"passthru\": 1}, stats=True)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=True)\n # delete the rules\n self.dut.send_expect(\"flow destroy 0 rule 0\", \"Invalid flow destroy\")\n self.destroy_fdir_rule(rule_id='0', port_id=1)\n out0 = self.send_pkts_getouput(pkts=pkts[0])\n- rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 1}, stats=False)\n+ rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 6}, stats=False)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=False)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=False)\n # relaunch testpmd, and create the rules, check matched packets.\n self.dut.send_expect(\"quit\", \"# \")\n self.launch_testpmd()\n self.create_fdir_rule(rules, check_stats=True)\n out0 = self.send_pkts_getouput(pkts=pkts[0])\n- rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 6}, stats=True)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=True)\n \n def test_stress_pf_reset_vf_add_new_rule(self):\n \"\"\"\n@@ -2939,17 +2952,17 @@ class TestIAVFFdir(TestCase):\n \"\"\"\n self.session_secondary = self.dut.new_session()\n rules = [\n- \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\",\n- \"flow create 1 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 1 / mark / end\"]\n+ \"flow create 0 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 6 / mark / end\",\n+ \"flow create 1 ingress pattern eth / ipv4 src is 192.168.0.0 dst is 192.1.0.0 tos is 4 / tcp src is 22 dst is 23 / end actions queue index 6 / mark / end\"]\n pkts = [\n 'Ether(dst=\"00:11:22:33:44:55\")/IP(src=\"192.168.0.0\",dst=\"192.1.0.0\", tos=4)/TCP(sport=22,dport=23)/Raw(\"x\" * 80)',\n 'Ether(dst=\"00:11:22:33:44:66\")/IP(src=\"192.168.0.0\",dst=\"192.1.0.0\", tos=4)/TCP(sport=22,dport=23)/Raw(\"x\" * 80)',\n 'Ether(dst=\"00:11:22:33:44:56\")/IP(src=\"192.168.0.0\",dst=\"192.1.0.0\", tos=4)/TCP(sport=22,dport=23)/Raw(\"x\" * 80)']\n self.create_fdir_rule(rules, check_stats=True)\n out0 = self.send_pkts_getouput(pkts=pkts[0])\n- rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 6}, stats=True)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=True)\n \n self.session_secondary.send_expect(\"ip link set %s vf 0 mac 00:11:22:33:44:56\" % self.pf0_intf, \"# \")\n out = self.dut.session.get_session_before(timeout=2)\n@@ -2962,23 +2975,23 @@ class TestIAVFFdir(TestCase):\n out0 = self.send_pkts_getouput(pkts=pkts[2])\n rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"passthru\": 1}, stats=True)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=True)\n # delete the rules\n self.dut.send_expect(\"flow destroy 0 rule 0\", \"Invalid flow destroy\")\n self.destroy_fdir_rule(rule_id='0', port_id=1)\n out0 = self.send_pkts_getouput(pkts=pkts[2])\n- rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 1}, stats=False)\n+ rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 6}, stats=False)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=False)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=False)\n \n # relaunch testpmd, and create the rules, check matched packets.\n self.dut.send_expect(\"quit\", \"# \")\n self.launch_testpmd()\n self.create_fdir_rule(rules, check_stats=True)\n out0 = self.send_pkts_getouput(pkts=pkts[2])\n- rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out0, pkt_num=1, check_param={\"port_id\": 0, \"mark_id\": 0, \"queue\": 6}, stats=True)\n out1 = self.send_pkts_getouput(pkts=pkts[1])\n- rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 1}, stats=True)\n+ rfc.check_iavf_fdir_mark(out1, pkt_num=1, check_param={\"port_id\": 1, \"mark_id\": 0, \"queue\": 6}, stats=True)\n self.dut.send_expect(\"quit\", \"# \")\n self.session_secondary.send_expect(\"ip link set %s vf 0 mac 00:11:22:33:44:55\" % self.pf0_intf, \"# \")\n self.dut.close_session(self.session_secondary)\n@@ -3356,8 +3369,8 @@ class TestIAVFFdir(TestCase):\n \n def tear_down(self):\n # destroy all flow rule on port 0\n- self.destroy_env()\n self.dut.kill_all()\n # Wait for NIC to clean up resources\n time.sleep(1)\n+ self.destroy_env()\n if getattr(self, 'session_secondary', None):\n", "prefixes": [ "V2" ] }