Commit 922d69ed authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Add redirect ingress to tc action infra 



Add parsing support by implementing struct mlx5e_tc_act
for this action.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarOz Shlomo <ozsh@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 3929ff58

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ mlx5_core-$(CONFIG_MLX5_CLS_ACT) += en/tc/act/act.o en/tc/act/drop.o en/tc/a 
					en/tc/act/tun.o en/tc/act/csum.o en/tc/act/pedit.o \

					en/tc/act/vlan.o en/tc/act/vlan_mangle.o en/tc/act/mpls.o \

					en/tc/act/mirred.o en/tc/act/mirred_nic.o \

					en/tc/act/ct.o en/tc/act/sample.o en/tc/act/ptype.o

					en/tc/act/ct.o en/tc/act/sample.o en/tc/act/ptype.o \

					en/tc/act/redirect_ingress.o



mlx5_core-$(CONFIG_MLX5_TC_CT)	     += en/tc_ct.o

mlx5_core-$(CONFIG_MLX5_TC_SAMPLE)   += en/tc/sample.o

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

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ static struct mlx5e_tc_act *tc_acts_fdb[NUM_FLOW_ACTIONS] = { 
	&mlx5e_tc_act_goto,

	&mlx5e_tc_act_mirred,

	&mlx5e_tc_act_mirred,

	NULL, /* FLOW_ACTION_REDIRECT_INGRESS, */

	&mlx5e_tc_act_redirect_ingress,

	NULL, /* FLOW_ACTION_MIRRED_INGRESS, */

	&mlx5e_tc_act_vlan,

	&mlx5e_tc_act_vlan,

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

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ extern struct mlx5e_tc_act mlx5e_tc_act_mirred_nic; 
extern struct mlx5e_tc_act mlx5e_tc_act_ct;

extern struct mlx5e_tc_act mlx5e_tc_act_sample;

extern struct mlx5e_tc_act mlx5e_tc_act_ptype;

extern struct mlx5e_tc_act mlx5e_tc_act_redirect_ingress;



struct mlx5e_tc_act *

mlx5e_tc_act_get(enum flow_action_id act_id,

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

0 → 100644
+79 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

// Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.



#include "act.h"

#include "en/tc_priv.h"



static bool

tc_act_can_offload_redirect_ingress(struct mlx5e_tc_act_parse_state *parse_state,

				    const struct flow_action_entry *act,

				    int act_index)

{

	struct netlink_ext_ack *extack = parse_state->extack;

	struct mlx5e_tc_flow *flow = parse_state->flow;

	struct mlx5e_tc_flow_parse_attr *parse_attr;

	struct net_device *out_dev = act->dev;

	struct mlx5_esw_flow_attr *esw_attr;



	parse_attr = flow->attr->parse_attr;

	esw_attr = flow->attr->esw_attr;



	if (!out_dev)

		return false;



	if (!netif_is_ovs_master(out_dev)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "redirect to ingress is supported only for OVS internal ports");

		return false;

	}



	if (netif_is_ovs_master(parse_attr->filter_dev)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "redirect to ingress is not supported from internal port");

		return false;

	}



	if (!parse_state->ptype_host) {

		NL_SET_ERR_MSG_MOD(extack,

				   "redirect to int port ingress requires ptype=host action");

		return false;

	}



	if (esw_attr->out_count) {

		NL_SET_ERR_MSG_MOD(extack,

				   "redirect to int port ingress is supported only as single destination");

		return false;

	}



	return true;

}



static int

tc_act_parse_redirect_ingress(struct mlx5e_tc_act_parse_state *parse_state,

			      const struct flow_action_entry *act,

			      struct mlx5e_priv *priv,

			      struct mlx5_flow_attr *attr)

{

	struct mlx5_esw_flow_attr *esw_attr = attr->esw_attr;

	struct net_device *out_dev = act->dev;

	int err;



	attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

			MLX5_FLOW_CONTEXT_ACTION_COUNT;



	err = mlx5e_set_fwd_to_int_port_actions(priv, attr, out_dev->ifindex,

						MLX5E_TC_INT_PORT_INGRESS,

						&attr->action, esw_attr->out_count);

	if (err)

		return err;



	esw_attr->out_count++;



	return 0;

}



struct mlx5e_tc_act mlx5e_tc_act_redirect_ingress = {

	.can_offload = tc_act_can_offload_redirect_ingress,

	.parse_action = tc_act_parse_redirect_ingress,

};

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+0 −49
Original line number Diff line number Diff line
@@ -3366,55 +3366,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, 
	hdrs = parse_state->hdrs;



	flow_action_for_each(i, act, flow_action) {

		switch (act->id) {

		case FLOW_ACTION_REDIRECT_INGRESS: {

			struct net_device *out_dev;



			out_dev = act->dev;

			if (!out_dev)

				return -EOPNOTSUPP;



			if (!netif_is_ovs_master(out_dev)) {

				NL_SET_ERR_MSG_MOD(extack,

						   "redirect to ingress is supported only for OVS internal ports");

				return -EOPNOTSUPP;

			}



			if (netif_is_ovs_master(parse_attr->filter_dev)) {

				NL_SET_ERR_MSG_MOD(extack,

						   "redirect to ingress is not supported from internal port");

				return -EOPNOTSUPP;

			}



			if (!parse_state->ptype_host) {

				NL_SET_ERR_MSG_MOD(extack,

						   "redirect to int port ingress requires ptype=host action");

				return -EOPNOTSUPP;

			}



			if (esw_attr->out_count) {

				NL_SET_ERR_MSG_MOD(extack,

						   "redirect to int port ingress is supported only as single destination");

				return -EOPNOTSUPP;

			}



			attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

					MLX5_FLOW_CONTEXT_ACTION_COUNT;



			err = mlx5e_set_fwd_to_int_port_actions(priv, attr, out_dev->ifindex,

								MLX5E_TC_INT_PORT_INGRESS,

								&attr->action, esw_attr->out_count);

			if (err)

				return err;



			esw_attr->out_count++;



			break;

		}

		default:

			break;

		}



		tc_act = mlx5e_tc_act_get(act->id, ns_type);

		if (!tc_act) {

			NL_SET_ERR_MSG_MOD(extack, "Not implemented offload action");