For ipfragment test,the mismatch pkt no need to send with fragment. so modify rte_flow_common to adapt test steps changed. V2: fix format issue. Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> --- tests/rte_flow_common.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/rte_flow_common.py b/tests/rte_flow_common.py index 45446521..25266588 100644 --- a/tests/rte_flow_common.py +++ b/tests/rte_flow_common.py @@ -1389,14 +1389,17 @@ class FdirProcessing(object): self.verify = self.test_case.verify self.ipfrag_flag = ipfrag_flag - def send_pkt_get_output(self, pkts, port_id=0, count=1, interval=0, drop=False): + def send_pkt_get_output( + self, pkts, port_id=0, count=1, interval=0, drop=False, **kwargs + ): tx_port = self.tester_ifaces[0] if port_id == 0 else self.tester_ifaces[1] self.logger.info("----------send packet-------------") self.logger.info("{}".format(pkts)) + mismatch_flag = kwargs.get("mismatch") if drop: self.pmd_output.execute_cmd("clear port stats all") time.sleep(1) - if self.ipfrag_flag == True: + if self.ipfrag_flag == True and not mismatch_flag: send_ipfragment_pkt(self.test_case, pkts, tx_port) else: self.pkt.update_pkt(pkts) @@ -1410,7 +1413,7 @@ class FdirProcessing(object): self.pmd_output.execute_cmd("start") return out else: - if self.ipfrag_flag == True: + if self.ipfrag_flag == True and not mismatch_flag: count = 2 send_ipfragment_pkt(self.test_case, pkts, tx_port) else: @@ -1623,11 +1626,14 @@ class FdirProcessing(object): # send and check unmatched packets out2 = self.send_pkt_get_output( - pkts=tv["scapy_str"]["unmatched"], port_id=port_id, drop=drop + pkts=tv["scapy_str"]["unmatched"], + port_id=port_id, + drop=drop, + mismatch=True, ) check_mark( out2, - pkt_num=len(tv["scapy_str"]["unmatched"]) * 2 + pkt_num=len(tv["scapy_str"]["unmatched"]) if self.ipfrag_flag else len(tv["scapy_str"]["unmatched"]), check_param=tv["check_param"], -- 2.17.1
mismatch pkt should cover mismatch inputset pkts and mismatch pattern pkts. extend mismatch pkts to cover more test. V2: fix format issue Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> --- tests/TestSuite_ice_ip_fragment_rte_flow.py | 60 ++++++++++++++++----- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_ice_ip_fragment_rte_flow.py b/tests/TestSuite_ice_ip_fragment_rte_flow.py index 3acf3250..f7b816e4 100644 --- a/tests/TestSuite_ice_ip_fragment_rte_flow.py +++ b/tests/TestSuite_ice_ip_fragment_rte_flow.py @@ -48,7 +48,10 @@ tv_mac_ipv4_frag_fdir_queue_index = { "rule": "flow create 0 ingress pattern eth / ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 / end actions queue index 1 / mark / end", "scapy_str": { "matched": ["Ether()/IP(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IP()/Raw('X'*666)", + "Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": 1, "mark_id": 0}, } @@ -60,7 +63,10 @@ tv_mac_ipv4_frag_fdir_rss_queues = { ], "scapy_str": { "matched": ["Ether()/IP(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IP()/Raw('X'*666)", + "Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": [2, 3], "mark_id": 0}, } @@ -70,7 +76,10 @@ tv_mac_ipv4_frag_fdir_passthru = { "rule": "flow create 0 ingress pattern eth / ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 / end actions passthru / mark / end", "scapy_str": { "matched": ["Ether()/IP(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IP()/Raw('X'*666)", + "Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, } @@ -80,7 +89,10 @@ tv_mac_ipv4_frag_fdir_drop = { "rule": "flow create 0 ingress pattern eth / ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 / end actions drop / mark / end", "scapy_str": { "matched": ["Ether()/IP(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IP()/Raw('X'*666)", + "Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "drop": True}, } @@ -90,7 +102,10 @@ tv_mac_ipv4_frag_fdir_mark_rss = { "rule": "flow create 0 ingress pattern eth / ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 / end actions mark / rss / end", "scapy_str": { "matched": ["Ether()/IP(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IP()/Raw('X'*666)", + "Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, } @@ -100,7 +115,10 @@ tv_mac_ipv4_frag_fdir_mark = { "rule": "flow create 0 ingress pattern eth / ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 / end actions mark id 1 / end", "scapy_str": { "matched": ["Ether()/IP(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IP()/Raw('X'*666)", + "Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 1}, } @@ -158,7 +176,10 @@ tv_mac_ipv6_frag_fdir_queue_index = { "rule": "flow create 0 ingress pattern eth / ipv6 / ipv6_frag_ext frag_data spec 0x0001 frag_data mask 0x0001 / end actions queue index 1 / mark / end", "scapy_str": { "matched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IPv6()/Raw('X'*666)", + "Ether()/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": 1, "mark_id": 0}, } @@ -170,7 +191,10 @@ tv_mac_ipv6_frag_fdir_rss_queues = { ], "scapy_str": { "matched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IPv6()/Raw('X'*666)", + "Ether()/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": [2, 3], "mark_id": 0}, } @@ -180,7 +204,10 @@ tv_mac_ipv6_frag_fdir_passthru = { "rule": "flow create 0 ingress pattern eth / ipv6 / ipv6_frag_ext frag_data spec 0x0001 frag_data mask 0x0001 / end actions passthru / mark / end", "scapy_str": { "matched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IPv6()/Raw('X'*666)", + "Ether()/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, } @@ -190,7 +217,10 @@ tv_mac_ipv6_frag_fdir_drop = { "rule": "flow create 0 ingress pattern eth / ipv6 / ipv6_frag_ext frag_data spec 0x0001 frag_data mask 0x0001 / end actions drop / mark / end", "scapy_str": { "matched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IPv6()/Raw('X'*666)", + "Ether()/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "drop": True}, } @@ -200,7 +230,10 @@ tv_mac_ipv6_frag_fdir_mark_rss = { "rule": "flow create 0 ingress pattern eth / ipv6 / ipv6_frag_ext frag_data spec 0x0001 frag_data mask 0x0001 / end actions mark / rss / end", "scapy_str": { "matched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IPv6()/Raw('X'*666)", + "Ether()/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, } @@ -210,7 +243,10 @@ tv_mac_ipv6_frag_fdir_mark = { "rule": "flow create 0 ingress pattern eth / ipv6 / ipv6_frag_ext frag_data spec 0x0001 frag_data mask 0x0001 / end actions mark id 1 / end", "scapy_str": { "matched": ["Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)"], - "unmatched": ["Ether()/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether()/IPv6()/Raw('X'*666)", + "Ether()/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 1}, } -- 2.17.1
1.add more info for ipfragment rule. 2.mismatch pkt should cover mismatch inputset pkts and mismatch pattern pkts. V2: fix format issue Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> --- .../ice_ip_fragment_rte_flow_test_plan.rst | 72 ++++++++++++------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/test_plans/ice_ip_fragment_rte_flow_test_plan.rst b/test_plans/ice_ip_fragment_rte_flow_test_plan.rst index 18e0ad28..34b8efdc 100644 --- a/test_plans/ice_ip_fragment_rte_flow_test_plan.rst +++ b/test_plans/ice_ip_fragment_rte_flow_test_plan.rst @@ -118,6 +118,11 @@ take 'MAC_IPV4_FRAG fdir queue index' for fdir example flow create 0 ingress pattern eth / ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 / end actions queue index 1 / mark / end Flow rule #0 created +.. note:: + + For ipfragment rule, it's a fixed combination for parser to know that a fragment pkt. + dpdk care about the bit 12-13 of fragment offset, so the valid range is 0x2000-0x1fff, the spec is 0x2000 and mask is 0x2000. + 2. send matched pkts and check two pkts distributed to queue 1, `RSS hash=0x261a7deb - RSS queue=0x1` in output:: scapy: @@ -136,17 +141,16 @@ take 'MAC_IPV4_FRAG fdir queue index' for fdir example 3. send mismatched pkts and check fdir id is none:: scapy: - p = Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) - pkts=fragment6(p, 500) - sendp(pkts, iface="enp1s0") + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) + sendp(p, iface="enp1s0") - Sent 2 packets. - dut.10.240.183.133: port 0/queue 3: received 1 packets - src=00:00:00:00:00:00 - dst=FF:FF:FF:FF:FF:FF - type=0x86dd - length=494 - nb_segs=1 - RSS hash=0xe5ae2d03 - RSS queue=0x3 - hw ptype: L2_ETHER L3_IPV6_EXT_UNKNOWN L4_FRAG - sw ptype: L2_ETHER L3_IPV6_EXT L4_FRAG - l2_len=14 - l3_len=48 - l4_len=0 - Receive queue=0x3 - ol_flags: PKT_RX_RSS_HASH PKT_RX_L4_CKSUM_GOOD PKT_RX_IP_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_GOOD - port 0/queue 3: received 1 packets - src=00:00:00:00:00:00 - dst=FF:FF:FF:FF:FF:FF - type=0x86dd - length=296 - nb_segs=1 - RSS hash=0xe5ae2d03 - RSS queue=0x3 - hw ptype: L2_ETHER L3_IPV6_EXT_UNKNOWN L4_FRAG - sw ptype: L2_ETHER L3_IPV6_EXT L4_FRAG - l2_len=14 - l3_len=48 - l4_len=0 - Receive queue=0x3 - ol_flags: PKT_RX_RSS_HASH PKT_RX_L4_CKSUM_GOOD PKT_RX_IP_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_GOOD + port 0/queue 11: received 1 packets + src=00:00:00:00:00:00 - dst=FF:FF:FF:FF:FF:FF - type=0x0800 - length=700 - nb_segs=1 - RSS hash=0x7bd13a5b - RSS queue=0xb - hw ptype: L2_ETHER L3_IPV4_EXT_UNKNOWN L4_NONFRAG - sw ptype: L2_ETHER L3_IPV4 - l2_len=14 - l3_len=20 - Receive queue=0xb + ol_flags: RTE_MBUF_F_RX_RSS_HASH RTE_MBUF_F_RX_L4_CKSUM_GOOD RTE_MBUF_F_RX_IP_CKSUM_GOOD RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD + port 0/queue 0: received 1 packets + src=00:00:00:00:00:00 - dst=FF:FF:FF:FF:FF:FF - type=0x86dd - length=728 - nb_segs=1 - hw ptype: L2_ETHER L3_IPV6_EXT_UNKNOWN L4_FRAG - sw ptype: L2_ETHER L3_IPV6_EXT L4_FRAG - l2_len=14 - l3_len=48 - l4_len=0 - Receive queue=0x0 + ol_flags: RTE_MBUF_F_RX_L4_CKSUM_GOOD RTE_MBUF_F_RX_IP_CKSUM_GOOD RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD 4. destroy rule re-send step 2 pkts and check fdir id is none:: @@ -255,7 +259,8 @@ Subcase 1: MAC_IPV4_FRAG fdir queue index 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 2: MAC_IPV4_FRAG fdir rss queues ----------------------------------------- @@ -270,7 +275,8 @@ Subcase 2: MAC_IPV4_FRAG fdir rss queues 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 3: MAC_IPV4_FRAG fdir passthru -------------------------------------- @@ -285,7 +291,8 @@ Subcase 3: MAC_IPV4_FRAG fdir passthru 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 4: MAC_IPV4_FRAG fdir drop ---------------------------------- @@ -300,7 +307,8 @@ Subcase 4: MAC_IPV4_FRAG fdir drop 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 5: MAC_IPV4_FRAG fdir mark+rss -------------------------------------- @@ -315,7 +323,8 @@ Subcase 5: MAC_IPV4_FRAG fdir mark+rss 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 6: MAC_IPV4_FRAG fdir mark ---------------------------------- @@ -330,7 +339,8 @@ Subcase 6: MAC_IPV4_FRAG fdir mark 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Test case: MAC_IPV6_FRAG pattern fdir fragment ============================================== @@ -348,7 +358,8 @@ Subcase 1: MAC_IPV6_FRAG fdir queue index 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 2: MAC_IPV6_FRAG fdir rss queues ---------------------------------------- @@ -363,7 +374,8 @@ Subcase 2: MAC_IPV6_FRAG fdir rss queues 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 3: MAC_IPV6_FRAG fdir passthru -------------------------------------- @@ -378,7 +390,8 @@ Subcase 3: MAC_IPV6_FRAG fdir passthru 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 4: MAC_IPV6_FRAG fdir drop ---------------------------------- @@ -393,7 +406,8 @@ Subcase 4: MAC_IPV6_FRAG fdir drop 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 5: MAC_IPV6_FRAG fdir mark+rss -------------------------------------- @@ -408,7 +422,8 @@ Subcase 5: MAC_IPV6_FRAG fdir mark+rss 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 6: MAC_IPV6_FRAG fdir mark ---------------------------------- @@ -423,7 +438,8 @@ Subcase 6: MAC_IPV6_FRAG fdir mark 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Test case: MAC_IPV4_FRAG_fdir_with_l2 ===================================== @@ -444,7 +460,8 @@ take 'mac_ipv4_frag_l2dst_fdir_queue_index' example:: 3.unmatched packets: - p=Ether(dst='00:00:00:00:00:01')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkts=fragment6(p, 500) + Ether(dst='00:00:00:00:00:01')/IP()/Raw('X'*666) + Ether(dst='00:00:00:00:00:01')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) .. note:: @@ -469,7 +486,8 @@ take 'mac_ipv6_frag_l2dst_fdir_queue_index' example:: 3.unmatched packets: - p=Ether(dst='00:00:00:00:00:01')/IP(id=47750)/Raw('X'*666); pkts=fragment(p, fragsize=500) + Ether(dst='00:00:00:00:00:01')/IPv6()/Raw('X'*666) + Ether(dst='00:00:00:00:00:01')/IP(id=47750)/Raw('X'*666) .. note:: @@ -495,7 +513,8 @@ take 'mac_ipv4_frag_l3src_fdir_queue_index' example:: 3.unmatched packets: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkts=fragment6(p, 500) + Ether()/IP(src='192.168.1.1')/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) subcase 1: MAC_IPV4_FRAG_fdir_with_l3dst ---------------------------------------- @@ -522,7 +541,8 @@ take 'mac_ipv6_frag_l3src_fdir_queue_index' example:: 3.unmatched packets: - p=Ether()/IP(id=47750, src='192.168.1.1')/Raw('X'*666); pkts=fragment(p, fragsize=500) + Ether()/IPv6(src='2001::1')/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) subcase 1: MAC_IPV6_FRAG_fdir_with_l3dst ---------------------------------------- -- 2.17.1
mismatch pkt should cover mismatch inputset pkts and mismatch pattern pkts. extend mismatch pkts to cover more test. V2: fix format issue Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> --- ...TestSuite_ice_iavf_ip_fragment_rte_flow.py | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py b/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py index 8c9cfd9d..9f44ccf1 100644 --- a/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py +++ b/tests/TestSuite_ice_iavf_ip_fragment_rte_flow.py @@ -49,7 +49,8 @@ tv_mac_ipv4_frag_fdir_queue_index = { "scapy_str": { "matched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], "unmatched": [ - "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" + "Ether(dst='00:11:22:33:55:66')/IP()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": 1, "mark_id": 0}, @@ -63,7 +64,8 @@ tv_mac_ipv4_frag_fdir_rss_queues = { "scapy_str": { "matched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], "unmatched": [ - "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" + "Ether(dst='00:11:22:33:55:66')/IP()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": [2, 3], "mark_id": 0}, @@ -75,7 +77,8 @@ tv_mac_ipv4_frag_fdir_passthru = { "scapy_str": { "matched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], "unmatched": [ - "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" + "Ether(dst='00:11:22:33:55:66')/IP()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, @@ -87,7 +90,8 @@ tv_mac_ipv4_frag_fdir_drop = { "scapy_str": { "matched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], "unmatched": [ - "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" + "Ether(dst='00:11:22:33:55:66')/IP()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "drop": True}, @@ -99,7 +103,8 @@ tv_mac_ipv4_frag_fdir_mark_rss = { "scapy_str": { "matched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], "unmatched": [ - "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" + "Ether(dst='00:11:22:33:55:66')/IP()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, @@ -111,7 +116,8 @@ tv_mac_ipv4_frag_fdir_mark = { "scapy_str": { "matched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], "unmatched": [ - "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" + "Ether(dst='00:11:22:33:55:66')/IP()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)", ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 1}, @@ -157,7 +163,10 @@ tv_mac_ipv6_frag_fdir_queue_index = { "matched": [ "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" ], - "unmatched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether(dst='00:11:22:33:55:66')/IPv6()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": 1, "mark_id": 0}, } @@ -171,7 +180,10 @@ tv_mac_ipv6_frag_fdir_rss_queues = { "matched": [ "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" ], - "unmatched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether(dst='00:11:22:33:55:66')/IPv6()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "queue": [2, 3], "mark_id": 0}, } @@ -183,7 +195,10 @@ tv_mac_ipv6_frag_fdir_passthru = { "matched": [ "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" ], - "unmatched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether(dst='00:11:22:33:55:66')/IPv6()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, } @@ -195,7 +210,10 @@ tv_mac_ipv6_frag_fdir_drop = { "matched": [ "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" ], - "unmatched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether(dst='00:11:22:33:55:66')/IPv6()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "drop": True}, } @@ -207,7 +225,10 @@ tv_mac_ipv6_frag_fdir_mark_rss = { "matched": [ "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" ], - "unmatched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether(dst='00:11:22:33:55:66')/IPv6()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 0, "rss": True}, } @@ -219,7 +240,10 @@ tv_mac_ipv6_frag_fdir_mark = { "matched": [ "Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666)" ], - "unmatched": ["Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)"], + "unmatched": [ + "Ether(dst='00:11:22:33:55:66')/IPv6()/Raw('X'*666)", + "Ether(dst='00:11:22:33:55:66')/IP(id=47750)/Raw('X'*666)", + ], }, "check_param": {"port_id": 0, "rxq": LAUNCH_QUEUE, "mark_id": 1}, } -- 2.17.1
1.add more info for ipfragment rule. 2.mismatch pkt should cover mismatch inputset pkts and mismatch pattern pkts. V2: fix format issue Signed-off-by: Zhimin Huang <zhiminx.huang@intel.com> --- ...ce_iavf_ip_fragment_rte_flow_test_plan.rst | 67 ++++++++++++------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/test_plans/ice_iavf_ip_fragment_rte_flow_test_plan.rst b/test_plans/ice_iavf_ip_fragment_rte_flow_test_plan.rst index d7e4e1b1..2ab727c5 100644 --- a/test_plans/ice_iavf_ip_fragment_rte_flow_test_plan.rst +++ b/test_plans/ice_iavf_ip_fragment_rte_flow_test_plan.rst @@ -126,6 +126,12 @@ take 'MAC_IPV4_FRAG fdir queue index' for fdir example flow create 0 ingress pattern eth / ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 / end actions queue index 1 / mark / end Flow rule #0 created +.. note:: + + For ipfragment rule, it's a fixed combination for parser to know that a fragment pkt. + dpdk care about the bit 12-13 of fragment offset, so the valid range is 0x2000-0x1fff, the spec is 0x2000 and mask is 0x2000. + + 2. send matched pkts and check two pkts distributed to queue 1, `RSS hash=0x261a7deb - RSS queue=0x1` in output:: scapy: @@ -144,17 +150,16 @@ take 'MAC_IPV4_FRAG fdir queue index' for fdir example 3. send mismatched pkts and check fdir id is none:: scapy: - p = Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) - pkts=fragment6(p, 500) - sendp(pkts, iface="enp1s0") + Ether(dst='00:11:22:33:55:66')/IP()/Raw('X'*666) + Ether(dst='00:11:22:33:55:66')/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) + sendp(p, iface="enp1s0") - Sent 2 packets. - dut.10.240.183.133: port 0/queue 3: received 1 packets - src=00:00:00:00:00:00 - dst=FF:FF:FF:FF:FF:FF - type=0x86dd - length=494 - nb_segs=1 - RSS hash=0xe5ae2d03 - RSS queue=0x3 - hw ptype: L2_ETHER L3_IPV6_EXT_UNKNOWN L4_FRAG - sw ptype: L2_ETHER L3_IPV6_EXT L4_FRAG - l2_len=14 - l3_len=48 - l4_len=0 - Receive queue=0x3 - ol_flags: PKT_RX_RSS_HASH PKT_RX_L4_CKSUM_GOOD PKT_RX_IP_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_GOOD - port 0/queue 3: received 1 packets - src=00:00:00:00:00:00 - dst=FF:FF:FF:FF:FF:FF - type=0x86dd - length=296 - nb_segs=1 - RSS hash=0xe5ae2d03 - RSS queue=0x3 - hw ptype: L2_ETHER L3_IPV6_EXT_UNKNOWN L4_FRAG - sw ptype: L2_ETHER L3_IPV6_EXT L4_FRAG - l2_len=14 - l3_len=48 - l4_len=0 - Receive queue=0x3 - ol_flags: PKT_RX_RSS_HASH PKT_RX_L4_CKSUM_GOOD PKT_RX_IP_CKSUM_GOOD PKT_RX_OUTER_L4_CKSUM_GOOD + port 0/queue 4: received 1 packets + src=00:00:00:00:00:00 - dst=00:11:22:33:55:66 - type=0x0800 - length=700 - nb_segs=1 - RSS hash=0xafca6174 - RSS queue=0x4 - hw ptype: L2_ETHER L3_IPV4_EXT_UNKNOWN L4_NONFRAG - sw ptype: L2_ETHER L3_IPV4 - l2_len=14 - l3_len=20 - Receive queue=0x4 + ol_flags: RTE_MBUF_F_RX_RSS_HASH RTE_MBUF_F_RX_L4_CKSUM_GOOD RTE_MBUF_F_RX_IP_CKSUM_GOOD RTE_MBUF_F_RX_OUTER_L4_CKSUM_UNKNOWN + port 0/queue 0: received 1 packets + src=00:00:00:00:00:00 - dst=00:11:22:33:55:66 - type=0x86dd - length=728 - nb_segs=1 - hw ptype: L2_ETHER L3_IPV6_EXT_UNKNOWN L4_FRAG - sw ptype: L2_ETHER L3_IPV6_EXT L4_FRAG - l2_len=14 - l3_len=48 - l4_len=0 - Receive queue=0x0 + ol_flags: RTE_MBUF_F_RX_L4_CKSUM_GOOD RTE_MBUF_F_RX_IP_CKSUM_GOOD RTE_MBUF_F_RX_OUTER_L4_CKSUM_UNKNOWN 4. destroy rule re-send step 2 pkts and check fdir id is none:: @@ -263,7 +268,8 @@ Subcase 1: MAC_IPV4_FRAG fdir queue index 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 2: MAC_IPV4_FRAG fdir rss queues ----------------------------------------- @@ -278,7 +284,8 @@ Subcase 2: MAC_IPV4_FRAG fdir rss queues 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 3: MAC_IPV4_FRAG fdir passthru -------------------------------------- @@ -293,7 +300,8 @@ Subcase 3: MAC_IPV4_FRAG fdir passthru 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 4: MAC_IPV4_FRAG fdir drop ---------------------------------- @@ -308,7 +316,8 @@ Subcase 4: MAC_IPV4_FRAG fdir drop 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 5: MAC_IPV4_FRAG fdir mark+rss -------------------------------------- @@ -323,7 +332,8 @@ Subcase 5: MAC_IPV4_FRAG fdir mark+rss 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Subcase 6: MAC_IPV4_FRAG fdir mark ---------------------------------- @@ -338,7 +348,8 @@ Subcase 6: MAC_IPV4_FRAG fdir mark 3. unmatched packets:: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkt=fragment6(p, 500) + Ether()/IP()/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) Test case: MAC_IPV6_FRAG pattern fdir fragment ============================================== @@ -356,7 +367,8 @@ Subcase 1: MAC_IPV6_FRAG fdir queue index 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 2: MAC_IPV6_FRAG fdir rss queues ---------------------------------------- @@ -371,7 +383,8 @@ Subcase 2: MAC_IPV6_FRAG fdir rss queues 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 3: MAC_IPV6_FRAG fdir passthru -------------------------------------- @@ -386,7 +399,8 @@ Subcase 3: MAC_IPV6_FRAG fdir passthru 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 4: MAC_IPV6_FRAG fdir drop ---------------------------------- @@ -401,7 +415,8 @@ Subcase 4: MAC_IPV6_FRAG fdir drop 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 5: MAC_IPV6_FRAG fdir mark+rss -------------------------------------- @@ -416,7 +431,8 @@ Subcase 5: MAC_IPV6_FRAG fdir mark+rss 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Subcase 6: MAC_IPV6_FRAG fdir mark ---------------------------------- @@ -431,7 +447,8 @@ Subcase 6: MAC_IPV6_FRAG fdir mark 3. unmatched packets:: - p=Ether()/IP(id=47750)/Raw('X'*666); pkts=fragment(p, 500) + Ether()/IPv6()/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) Test case: MAC_IPV4_FRAG_fdir_with_l2 ===================================== @@ -464,7 +481,8 @@ take 'mac_ipv4_frag_l3src_fdir_queue_index' example:: 3.unmatched packets: - p=Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666); pkts=fragment6(p, 500) + Ether()/IP(src='192.168.1.1')/Raw('X'*666) + Ether()/IPv6()/IPv6ExtHdrFragment(id=47750)/Raw('X'*666) subcase 1: MAC_IPV4_FRAG_fdir_with_l3dst ---------------------------------------- @@ -491,7 +509,8 @@ take 'mac_ipv6_frag_l3src_fdir_queue_index' example:: 3.unmatched packets: - p=Ether()/IP(id=47750, src='192.168.1.1')/Raw('X'*666); pkts=fragment(p, fragsize=500) + Ether()/IPv6(src='2001::1')/Raw('X'*666) + Ether()/IP(id=47750)/Raw('X'*666) subcase 1: MAC_IPV6_FRAG_fdir_with_l3dst ---------------------------------------- -- 2.17.1