[PATCH] net/mlx5/hws: fix IPv4 frag matching

[Alex Vesker]

From: Hamdan Igbaria <hamd...@nvidia.com>

Fix IPv4 frag matching in case fragment_offset field is set
to non zero value in the mask.
fragment_offset value is converted using the following logic:
-In case fragment_offset value was set to 0x3fff, then we will
 match only on ip_fragmented bit.
-Otherwise we will match fragment_offset based on spec and last
 same as any other field.

Fixes: c55c2bf35333 ("net/mlx5/hws: add definer layer")
Cc: sta...@dpdk.org

Signed-off-by: Hamdan Igbaria <hamd...@nvidia.com>
Reviewed-by: Alex Vesker <va...@nvidia.com>
Acked-by: Matan Azrad ma...@nvidia.com
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 11 +++++++++--
 drivers/net/mlx5/hws/mlx5dr_definer.h |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c 
b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 379f4065e7..f92d3e8e1f 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -127,6 +127,7 @@ struct mlx5dr_definer_conv_data {
        X(SET,          ipv4_version,           STE_IPV4,               
rte_ipv4_hdr) \
        X(SET_BE16,     ipv4_frag,              v->fragment_offset,     
rte_ipv4_hdr) \
        X(SET_BE16,     ipv4_len,               v->total_length,        
rte_ipv4_hdr) \
+       X(SET,          ip_fragmented,          !!v->fragment_offset,   
rte_ipv4_hdr) \
        X(SET_BE16,     ipv6_payload_len,       v->hdr.payload_len,     
rte_flow_item_ipv6) \
        X(SET,          ipv6_proto,             v->hdr.proto,           
rte_flow_item_ipv6) \
        X(SET,          ipv6_routing_hdr,       IPPROTO_ROUTING,        
rte_flow_item_ipv6) \
@@ -735,8 +736,14 @@ mlx5dr_definer_conv_item_ipv4(struct 
mlx5dr_definer_conv_data *cd,
        if (m->fragment_offset) {
                fc = &cd->fc[DR_CALC_FNAME(IP_FRAG, inner)];
                fc->item_idx = item_idx;
-               fc->tag_set = &mlx5dr_definer_ipv4_frag_set;
-               DR_CALC_SET(fc, eth_l3, fragment_offset, inner);
+               if (rte_be_to_cpu_16(m->fragment_offset) == 0x3fff) {
+                       fc->tag_set = &mlx5dr_definer_ip_fragmented_set;
+                       DR_CALC_SET(fc, eth_l2, ip_fragmented, inner);
+               } else {
+                       fc->is_range = l && l->fragment_offset;
+                       fc->tag_set = &mlx5dr_definer_ipv4_frag_set;
+                       DR_CALC_SET(fc, eth_l3, ipv4_frag, inner);
+               }
        }
 
        if (m->next_proto_id) {
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h 
b/drivers/net/mlx5/hws/mlx5dr_definer.h
index 0cd83db756..90ec4ce845 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.h
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.h
@@ -226,8 +226,13 @@ struct mlx5_ifc_definer_hl_eth_l3_bits {
        u8 time_to_live_hop_limit[0x8];
        u8 protocol_next_header[0x8];
        u8 identification[0x10];
-       u8 flags[0x3];
-       u8 fragment_offset[0xd];
+       union {
+               u8 ipv4_frag[0x10];
+               struct {
+                       u8 flags[0x3];
+                       u8 fragment_offset[0xd];
+               };
+       };
        u8 ipv4_total_length[0x10];
        u8 checksum[0x10];
        u8 reserved_at_60[0xc];
-- 
2.18.1