Commit 3268ee8f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-updates-2022-01-27' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5-updates-2022-01-27

1) Dima, adds an internal mlx5 steering callback per steering provider
   (FW vs SW steering), to advertise steering capabilities implemented by
   each module, this helps upper modules in mlx5 to know what is
   supported and what's not without the need to tell what is the underlying
   steering mode.
   2nd patch is the usecase where this interface is used to implement
   Vlan Push/pop for uplink with SW steering, where in FW mode it's not
   supported yet.

2) Roi Dayan improves code readability and maintainability
   as preparation step for multi attribute instance per flow
   in mlx5 TC module

   Currently the mlx5_flow object contains a single mlx5_attr instance.
   However, multi table actions (e.g. CT) instantiate multiple attr instances.

   This is a refactoring series in a preparation to support multiple
   attribute instances per flow.
   The commits prepare functions to get attr instance instead of using
   flow->attr and also using attr->flags if the flag is more relevant
   to be attr flag and not a flow flag considering there will be multiple
   attr instances. i.e. CT and SAMPLE flags.

* tag 'mlx5-updates-2022-01-27' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: VLAN push on RX, pop on TX
  net/mlx5: Introduce software defined steering capabilities
  net/mlx5: Remove unused TIR modify bitmask enums
  net/mlx5e: CT, Remove redundant flow args from tc ct calls
  net/mlx5e: TC, Store mapped tunnel id on flow attr
  net/mlx5e: Test CT and SAMPLE on flow attr
  net/mlx5e: Refactor eswitch attr flags to just attr flags
  net/mlx5e: CT, Don't set flow flag CT for ct clear flow
  net/mlx5e: TC, Hold sample_attr on stack instead of pointer
  net/mlx5e: TC, Reject rules with multiple CT actions
  net/mlx5e: TC, Refactor mlx5e_tc_add_flow_mod_hdr() to get flow attr
  net/mlx5e: TC, Pass attr to tc_act can_offload()
  net/mlx5e: TC, Split pedit offloads verify from alloc_tc_pedit_action()
  net/mlx5e: TC, Move pedit_headers_action to parse_attr
  net/mlx5e: Move counter creation call to alloc_flow_attr_counter()
  net/mlx5e: Pass attr arg for attaching/detaching encaps
  net/mlx5e: Move code chunk setting encap dests into its own function
====================

Link: https://lore.kernel.org/r/20220127204007.146300-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 35c71aa0 60dc0ef6

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c

+3 −2
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
static bool

tc_act_can_offload_accept(struct mlx5e_tc_act_parse_state *parse_state,

			  const struct flow_action_entry *act,

			  int act_index)

			  int act_index,

			  struct mlx5_flow_attr *attr)

{

	return true;

}
@@ -20,7 +21,7 @@ tc_act_parse_accept(struct mlx5e_tc_act_parse_state *parse_state, 
{

	attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

			MLX5_FLOW_CONTEXT_ACTION_COUNT;

	attr->flags |= MLX5_ESW_ATTR_FLAG_ACCEPT;

	attr->flags |= MLX5_ATTR_FLAG_ACCEPT;



	return 0;

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h

+3 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ struct mlx5e_tc_act_parse_state { 
	unsigned int num_actions;

	struct mlx5e_tc_flow *flow;

	struct netlink_ext_ack *extack;

	bool ct;

	bool encap;

	bool decap;

	bool mpls_push;

	bool ptype_host;

	const struct ip_tunnel_info *tun_info;

	struct pedit_headers_action hdrs[__PEDIT_CMD_MAX];

	int ifindexes[MLX5_MAX_FLOW_FWD_VPORTS];

	int if_count;

	struct mlx5_tc_ct_priv *ct_priv;
@@ -30,7 +30,8 @@ struct mlx5e_tc_act_parse_state { 
struct mlx5e_tc_act {

	bool (*can_offload)(struct mlx5e_tc_act_parse_state *parse_state,

			    const struct flow_action_entry *act,

			    int act_index);

			    int act_index,

			    struct mlx5_flow_attr *attr);



	int (*parse_action)(struct mlx5e_tc_act_parse_state *parse_state,

			    const struct flow_action_entry *act,

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/csum.c

+3 −2
Original line number Diff line number Diff line
@@ -38,11 +38,12 @@ csum_offload_supported(struct mlx5e_priv *priv, 
static bool

tc_act_can_offload_csum(struct mlx5e_tc_act_parse_state *parse_state,

			const struct flow_action_entry *act,

			int act_index)

			int act_index,

			struct mlx5_flow_attr *attr)

{

	struct mlx5e_tc_flow *flow = parse_state->flow;



	return csum_offload_supported(flow->priv, flow->attr->action,

	return csum_offload_supported(flow->priv, attr->action,

				      act->csum_flags, parse_state->extack);

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/ct.c

+15 −2
Original line number Diff line number Diff line
@@ -8,8 +8,10 @@ 
static bool

tc_act_can_offload_ct(struct mlx5e_tc_act_parse_state *parse_state,

		      const struct flow_action_entry *act,

		      int act_index)

		      int act_index,

		      struct mlx5_flow_attr *attr)

{

	bool clear_action = act->ct.action & TCA_CT_ACT_CLEAR;

	struct netlink_ext_ack *extack = parse_state->extack;



	if (flow_flag_test(parse_state->flow, SAMPLE)) {
@@ -18,6 +20,11 @@ tc_act_can_offload_ct(struct mlx5e_tc_act_parse_state *parse_state, 
		return false;

	}



	if (parse_state->ct && !clear_action) {

		NL_SET_ERR_MSG_MOD(extack, "Multiple CT actions are not supoported");

		return false;

	}



	return true;

}
@@ -27,6 +34,7 @@ tc_act_parse_ct(struct mlx5e_tc_act_parse_state *parse_state, 
		struct mlx5e_priv *priv,

		struct mlx5_flow_attr *attr)

{

	bool clear_action = act->ct.action & TCA_CT_ACT_CLEAR;

	int err;



	err = mlx5_tc_ct_parse_action(parse_state->ct_priv, attr,
@@ -35,11 +43,16 @@ tc_act_parse_ct(struct mlx5e_tc_act_parse_state *parse_state, 
	if (err)

		return err;



	flow_flag_set(parse_state->flow, CT);



	if (mlx5e_is_eswitch_flow(parse_state->flow))

		attr->esw_attr->split_count = attr->esw_attr->out_count;



	if (!clear_action) {

		attr->flags |= MLX5_ATTR_FLAG_CT;

		flow_flag_set(parse_state->flow, CT);

		parse_state->ct = true;

	}



	return 0;

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/drop.c

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
static bool

tc_act_can_offload_drop(struct mlx5e_tc_act_parse_state *parse_state,

			const struct flow_action_entry *act,

			int act_index)

			int act_index,

			struct mlx5_flow_attr *attr)

{

	return true;

}