net/mlx5: DR, Add check for unsupported fields in match param

When a matcher is being built, we "consume" (clear) mask fields one by one,
and to verify that we do support all the required fields we check if the
whole mask was consumed, else the matching request includes unsupported
fields.

Signed-off-by: Muhammad Sammar <muhammads@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Reviewed-by: Yevgeny Kliteynik <kliteyn@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
index b5409cc021d330c1d6b44d4e14136bc44cdb2bf3..75c775bee351056305d882f1d851bf107047533f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c
@@ -875,9 +875,10 @@ static int dr_matcher_init_fdb(struct mlx5dr_matcher *matcher)
 static int dr_matcher_init(struct mlx5dr_matcher *matcher,
                           struct mlx5dr_match_parameters *mask)
 {
+       struct mlx5dr_match_parameters consumed_mask;
        struct mlx5dr_table *tbl = matcher->tbl;
        struct mlx5dr_domain *dmn = tbl->dmn;
-       int ret;
+       int i, ret;
 
        if (matcher->match_criteria >= DR_MATCHER_CRITERIA_MAX) {
                mlx5dr_err(dmn, "Invalid match criteria attribute\n");
@@ -889,8 +890,16 @@ static int dr_matcher_init(struct mlx5dr_matcher *matcher,
                        mlx5dr_err(dmn, "Invalid match size attribute\n");
                        return -EINVAL;
                }
+
+               consumed_mask.match_buf = kzalloc(mask->match_sz, GFP_KERNEL);
+               if (!consumed_mask.match_buf)
+                       return -ENOMEM;
+
+               consumed_mask.match_sz = mask->match_sz;
+               memcpy(consumed_mask.match_buf, mask->match_buf, mask->match_sz);
                mlx5dr_ste_copy_param(matcher->match_criteria,
-                                     &matcher->mask, mask);
+                                     &matcher->mask, &consumed_mask,
+                                     true);
        }
 
        switch (dmn->type) {
@@ -909,9 +918,22 @@ static int dr_matcher_init(struct mlx5dr_matcher *matcher,
                break;
        default:
                WARN_ON(true);
-               return -EINVAL;
+               ret = -EINVAL;
+               goto free_consumed_mask;
+       }
+
+       /* Check that all mask data was consumed */
+       for (i = 0; i < consumed_mask.match_sz; i++) {
+               if (consumed_mask.match_buf[i]) {
+                       mlx5dr_dbg(dmn, "Match param mask contains unsupported parameters\n");
+                       ret = -EOPNOTSUPP;
+                       goto free_consumed_mask;
+               }
        }
 
+       ret =  0;
+free_consumed_mask:
+       kfree(consumed_mask.match_buf);
        return ret;
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
index 323ea138ad999e72524201b40f9c6506a4dd801d..6a390e981b09756408f44935977412ef5a498011 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
@@ -917,7 +917,7 @@ static bool dr_rule_verify(struct mlx5dr_matcher *matcher,
                return false;
        }
 
-       mlx5dr_ste_copy_param(matcher->match_criteria, param, value);
+       mlx5dr_ste_copy_param(matcher->match_criteria, param, value, false);
 
        if (match_criteria & DR_MATCHER_CRITERIA_OUTER) {
                s_idx = offsetof(struct mlx5dr_match_param, outer);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
index 1cdfe4fccc7a94287af8b4d79325b6bc12abe0d8..219a5474a8a46a728c1c42ef324a2a59edf54942 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c
@@ -668,101 +668,116 @@ int mlx5dr_ste_build_ste_arr(struct mlx5dr_matcher *matcher,
        return 0;
 }
 
-static void dr_ste_copy_mask_misc(char *mask, struct mlx5dr_match_misc *spec)
-{
-       spec->gre_c_present = MLX5_GET(fte_match_set_misc, mask, gre_c_present);
-       spec->gre_k_present = MLX5_GET(fte_match_set_misc, mask, gre_k_present);
-       spec->gre_s_present = MLX5_GET(fte_match_set_misc, mask, gre_s_present);
-       spec->source_vhca_port = MLX5_GET(fte_match_set_misc, mask, source_vhca_port);
-       spec->source_sqn = MLX5_GET(fte_match_set_misc, mask, source_sqn);
-
-       spec->source_port = MLX5_GET(fte_match_set_misc, mask, source_port);
-       spec->source_eswitch_owner_vhca_id = MLX5_GET(fte_match_set_misc, mask,
-                                                     source_eswitch_owner_vhca_id);
-
-       spec->outer_second_prio = MLX5_GET(fte_match_set_misc, mask, outer_second_prio);
-       spec->outer_second_cfi = MLX5_GET(fte_match_set_misc, mask, outer_second_cfi);
-       spec->outer_second_vid = MLX5_GET(fte_match_set_misc, mask, outer_second_vid);
-       spec->inner_second_prio = MLX5_GET(fte_match_set_misc, mask, inner_second_prio);
-       spec->inner_second_cfi = MLX5_GET(fte_match_set_misc, mask, inner_second_cfi);
-       spec->inner_second_vid = MLX5_GET(fte_match_set_misc, mask, inner_second_vid);
+#define IFC_GET_CLR(typ, p, fld, clear) ({ \
+       void *__p = (p); \
+       u32 __t = MLX5_GET(typ, __p, fld); \
+       if (clear) \
+               MLX5_SET(typ, __p, fld, 0); \
+       __t; \
+})
+
+#define memcpy_and_clear(to, from, len, clear) ({ \
+       void *__to = (to), *__from = (from); \
+       size_t __len = (len); \
+       memcpy(__to, __from, __len); \
+       if (clear) \
+               memset(__from, 0, __len); \
+})
+
+static void dr_ste_copy_mask_misc(char *mask, struct mlx5dr_match_misc *spec, bool clr)
+{
+       spec->gre_c_present = IFC_GET_CLR(fte_match_set_misc, mask, gre_c_present, clr);
+       spec->gre_k_present = IFC_GET_CLR(fte_match_set_misc, mask, gre_k_present, clr);
+       spec->gre_s_present = IFC_GET_CLR(fte_match_set_misc, mask, gre_s_present, clr);
+       spec->source_vhca_port = IFC_GET_CLR(fte_match_set_misc, mask, source_vhca_port, clr);
+       spec->source_sqn = IFC_GET_CLR(fte_match_set_misc, mask, source_sqn, clr);
+
+       spec->source_port = IFC_GET_CLR(fte_match_set_misc, mask, source_port, clr);
+       spec->source_eswitch_owner_vhca_id =
+               IFC_GET_CLR(fte_match_set_misc, mask, source_eswitch_owner_vhca_id, clr);
+
+       spec->outer_second_prio = IFC_GET_CLR(fte_match_set_misc, mask, outer_second_prio, clr);
+       spec->outer_second_cfi = IFC_GET_CLR(fte_match_set_misc, mask, outer_second_cfi, clr);
+       spec->outer_second_vid = IFC_GET_CLR(fte_match_set_misc, mask, outer_second_vid, clr);
+       spec->inner_second_prio = IFC_GET_CLR(fte_match_set_misc, mask, inner_second_prio, clr);
+       spec->inner_second_cfi = IFC_GET_CLR(fte_match_set_misc, mask, inner_second_cfi, clr);
+       spec->inner_second_vid = IFC_GET_CLR(fte_match_set_misc, mask, inner_second_vid, clr);
 
        spec->outer_second_cvlan_tag =
-               MLX5_GET(fte_match_set_misc, mask, outer_second_cvlan_tag);
+               IFC_GET_CLR(fte_match_set_misc, mask, outer_second_cvlan_tag, clr);
        spec->inner_second_cvlan_tag =
-               MLX5_GET(fte_match_set_misc, mask, inner_second_cvlan_tag);
+               IFC_GET_CLR(fte_match_set_misc, mask, inner_second_cvlan_tag, clr);
        spec->outer_second_svlan_tag =
-               MLX5_GET(fte_match_set_misc, mask, outer_second_svlan_tag);
+               IFC_GET_CLR(fte_match_set_misc, mask, outer_second_svlan_tag, clr);
        spec->inner_second_svlan_tag =
-               MLX5_GET(fte_match_set_misc, mask, inner_second_svlan_tag);
-
-       spec->gre_protocol = MLX5_GET(fte_match_set_misc, mask, gre_protocol);
+               IFC_GET_CLR(fte_match_set_misc, mask, inner_second_svlan_tag, clr);
+       spec->gre_protocol = IFC_GET_CLR(fte_match_set_misc, mask, gre_protocol, clr);
 
-       spec->gre_key_h = MLX5_GET(fte_match_set_misc, mask, gre_key.nvgre.hi);
-       spec->gre_key_l = MLX5_GET(fte_match_set_misc, mask, gre_key.nvgre.lo);
+       spec->gre_key_h = IFC_GET_CLR(fte_match_set_misc, mask, gre_key.nvgre.hi, clr);
+       spec->gre_key_l = IFC_GET_CLR(fte_match_set_misc, mask, gre_key.nvgre.lo, clr);
 
-       spec->vxlan_vni = MLX5_GET(fte_match_set_misc, mask, vxlan_vni);
+       spec->vxlan_vni = IFC_GET_CLR(fte_match_set_misc, mask, vxlan_vni, clr);
 
-       spec->geneve_vni = MLX5_GET(fte_match_set_misc, mask, geneve_vni);
-       spec->geneve_oam = MLX5_GET(fte_match_set_misc, mask, geneve_oam);
+       spec->geneve_vni = IFC_GET_CLR(fte_match_set_misc, mask, geneve_vni, clr);
+       spec->geneve_oam = IFC_GET_CLR(fte_match_set_misc, mask, geneve_oam, clr);
 
        spec->outer_ipv6_flow_label =
-               MLX5_GET(fte_match_set_misc, mask, outer_ipv6_flow_label);
+               IFC_GET_CLR(fte_match_set_misc, mask, outer_ipv6_flow_label, clr);
 
        spec->inner_ipv6_flow_label =
-               MLX5_GET(fte_match_set_misc, mask, inner_ipv6_flow_label);
+               IFC_GET_CLR(fte_match_set_misc, mask, inner_ipv6_flow_label, clr);
 
-       spec->geneve_opt_len = MLX5_GET(fte_match_set_misc, mask, geneve_opt_len);
+       spec->geneve_opt_len = IFC_GET_CLR(fte_match_set_misc, mask, geneve_opt_len, clr);
        spec->geneve_protocol_type =
-               MLX5_GET(fte_match_set_misc, mask, geneve_protocol_type);
+               IFC_GET_CLR(fte_match_set_misc, mask, geneve_protocol_type, clr);
 
-       spec->bth_dst_qp = MLX5_GET(fte_match_set_misc, mask, bth_dst_qp);
+       spec->bth_dst_qp = IFC_GET_CLR(fte_match_set_misc, mask, bth_dst_qp, clr);
 }
 
-static void dr_ste_copy_mask_spec(char *mask, struct mlx5dr_match_spec *spec)
+static void dr_ste_copy_mask_spec(char *mask, struct mlx5dr_match_spec *spec, bool clr)
 {
        __be32 raw_ip[4];
 
-       spec->smac_47_16 = MLX5_GET(fte_match_set_lyr_2_4, mask, smac_47_16);
+       spec->smac_47_16 = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, smac_47_16, clr);
 
-       spec->smac_15_0 = MLX5_GET(fte_match_set_lyr_2_4, mask, smac_15_0);
-       spec->ethertype = MLX5_GET(fte_match_set_lyr_2_4, mask, ethertype);
+       spec->smac_15_0 = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, smac_15_0, clr);
+       spec->ethertype = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ethertype, clr);
 
-       spec->dmac_47_16 = MLX5_GET(fte_match_set_lyr_2_4, mask, dmac_47_16);
+       spec->dmac_47_16 = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, dmac_47_16, clr);
 
-       spec->dmac_15_0 = MLX5_GET(fte_match_set_lyr_2_4, mask, dmac_15_0);
-       spec->first_prio = MLX5_GET(fte_match_set_lyr_2_4, mask, first_prio);
-       spec->first_cfi = MLX5_GET(fte_match_set_lyr_2_4, mask, first_cfi);
-       spec->first_vid = MLX5_GET(fte_match_set_lyr_2_4, mask, first_vid);
+       spec->dmac_15_0 = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, dmac_15_0, clr);
+       spec->first_prio = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, first_prio, clr);
+       spec->first_cfi = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, first_cfi, clr);
+       spec->first_vid = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, first_vid, clr);
 
-       spec->ip_protocol = MLX5_GET(fte_match_set_lyr_2_4, mask, ip_protocol);
-       spec->ip_dscp = MLX5_GET(fte_match_set_lyr_2_4, mask, ip_dscp);
-       spec->ip_ecn = MLX5_GET(fte_match_set_lyr_2_4, mask, ip_ecn);
-       spec->cvlan_tag = MLX5_GET(fte_match_set_lyr_2_4, mask, cvlan_tag);
-       spec->svlan_tag = MLX5_GET(fte_match_set_lyr_2_4, mask, svlan_tag);
-       spec->frag = MLX5_GET(fte_match_set_lyr_2_4, mask, frag);
-       spec->ip_version = MLX5_GET(fte_match_set_lyr_2_4, mask, ip_version);
-       spec->tcp_flags = MLX5_GET(fte_match_set_lyr_2_4, mask, tcp_flags);
-       spec->tcp_sport = MLX5_GET(fte_match_set_lyr_2_4, mask, tcp_sport);
-       spec->tcp_dport = MLX5_GET(fte_match_set_lyr_2_4, mask, tcp_dport);
+       spec->ip_protocol = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ip_protocol, clr);
+       spec->ip_dscp = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ip_dscp, clr);
+       spec->ip_ecn = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ip_ecn, clr);
+       spec->cvlan_tag = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, cvlan_tag, clr);
+       spec->svlan_tag = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, svlan_tag, clr);
+       spec->frag = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, frag, clr);
+       spec->ip_version = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ip_version, clr);
+       spec->tcp_flags = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, tcp_flags, clr);
+       spec->tcp_sport = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, tcp_sport, clr);
+       spec->tcp_dport = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, tcp_dport, clr);
 
-       spec->ttl_hoplimit = MLX5_GET(fte_match_set_lyr_2_4, mask, ttl_hoplimit);
+       spec->ttl_hoplimit = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, ttl_hoplimit, clr);
 
-       spec->udp_sport = MLX5_GET(fte_match_set_lyr_2_4, mask, udp_sport);
-       spec->udp_dport = MLX5_GET(fte_match_set_lyr_2_4, mask, udp_dport);
+       spec->udp_sport = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, udp_sport, clr);
+       spec->udp_dport = IFC_GET_CLR(fte_match_set_lyr_2_4, mask, udp_dport, clr);
 
-       memcpy(raw_ip, MLX5_ADDR_OF(fte_match_set_lyr_2_4, mask,
-                                   src_ipv4_src_ipv6.ipv6_layout.ipv6),
-                                   sizeof(raw_ip));
+       memcpy_and_clear(raw_ip, MLX5_ADDR_OF(fte_match_set_lyr_2_4, mask,
+                                             src_ipv4_src_ipv6.ipv6_layout.ipv6),
+                        sizeof(raw_ip), clr);
 
        spec->src_ip_127_96 = be32_to_cpu(raw_ip[0]);
        spec->src_ip_95_64 = be32_to_cpu(raw_ip[1]);
        spec->src_ip_63_32 = be32_to_cpu(raw_ip[2]);
        spec->src_ip_31_0 = be32_to_cpu(raw_ip[3]);
 
-       memcpy(raw_ip, MLX5_ADDR_OF(fte_match_set_lyr_2_4, mask,
-                                   dst_ipv4_dst_ipv6.ipv6_layout.ipv6),
-                                   sizeof(raw_ip));
+       memcpy_and_clear(raw_ip, MLX5_ADDR_OF(fte_match_set_lyr_2_4, mask,
+                                             dst_ipv4_dst_ipv6.ipv6_layout.ipv6),
+                        sizeof(raw_ip), clr);
 
        spec->dst_ip_127_96 = be32_to_cpu(raw_ip[0]);
        spec->dst_ip_95_64 = be32_to_cpu(raw_ip[1]);
@@ -770,104 +785,105 @@ static void dr_ste_copy_mask_spec(char *mask, struct mlx5dr_match_spec *spec)
        spec->dst_ip_31_0 = be32_to_cpu(raw_ip[3]);
 }
 
-static void dr_ste_copy_mask_misc2(char *mask, struct mlx5dr_match_misc2 *spec)
+static void dr_ste_copy_mask_misc2(char *mask, struct mlx5dr_match_misc2 *spec, bool clr)
 {
        spec->outer_first_mpls_label =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls.mpls_label);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls.mpls_label, clr);
        spec->outer_first_mpls_exp =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls.mpls_exp);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls.mpls_exp, clr);
        spec->outer_first_mpls_s_bos =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls.mpls_s_bos);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls.mpls_s_bos, clr);
        spec->outer_first_mpls_ttl =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls.mpls_ttl);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls.mpls_ttl, clr);
        spec->inner_first_mpls_label =
-               MLX5_GET(fte_match_set_misc2, mask, inner_first_mpls.mpls_label);
+               IFC_GET_CLR(fte_match_set_misc2, mask, inner_first_mpls.mpls_label, clr);
        spec->inner_first_mpls_exp =
-               MLX5_GET(fte_match_set_misc2, mask, inner_first_mpls.mpls_exp);
+               IFC_GET_CLR(fte_match_set_misc2, mask, inner_first_mpls.mpls_exp, clr);
        spec->inner_first_mpls_s_bos =
-               MLX5_GET(fte_match_set_misc2, mask, inner_first_mpls.mpls_s_bos);
+               IFC_GET_CLR(fte_match_set_misc2, mask, inner_first_mpls.mpls_s_bos, clr);
        spec->inner_first_mpls_ttl =
-               MLX5_GET(fte_match_set_misc2, mask, inner_first_mpls.mpls_ttl);
+               IFC_GET_CLR(fte_match_set_misc2, mask, inner_first_mpls.mpls_ttl, clr);
        spec->outer_first_mpls_over_gre_label =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_label);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_label, clr);
        spec->outer_first_mpls_over_gre_exp =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_exp);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_exp, clr);
        spec->outer_first_mpls_over_gre_s_bos =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_s_bos);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_s_bos, clr);
        spec->outer_first_mpls_over_gre_ttl =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_ttl);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_gre.mpls_ttl, clr);
        spec->outer_first_mpls_over_udp_label =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_label);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_label, clr);
        spec->outer_first_mpls_over_udp_exp =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_exp);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_exp, clr);
        spec->outer_first_mpls_over_udp_s_bos =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_s_bos);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_s_bos, clr);
        spec->outer_first_mpls_over_udp_ttl =
-               MLX5_GET(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_ttl);
-       spec->metadata_reg_c_7 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_7);
-       spec->metadata_reg_c_6 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_6);
-       spec->metadata_reg_c_5 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_5);
-       spec->metadata_reg_c_4 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_4);
-       spec->metadata_reg_c_3 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_3);
-       spec->metadata_reg_c_2 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_2);
-       spec->metadata_reg_c_1 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_1);
-       spec->metadata_reg_c_0 = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_c_0);
-       spec->metadata_reg_a = MLX5_GET(fte_match_set_misc2, mask, metadata_reg_a);
-}
-
-static void dr_ste_copy_mask_misc3(char *mask, struct mlx5dr_match_misc3 *spec)
-{
-       spec->inner_tcp_seq_num = MLX5_GET(fte_match_set_misc3, mask, inner_tcp_seq_num);
-       spec->outer_tcp_seq_num = MLX5_GET(fte_match_set_misc3, mask, outer_tcp_seq_num);
-       spec->inner_tcp_ack_num = MLX5_GET(fte_match_set_misc3, mask, inner_tcp_ack_num);
-       spec->outer_tcp_ack_num = MLX5_GET(fte_match_set_misc3, mask, outer_tcp_ack_num);
+               IFC_GET_CLR(fte_match_set_misc2, mask, outer_first_mpls_over_udp.mpls_ttl, clr);
+       spec->metadata_reg_c_7 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_7, clr);
+       spec->metadata_reg_c_6 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_6, clr);
+       spec->metadata_reg_c_5 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_5, clr);
+       spec->metadata_reg_c_4 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_4, clr);
+       spec->metadata_reg_c_3 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_3, clr);
+       spec->metadata_reg_c_2 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_2, clr);
+       spec->metadata_reg_c_1 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_1, clr);
+       spec->metadata_reg_c_0 = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_c_0, clr);
+       spec->metadata_reg_a = IFC_GET_CLR(fte_match_set_misc2, mask, metadata_reg_a, clr);
+}
+
+static void dr_ste_copy_mask_misc3(char *mask, struct mlx5dr_match_misc3 *spec, bool clr)
+{
+       spec->inner_tcp_seq_num = IFC_GET_CLR(fte_match_set_misc3, mask, inner_tcp_seq_num, clr);
+       spec->outer_tcp_seq_num = IFC_GET_CLR(fte_match_set_misc3, mask, outer_tcp_seq_num, clr);
+       spec->inner_tcp_ack_num = IFC_GET_CLR(fte_match_set_misc3, mask, inner_tcp_ack_num, clr);
+       spec->outer_tcp_ack_num = IFC_GET_CLR(fte_match_set_misc3, mask, outer_tcp_ack_num, clr);
        spec->outer_vxlan_gpe_vni =
-               MLX5_GET(fte_match_set_misc3, mask, outer_vxlan_gpe_vni);
+               IFC_GET_CLR(fte_match_set_misc3, mask, outer_vxlan_gpe_vni, clr);
        spec->outer_vxlan_gpe_next_protocol =
-               MLX5_GET(fte_match_set_misc3, mask, outer_vxlan_gpe_next_protocol);
+               IFC_GET_CLR(fte_match_set_misc3, mask, outer_vxlan_gpe_next_protocol, clr);
        spec->outer_vxlan_gpe_flags =
-               MLX5_GET(fte_match_set_misc3, mask, outer_vxlan_gpe_flags);
-       spec->icmpv4_header_data = MLX5_GET(fte_match_set_misc3, mask, icmp_header_data);
+               IFC_GET_CLR(fte_match_set_misc3, mask, outer_vxlan_gpe_flags, clr);
+       spec->icmpv4_header_data = IFC_GET_CLR(fte_match_set_misc3, mask, icmp_header_data, clr);
        spec->icmpv6_header_data =
-               MLX5_GET(fte_match_set_misc3, mask, icmpv6_header_data);
-       spec->icmpv4_type = MLX5_GET(fte_match_set_misc3, mask, icmp_type);
-       spec->icmpv4_code = MLX5_GET(fte_match_set_misc3, mask, icmp_code);
-       spec->icmpv6_type = MLX5_GET(fte_match_set_misc3, mask, icmpv6_type);
-       spec->icmpv6_code = MLX5_GET(fte_match_set_misc3, mask, icmpv6_code);
+               IFC_GET_CLR(fte_match_set_misc3, mask, icmpv6_header_data, clr);
+       spec->icmpv4_type = IFC_GET_CLR(fte_match_set_misc3, mask, icmp_type, clr);
+       spec->icmpv4_code = IFC_GET_CLR(fte_match_set_misc3, mask, icmp_code, clr);
+       spec->icmpv6_type = IFC_GET_CLR(fte_match_set_misc3, mask, icmpv6_type, clr);
+       spec->icmpv6_code = IFC_GET_CLR(fte_match_set_misc3, mask, icmpv6_code, clr);
        spec->geneve_tlv_option_0_data =
-               MLX5_GET(fte_match_set_misc3, mask, geneve_tlv_option_0_data);
-       spec->gtpu_msg_flags = MLX5_GET(fte_match_set_misc3, mask, gtpu_msg_flags);
-       spec->gtpu_msg_type = MLX5_GET(fte_match_set_misc3, mask, gtpu_msg_type);
-       spec->gtpu_teid = MLX5_GET(fte_match_set_misc3, mask, gtpu_teid);
-       spec->gtpu_dw_0 = MLX5_GET(fte_match_set_misc3, mask, gtpu_dw_0);
-       spec->gtpu_dw_2 = MLX5_GET(fte_match_set_misc3, mask, gtpu_dw_2);
+               IFC_GET_CLR(fte_match_set_misc3, mask, geneve_tlv_option_0_data, clr);
+       spec->gtpu_teid = IFC_GET_CLR(fte_match_set_misc3, mask, gtpu_teid, clr);
+       spec->gtpu_msg_flags = IFC_GET_CLR(fte_match_set_misc3, mask, gtpu_msg_flags, clr);
+       spec->gtpu_msg_type = IFC_GET_CLR(fte_match_set_misc3, mask, gtpu_msg_type, clr);
+       spec->gtpu_dw_0 = IFC_GET_CLR(fte_match_set_misc3, mask, gtpu_dw_0, clr);
+       spec->gtpu_dw_2 = IFC_GET_CLR(fte_match_set_misc3, mask, gtpu_dw_2, clr);
        spec->gtpu_first_ext_dw_0 =
-               MLX5_GET(fte_match_set_misc3, mask, gtpu_first_ext_dw_0);
+               IFC_GET_CLR(fte_match_set_misc3, mask, gtpu_first_ext_dw_0, clr);
 }
 
-static void dr_ste_copy_mask_misc4(char *mask, struct mlx5dr_match_misc4 *spec)
+static void dr_ste_copy_mask_misc4(char *mask, struct mlx5dr_match_misc4 *spec, bool clr)
 {
        spec->prog_sample_field_id_0 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_id_0);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_id_0, clr);
        spec->prog_sample_field_value_0 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_value_0);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_value_0, clr);
        spec->prog_sample_field_id_1 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_id_1);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_id_1, clr);
        spec->prog_sample_field_value_1 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_value_1);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_value_1, clr);
        spec->prog_sample_field_id_2 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_id_2);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_id_2, clr);
        spec->prog_sample_field_value_2 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_value_2);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_value_2, clr);
        spec->prog_sample_field_id_3 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_id_3);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_id_3, clr);
        spec->prog_sample_field_value_3 =
-               MLX5_GET(fte_match_set_misc4, mask, prog_sample_field_value_3);
+               IFC_GET_CLR(fte_match_set_misc4, mask, prog_sample_field_value_3, clr);
 }
 
 void mlx5dr_ste_copy_param(u8 match_criteria,
                           struct mlx5dr_match_param *set_param,
-                          struct mlx5dr_match_parameters *mask)
+                          struct mlx5dr_match_parameters *mask,
+                          bool clr)
 {
        u8 tail_param[MLX5_ST_SZ_BYTES(fte_match_set_lyr_2_4)] = {};
        u8 *data = (u8 *)mask->match_buf;
@@ -881,7 +897,7 @@ void mlx5dr_ste_copy_param(u8 match_criteria,
                } else {
                        buff = mask->match_buf;
                }
-               dr_ste_copy_mask_spec(buff, &set_param->outer);
+               dr_ste_copy_mask_spec(buff, &set_param->outer, clr);
        }
        param_location = sizeof(struct mlx5dr_match_spec);
 
@@ -894,7 +910,7 @@ void mlx5dr_ste_copy_param(u8 match_criteria,
                } else {
                        buff = data + param_location;
                }
-               dr_ste_copy_mask_misc(buff, &set_param->misc);
+               dr_ste_copy_mask_misc(buff, &set_param->misc, clr);
        }
        param_location += sizeof(struct mlx5dr_match_misc);
 
@@ -907,7 +923,7 @@ void mlx5dr_ste_copy_param(u8 match_criteria,
                } else {
                        buff = data + param_location;
                }
-               dr_ste_copy_mask_spec(buff, &set_param->inner);
+               dr_ste_copy_mask_spec(buff, &set_param->inner, clr);
        }
        param_location += sizeof(struct mlx5dr_match_spec);
 
@@ -920,7 +936,7 @@ void mlx5dr_ste_copy_param(u8 match_criteria,
                } else {
                        buff = data + param_location;
                }
-               dr_ste_copy_mask_misc2(buff, &set_param->misc2);
+               dr_ste_copy_mask_misc2(buff, &set_param->misc2, clr);
        }
 
        param_location += sizeof(struct mlx5dr_match_misc2);
@@ -934,7 +950,7 @@ void mlx5dr_ste_copy_param(u8 match_criteria,
                } else {
                        buff = data + param_location;
                }
-               dr_ste_copy_mask_misc3(buff, &set_param->misc3);
+               dr_ste_copy_mask_misc3(buff, &set_param->misc3, clr);
        }
 
        param_location += sizeof(struct mlx5dr_match_misc3);
@@ -948,7 +964,7 @@ void mlx5dr_ste_copy_param(u8 match_criteria,
                } else {
                        buff = data + param_location;
                }
-               dr_ste_copy_mask_misc4(buff, &set_param->misc4);
+               dr_ste_copy_mask_misc4(buff, &set_param->misc4, clr);
        }
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
index 3f47d2b3b6e600bd296ca4d1766e921ab30d5a1d..3028b776da00cec586efeae3874268a562ce4fa1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
@@ -1230,7 +1230,8 @@ void mlx5dr_ste_set_formatted_ste(struct mlx5dr_ste_ctx *ste_ctx,
                                  struct mlx5dr_htbl_connect_info *connect_info);
 void mlx5dr_ste_copy_param(u8 match_criteria,
                           struct mlx5dr_match_param *set_param,
-                          struct mlx5dr_match_parameters *mask);
+                          struct mlx5dr_match_parameters *mask,
+                          bool clear);
 
 struct mlx5dr_qp {
        struct mlx5_core_dev *mdev;