Commit dbdf8909 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'mlx5_tx_steering' into rdma.git for-next 

Leon Romanovsky says:

====================
Those two patches from Michael extends mlx5_core and mlx5_ib flow steering
to support RDMA TX in similar way to already supported RDMA RX.
====================

Based on the mlx5-next branch at
 git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Due to dependencies

* branch 'mlx5_tx_steering':
  RDMA/mlx5: Add support for RDMA TX flow table
  net/mlx5: Add support for RDMA TX steering
parents dfb5394f af9c3841

drivers/infiniband/hw/mlx5/flow.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ mlx5_ib_ft_type_to_namespace(enum mlx5_ib_uapi_flow_table_type table_type, 
	case MLX5_IB_UAPI_FLOW_TABLE_TYPE_RDMA_RX:

		*namespace = MLX5_FLOW_NAMESPACE_RDMA_RX;

		break;

	case MLX5_IB_UAPI_FLOW_TABLE_TYPE_RDMA_TX:

		*namespace = MLX5_FLOW_NAMESPACE_RDMA_TX;

		break;

	default:

		return -EINVAL;

	}

drivers/infiniband/hw/mlx5/main.c

+7 −0
Original line number Diff line number Diff line
@@ -4063,6 +4063,11 @@ _get_flow_table(struct mlx5_ib_dev *dev, 
			BIT(MLX5_CAP_FLOWTABLE_RDMA_RX(dev->mdev,

						       log_max_ft_size));

		priority = fs_matcher->priority;

	} else if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_RDMA_TX) {

		max_table_size =

			BIT(MLX5_CAP_FLOWTABLE_RDMA_TX(dev->mdev,

						       log_max_ft_size));

		priority = fs_matcher->priority;

	}



	max_table_size = min_t(int, max_table_size, MLX5_FS_MAX_ENTRIES);
@@ -4079,6 +4084,8 @@ _get_flow_table(struct mlx5_ib_dev *dev, 
		prio = &dev->flow_db->fdb;

	else if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_RDMA_RX)

		prio = &dev->flow_db->rdma_rx[priority];

	else if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_RDMA_TX)

		prio = &dev->flow_db->rdma_tx[priority];



	if (!prio)

		return ERR_PTR(-EINVAL);

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ struct mlx5_ib_flow_db { 
	struct mlx5_ib_flow_prio	egress[MLX5_IB_NUM_EGRESS_FTS];

	struct mlx5_ib_flow_prio	fdb;

	struct mlx5_ib_flow_prio	rdma_rx[MLX5_IB_NUM_FLOW_FT];

	struct mlx5_ib_flow_prio	rdma_tx[MLX5_IB_NUM_FLOW_FT];

	struct mlx5_flow_table		*lag_demux_ft;

	/* Protect flow steering bypass flow tables

	 * when add/del flow rules.

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

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

	case FS_FT_NIC_TX:

	case FS_FT_RDMA_RX:

	case FS_FT_RDMA_TX:

		return mlx5_fs_cmd_get_fw_cmds();

	default:

		return mlx5_fs_cmd_get_stub_cmds();

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

+53 −0
Original line number Diff line number Diff line
@@ -87,6 +87,15 @@ 
			       .identified_miss_table_mode),                   \

		FS_CAP(flow_table_properties_nic_transmit.flow_table_modify))



#define FS_CHAINING_CAPS_RDMA_TX                                                \

	FS_REQUIRED_CAPS(                                                       \

		FS_CAP(flow_table_properties_nic_transmit_rdma.flow_modify_en), \

		FS_CAP(flow_table_properties_nic_transmit_rdma.modify_root),    \

		FS_CAP(flow_table_properties_nic_transmit_rdma                  \

			       .identified_miss_table_mode),                    \

		FS_CAP(flow_table_properties_nic_transmit_rdma                  \

			       .flow_table_modify))



#define LEFTOVERS_NUM_LEVELS 1

#define LEFTOVERS_NUM_PRIOS 1
@@ -202,6 +211,18 @@ static struct init_tree_node rdma_rx_root_fs = { 
	}

};



static struct init_tree_node rdma_tx_root_fs = {

	.type = FS_TYPE_NAMESPACE,

	.ar_size = 1,

	.children = (struct init_tree_node[]) {

		ADD_PRIO(0, MLX5_BY_PASS_NUM_PRIOS, 0,

			 FS_CHAINING_CAPS_RDMA_TX,

			 ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,

				ADD_MULTIPLE_PRIO(MLX5_BY_PASS_NUM_PRIOS,

						  BY_PASS_PRIO_NUM_LEVELS))),

	}

};



enum fs_i_lock_class {

	FS_LOCK_GRANDPARENT,

	FS_LOCK_PARENT,
@@ -2132,6 +2153,8 @@ struct mlx5_flow_namespace *mlx5_get_flow_namespace(struct mlx5_core_dev *dev, 
	} else if (type == MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL) {

		root_ns = steering->rdma_rx_root_ns;

		prio = RDMA_RX_KERNEL_PRIO;

	} else if (type == MLX5_FLOW_NAMESPACE_RDMA_TX) {

		root_ns = steering->rdma_tx_root_ns;

	} else { /* Must be NIC RX */

		root_ns = steering->root_ns;

		prio = type;
@@ -2535,6 +2558,7 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev) 
	cleanup_root_ns(steering->sniffer_rx_root_ns);

	cleanup_root_ns(steering->sniffer_tx_root_ns);

	cleanup_root_ns(steering->rdma_rx_root_ns);

	cleanup_root_ns(steering->rdma_tx_root_ns);

	cleanup_root_ns(steering->egress_root_ns);

	mlx5_cleanup_fc_stats(dev);

	kmem_cache_destroy(steering->ftes_cache);
@@ -2591,6 +2615,29 @@ out_err: 
	return err;

}



static int init_rdma_tx_root_ns(struct mlx5_flow_steering *steering)

{

	int err;



	steering->rdma_tx_root_ns = create_root_ns(steering, FS_FT_RDMA_TX);

	if (!steering->rdma_tx_root_ns)

		return -ENOMEM;



	err = init_root_tree(steering, &rdma_tx_root_fs,

			     &steering->rdma_tx_root_ns->ns.node);

	if (err)

		goto out_err;



	set_prio_attrs(steering->rdma_tx_root_ns);



	return 0;



out_err:

	cleanup_root_ns(steering->rdma_tx_root_ns);

	steering->rdma_tx_root_ns = NULL;

	return err;

}



/* FT and tc chains are stored in the same array so we can re-use the

 * mlx5_get_fdb_sub_ns() and tc api for FT chains.

 * When creating a new ns for each chain store it in the first available slot.
@@ -2890,6 +2937,12 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) 
			goto err;

	}



	if (MLX5_CAP_FLOWTABLE_RDMA_TX(dev, ft_support)) {

		err = init_rdma_tx_root_ns(steering);

		if (err)

			goto err;

	}



	if (MLX5_IPSEC_DEV(dev) || MLX5_CAP_FLOWTABLE_NIC_TX(dev, ft_support)) {

		err = init_egress_root_ns(steering);

		if (err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE