From de7ecc45d9cd3da13c9d9b7816abb7d9713b531f Mon Sep 17 00:00:00 2001

From: Alaa Hleihel <ahleihel@redhat.com>

Date: Sun, 10 May 2020 15:04:32 -0400

Subject: [PATCH 108/312] [netdrv] net/mlx5: DR, Refactor VXLAN GPE flex parser

 tunnel code for SW steering

Message-id: <20200510150452.10307-68-ahleihel@redhat.com>

Patchwork-id: 306691

Patchwork-instance: patchwork

O-Subject: [RHEL8.3 BZ 1789380 v2 67/87] net/mlx5: DR, Refactor VXLAN GPE flex parser tunnel code for SW steering

Bugzilla: 1789380

RH-Acked-by: Kamal Heib <kheib@redhat.com>

RH-Acked-by: Jarod Wilson <jarod@redhat.com>

RH-Acked-by: Tony Camuso <tcamuso@redhat.com>

RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>

Bugzilla: http://bugzilla.redhat.com/1789380

Upstream: v5.5-rc1

commit 6e9e286e4ad53311b51b28fdc4b952ab7d2520c4

Author: Yevgeny Kliteynik <kliteyn@mellanox.com>

Date:   Mon Oct 28 16:30:27 2019 +0200

    net/mlx5: DR, Refactor VXLAN GPE flex parser tunnel code for SW steering

    Refactor flex parser tunnel code:

     - Add definition for flex parser tunneling header for VXLAN-GPE

     - Use macros for VXLAN-GPE SW steering when building STE

     - Refactor the code to reflect that this is a VXLAN GPE

       only code and not a general flex parser code.

       This also significantly simplifies addition of more

       flex parser protocols, such as Geneve.

    Signed-off-by: Yevgeny Kliteynik <kliteyn@mellanox.com>

    Reviewed-by: Alex Vesker <valex@mellanox.com>

    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>

Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>

---

 .../mellanox/mlx5/core/steering/dr_matcher.c       | 33 ++++++----

 .../ethernet/mellanox/mlx5/core/steering/dr_ste.c  | 73 +++++++++-------------

 .../mellanox/mlx5/core/steering/dr_types.h         |  6 +-

 .../mellanox/mlx5/core/steering/mlx5_ifc_dr.h      | 11 ++++

 4 files changed, 66 insertions(+), 57 deletions(-)

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 c6548980daf0..f177c468b740 100644

--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_matcher.c

@@ -102,13 +102,29 @@ static bool dr_mask_is_gre_set(struct mlx5dr_match_misc *misc)

 	DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), gre) || \

 	DR_MASK_IS_OUTER_MPLS_OVER_GRE_UDP_SET((_misc2), udp))

-static bool dr_mask_is_flex_parser_tnl_set(struct mlx5dr_match_misc3 *misc3)

+static bool

+dr_mask_is_misc3_vxlan_gpe_set(struct mlx5dr_match_misc3 *misc3)

 {

 	return (misc3->outer_vxlan_gpe_vni ||

 		misc3->outer_vxlan_gpe_next_protocol ||

 		misc3->outer_vxlan_gpe_flags);

 }

+static bool

+dr_matcher_supp_flex_parser_vxlan_gpe(struct mlx5dr_cmd_caps *caps)

+{

+	return caps->flex_protocols &

+	       MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED;

+}

+

+static bool

+dr_mask_is_flex_parser_tnl_vxlan_gpe_set(struct mlx5dr_match_param *mask,

+					 struct mlx5dr_domain *dmn)

+{

+	return dr_mask_is_misc3_vxlan_gpe_set(&mask->misc3) &&

+	       dr_matcher_supp_flex_parser_vxlan_gpe(&dmn->info.caps);

+}

+

 static bool dr_mask_is_flex_parser_icmpv6_set(struct mlx5dr_match_misc3 *misc3)

 {

 	return (misc3->icmpv6_type || misc3->icmpv6_code ||

@@ -137,13 +153,6 @@ static bool dr_mask_is_gvmi_or_qpn_set(struct mlx5dr_match_misc *misc)

 	return (misc->source_sqn || misc->source_port);

 }

-static bool

-dr_matcher_supp_flex_parser_vxlan_gpe(struct mlx5dr_domain *dmn)

-{

-	return dmn->info.caps.flex_protocols &

-	       MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED;

-}

-

 int mlx5dr_matcher_select_builders(struct mlx5dr_matcher *matcher,

 				   struct mlx5dr_matcher_rx_tx *nic_matcher,

 				   enum mlx5dr_ipv outer_ipv,

@@ -262,10 +271,10 @@ static int dr_matcher_set_ste_builders(struct mlx5dr_matcher *matcher,

 								  inner, rx);

 		}

-		if (dr_mask_is_flex_parser_tnl_set(&mask.misc3) &&

-		    dr_matcher_supp_flex_parser_vxlan_gpe(dmn))

-			mlx5dr_ste_build_flex_parser_tnl(&sb[idx++], &mask,

-							 inner, rx);

+		if (dr_mask_is_flex_parser_tnl_vxlan_gpe_set(&mask, dmn))

+			mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(&sb[idx++],

+								   &mask,

+								   inner, rx);

 		if (DR_MASK_IS_ETH_L4_MISC_SET(mask.misc3, outer))

 			mlx5dr_ste_build_eth_l4_misc(&sb[idx++], &mask, inner, rx);

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 813e256a599e..496e680e0fd9 100644

--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c

+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_ste.c

@@ -2083,68 +2083,57 @@ void mlx5dr_ste_build_eth_l4_misc(struct mlx5dr_ste_build *sb,

 	sb->ste_build_tag_func = &dr_ste_build_eth_l4_misc_tag;

 }

-static void dr_ste_build_flex_parser_tnl_bit_mask(struct mlx5dr_match_param *value,

-						  bool inner, u8 *bit_mask)

+static void

+dr_ste_build_flex_parser_tnl_vxlan_gpe_bit_mask(struct mlx5dr_match_param *value,

+						bool inner, u8 *bit_mask)

 {

 	struct mlx5dr_match_misc3 *misc_3_mask = &value->misc3;

-	if (misc_3_mask->outer_vxlan_gpe_flags ||

-	    misc_3_mask->outer_vxlan_gpe_next_protocol) {

-		MLX5_SET(ste_flex_parser_tnl, bit_mask,

-			 flex_parser_tunneling_header_63_32,

-			 (misc_3_mask->outer_vxlan_gpe_flags << 24) |

-			 (misc_3_mask->outer_vxlan_gpe_next_protocol));

-		misc_3_mask->outer_vxlan_gpe_flags = 0;

-		misc_3_mask->outer_vxlan_gpe_next_protocol = 0;

-	}

-

-	if (misc_3_mask->outer_vxlan_gpe_vni) {

-		MLX5_SET(ste_flex_parser_tnl, bit_mask,

-			 flex_parser_tunneling_header_31_0,

-			 misc_3_mask->outer_vxlan_gpe_vni << 8);

-		misc_3_mask->outer_vxlan_gpe_vni = 0;

-	}

+	DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,

+			  outer_vxlan_gpe_flags,

+			  misc_3_mask, outer_vxlan_gpe_flags);

+	DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,

+			  outer_vxlan_gpe_next_protocol,

+			  misc_3_mask, outer_vxlan_gpe_next_protocol);

+	DR_STE_SET_MASK_V(flex_parser_tnl_vxlan_gpe, bit_mask,

+			  outer_vxlan_gpe_vni,

+			  misc_3_mask, outer_vxlan_gpe_vni);

 }

-static int dr_ste_build_flex_parser_tnl_tag(struct mlx5dr_match_param *value,

-					    struct mlx5dr_ste_build *sb,

-					    u8 *hw_ste_p)

+static int

+dr_ste_build_flex_parser_tnl_vxlan_gpe_tag(struct mlx5dr_match_param *value,

+					   struct mlx5dr_ste_build *sb,

+					   u8 *hw_ste_p)

 {

 	struct dr_hw_ste_format *hw_ste = (struct dr_hw_ste_format *)hw_ste_p;

 	struct mlx5dr_match_misc3 *misc3 = &value->misc3;

 	u8 *tag = hw_ste->tag;

-	if (misc3->outer_vxlan_gpe_flags ||

-	    misc3->outer_vxlan_gpe_next_protocol) {

-		MLX5_SET(ste_flex_parser_tnl, tag,

-			 flex_parser_tunneling_header_63_32,

-			 (misc3->outer_vxlan_gpe_flags << 24) |

-			 (misc3->outer_vxlan_gpe_next_protocol));

-		misc3->outer_vxlan_gpe_flags = 0;

-		misc3->outer_vxlan_gpe_next_protocol = 0;

-	}

-

-	if (misc3->outer_vxlan_gpe_vni) {

-		MLX5_SET(ste_flex_parser_tnl, tag,

-			 flex_parser_tunneling_header_31_0,

-			 misc3->outer_vxlan_gpe_vni << 8);

-		misc3->outer_vxlan_gpe_vni = 0;

-	}

+	DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,

+		       outer_vxlan_gpe_flags, misc3,

+		       outer_vxlan_gpe_flags);

+	DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,

+		       outer_vxlan_gpe_next_protocol, misc3,

+		       outer_vxlan_gpe_next_protocol);

+	DR_STE_SET_TAG(flex_parser_tnl_vxlan_gpe, tag,

+		       outer_vxlan_gpe_vni, misc3,

+		       outer_vxlan_gpe_vni);

 	return 0;

 }

-void mlx5dr_ste_build_flex_parser_tnl(struct mlx5dr_ste_build *sb,

-				      struct mlx5dr_match_param *mask,

-				      bool inner, bool rx)

+void mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,

+						struct mlx5dr_match_param *mask,

+						bool inner, bool rx)

 {

-	dr_ste_build_flex_parser_tnl_bit_mask(mask, inner, sb->bit_mask);

+	dr_ste_build_flex_parser_tnl_vxlan_gpe_bit_mask(mask, inner,

+							sb->bit_mask);

 	sb->rx = rx;

 	sb->inner = inner;

 	sb->lu_type = MLX5DR_STE_LU_TYPE_FLEX_PARSER_TNL_HEADER;

 	sb->byte_mask = dr_ste_conv_bit_to_byte_mask(sb->bit_mask);

-	sb->ste_build_tag_func = &dr_ste_build_flex_parser_tnl_tag;

+	sb->ste_build_tag_func = &dr_ste_build_flex_parser_tnl_vxlan_gpe_tag;

 }

 static void dr_ste_build_register_0_bit_mask(struct mlx5dr_match_param *value,

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 b18720707255..9dedc162756c 100644

--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h

+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h

@@ -327,9 +327,9 @@ int mlx5dr_ste_build_flex_parser_1(struct mlx5dr_ste_build *sb,

 				   struct mlx5dr_match_param *mask,

 				   struct mlx5dr_cmd_caps *caps,

 				   bool inner, bool rx);

-void mlx5dr_ste_build_flex_parser_tnl(struct mlx5dr_ste_build *sb,

-				      struct mlx5dr_match_param *mask,

-				      bool inner, bool rx);

+void mlx5dr_ste_build_flex_parser_tnl_vxlan_gpe(struct mlx5dr_ste_build *sb,

+						struct mlx5dr_match_param *mask,

+						bool inner, bool rx);

 void mlx5dr_ste_build_general_purpose(struct mlx5dr_ste_build *sb,

 				      struct mlx5dr_match_param *mask,

 				      bool inner, bool rx);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h

index 596c927220d9..6d78b027fe56 100644

--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h

+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h

@@ -548,6 +548,17 @@ struct mlx5_ifc_ste_flex_parser_tnl_bits {

 	u8         reserved_at_40[0x40];

 };

+struct mlx5_ifc_ste_flex_parser_tnl_vxlan_gpe_bits {

+	u8         outer_vxlan_gpe_flags[0x8];

+	u8         reserved_at_8[0x10];

+	u8         outer_vxlan_gpe_next_protocol[0x8];

+

+	u8         outer_vxlan_gpe_vni[0x18];

+	u8         reserved_at_38[0x8];

+

+	u8         reserved_at_40[0x40];

+};

+

 struct mlx5_ifc_ste_general_purpose_bits {

 	u8         general_purpose_lookup_field[0x20];

-- 

2.13.6