net/iavf: simplify flow director rules for IP fragment

This patch simplify the pattern of flow rules of FDIR for IP fragment.

Flow rule can be created by the following command:
1. flow create 0 ingress pattern eth /
   ipv4 fragment_offset spec 0x2000 fragment_offset mask 0x2000 /
   end <actions>
2. flow create 0 ingress pattern eth / ipv6 /
   ipv6_frag_ext fragment_offset spec 0x0001 fragment_offset mask 0x0001 /
   end <actions>

Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c
index dde25c1..e81416d 100644 (file)
--- a/drivers/net/iavf/iavf_fdir.c
+++ b/drivers/net/iavf/iavf_fdir.c
@@ -625,7 +625,6 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
        const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_last, *ipv4_mask;
        const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask;
        const struct rte_flow_item_ipv6_frag_ext *ipv6_frag_spec;
-       const struct rte_flow_item_ipv6_frag_ext *ipv6_frag_last;
        const struct rte_flow_item_ipv6_frag_ext *ipv6_frag_mask;
        const struct rte_flow_item_udp *udp_spec, *udp_mask;
        const struct rte_flow_item_tcp *tcp_spec, *tcp_mask;
@@ -802,17 +801,16 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 
                        hdrs->count = ++layer;
 
-                       /* only support any packet id for fragment IPv4
-                        * any packet_id:
-                        * spec is 0, last is 0xffff, mask is 0xffff
+                       /* fragment Ipv4:
+                        * spec is 0x2000, mask is 0x2000
                         */
-                       if (ipv4_last && ipv4_spec->hdr.packet_id == 0 &&
-                           ipv4_last->hdr.packet_id == UINT16_MAX &&
-                           ipv4_mask->hdr.packet_id == UINT16_MAX &&
-                           ipv4_mask->hdr.fragment_offset == UINT16_MAX) {
+                       if (ipv4_spec->hdr.fragment_offset ==
+                           rte_cpu_to_be_16(RTE_IPV4_HDR_MF_FLAG) &&
+                           ipv4_mask->hdr.fragment_offset ==
+                           rte_cpu_to_be_16(RTE_IPV4_HDR_MF_FLAG)) {
                                /* all IPv4 fragment packet has the same
-                                * ethertype, if the spec is for all valid
-                                * packet id, set ethertype into input set.
+                                * ethertype, if the spec and mask is valid,
+                                * set ethertype into input set.
                                 */
                                input_set |= IAVF_INSET_ETHERTYPE;
                                VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1, ETH,
@@ -896,7 +894,6 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
 
                case RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT:
                        ipv6_frag_spec = item->spec;
-                       ipv6_frag_last = item->last;
                        ipv6_frag_mask = item->mask;
                        next_type = (item + 1)->type;
 
@@ -909,17 +906,16 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,
                                break;
                        }
 
-                       /* only support any packet id for fragment IPv6
-                        * any packet_id:
-                        * spec is 0, last is 0xffffffff, mask is 0xffffffff
+                       /* fragment Ipv6:
+                        * spec is 0x1, mask is 0x1
                         */
-                       if (ipv6_frag_last && ipv6_frag_spec->hdr.id == 0 &&
-                           ipv6_frag_last->hdr.id == UINT32_MAX &&
-                           ipv6_frag_mask->hdr.id == UINT32_MAX &&
-                           ipv6_frag_mask->hdr.frag_data == UINT16_MAX) {
+                       if (ipv6_frag_spec->hdr.frag_data ==
+                           rte_cpu_to_be_16(1) &&
+                           ipv6_frag_mask->hdr.frag_data ==
+                           rte_cpu_to_be_16(1)) {
                                /* all IPv6 fragment packet has the same
-                                * ethertype, if the spec is for all valid
-                                * packet id, set ethertype into input set.
+                                * ethertype, if the spec and mask is valid,
+                                * set ethertype into input set.
                                 */
                                input_set |= IAVF_INSET_ETHERTYPE;
                                VIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1, ETH,