Commit 425a563a authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Saeed Mahameed
Browse files

net/mlx5: Introduce port selection namespace 



Add new port selection flow steering namespace. Flow steering rules in
this namespaceare are used to determine the physical port for egress
packets.

Signed-off-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 4c71ce50

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

+1 −0
Original line number Diff line number Diff line
@@ -969,6 +969,7 @@ const struct mlx5_flow_cmds *mlx5_fs_cmd_get_default(enum fs_flow_table_type typ 
	case FS_FT_NIC_TX:

	case FS_FT_RDMA_RX:

	case FS_FT_RDMA_TX:

	case FS_FT_PORT_SEL:

		return mlx5_fs_cmd_get_fw_cmds();

	default:

		return mlx5_fs_cmd_get_stub_cmds();

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

+26 −0
Original line number Diff line number Diff line
@@ -2191,6 +2191,10 @@ struct mlx5_flow_namespace *mlx5_get_flow_namespace(struct mlx5_core_dev *dev, 
		if (steering->fdb_root_ns)

			return &steering->fdb_root_ns->ns;

		return NULL;

	case MLX5_FLOW_NAMESPACE_PORT_SEL:

		if (steering->port_sel_root_ns)

			return &steering->port_sel_root_ns->ns;

		return NULL;

	case MLX5_FLOW_NAMESPACE_SNIFFER_RX:

		if (steering->sniffer_rx_root_ns)

			return &steering->sniffer_rx_root_ns->ns;
@@ -2596,6 +2600,7 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev) 
	steering->fdb_root_ns = NULL;

	kfree(steering->fdb_sub_ns);

	steering->fdb_sub_ns = NULL;

	cleanup_root_ns(steering->port_sel_root_ns);

	cleanup_root_ns(steering->sniffer_rx_root_ns);

	cleanup_root_ns(steering->sniffer_tx_root_ns);

	cleanup_root_ns(steering->rdma_rx_root_ns);
@@ -2634,6 +2639,21 @@ static int init_sniffer_rx_root_ns(struct mlx5_flow_steering *steering) 
	return PTR_ERR_OR_ZERO(prio);

}



#define PORT_SEL_NUM_LEVELS 3

static int init_port_sel_root_ns(struct mlx5_flow_steering *steering)

{

	struct fs_prio *prio;



	steering->port_sel_root_ns = create_root_ns(steering, FS_FT_PORT_SEL);

	if (!steering->port_sel_root_ns)

		return -ENOMEM;



	/* Create single prio */

	prio = fs_create_prio(&steering->port_sel_root_ns->ns, 0,

			      PORT_SEL_NUM_LEVELS);

	return PTR_ERR_OR_ZERO(prio);

}



static int init_rdma_rx_root_ns(struct mlx5_flow_steering *steering)

{

	int err;
@@ -3020,6 +3040,12 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) 
			goto err;

	}



	if (MLX5_CAP_FLOWTABLE_PORT_SELECTION(dev, ft_support)) {

		err = init_port_sel_root_ns(steering);

		if (err)

			goto err;

	}



	if (MLX5_CAP_FLOWTABLE_RDMA_RX(dev, ft_support) &&

	    MLX5_CAP_FLOWTABLE_RDMA_RX(dev, table_miss_action_domain)) {

		err = init_rdma_rx_root_ns(steering);

drivers/net/ethernet/mellanox/mlx5/core/fs_core.h

+5 −2
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ enum fs_flow_table_type { 
	FS_FT_SNIFFER_TX	= 0X6,

	FS_FT_RDMA_RX		= 0X7,

	FS_FT_RDMA_TX		= 0X8,

	FS_FT_MAX_TYPE = FS_FT_RDMA_TX,

	FS_FT_PORT_SEL		= 0X9,

	FS_FT_MAX_TYPE = FS_FT_PORT_SEL,

};



enum fs_flow_table_op_mod {
@@ -129,6 +130,7 @@ struct mlx5_flow_steering { 
	struct mlx5_flow_root_namespace	*rdma_rx_root_ns;

	struct mlx5_flow_root_namespace	*rdma_tx_root_ns;

	struct mlx5_flow_root_namespace	*egress_root_ns;

	struct mlx5_flow_root_namespace	*port_sel_root_ns;

	int esw_egress_acl_vports;

	int esw_ingress_acl_vports;

};
@@ -341,7 +343,8 @@ struct mlx5_flow_root_namespace *find_root(struct fs_node *node); 
	(type == FS_FT_SNIFFER_TX) ? MLX5_CAP_FLOWTABLE_SNIFFER_TX(mdev, cap) :		\

	(type == FS_FT_RDMA_RX) ? MLX5_CAP_FLOWTABLE_RDMA_RX(mdev, cap) :		\

	(type == FS_FT_RDMA_TX) ? MLX5_CAP_FLOWTABLE_RDMA_TX(mdev, cap) :      \

	(BUILD_BUG_ON_ZERO(FS_FT_RDMA_TX != FS_FT_MAX_TYPE))\

	(type == FS_FT_PORT_SEL) ? MLX5_CAP_FLOWTABLE_PORT_SELECTION(mdev, cap) :      \

	(BUILD_BUG_ON_ZERO(FS_FT_PORT_SEL != FS_FT_MAX_TYPE))\

	)



#endif

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

+6 −0
Original line number Diff line number Diff line
@@ -149,6 +149,12 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev) 
	if (err)

		return err;



	if (MLX5_CAP_GEN(dev, port_selection_cap)) {

		err = mlx5_core_get_caps(dev, MLX5_CAP_PORT_SELECTION);

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, hca_cap_2)) {

		err = mlx5_core_get_caps(dev, MLX5_CAP_GENERAL_2);

		if (err)

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

+1 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,7 @@ static const int types[] = { 
	MLX5_CAP_TLS,

	MLX5_CAP_VDPA_EMULATION,

	MLX5_CAP_IPSEC,

	MLX5_CAP_PORT_SELECTION,

};



static void mlx5_hca_caps_free(struct mlx5_core_dev *dev)