RDMA TX steering support
Subsystems (5)
cover RDMA TX steering support
From: Leon Romanovsky <[email protected]>
Hi,
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.
Thanks
Michael Guralnik (2):
net/mlx5: Add support for RDMA TX steering
RDMA/mlx5: Add support for RDMA TX flow table
drivers/infiniband/hw/mlx5/flow.c | 3 ++ drivers/infiniband/hw/mlx5/main.c | 7 +++ drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + .../net/ethernet/mellanox/mlx5/core/fs_cmd.c | 1 + .../net/ethernet/mellanox/mlx5/core/fs_core.c | 53 +++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/fs_core.h | 7 ++- include/linux/mlx5/device.h | 6 +++ include/linux/mlx5/fs.h | 1 + include/linux/mlx5/mlx5_ifc.h | 2 +- include/uapi/rdma/mlx5_user_ioctl_verbs.h | 1 + 10 files changed, 79 insertions(+), 3 deletions(-)
--
2.24.1
PATCH 1/2 net/mlx5: Add support for RDMA TX steering
From: Michael Guralnik <[email protected]>
Add new RDMA TX flow steering namespace. Flow steering rules in this namespace are used to filter transmitted RDMA traffic.
--- .../net/ethernet/mellanox/mlx5/core/fs_cmd.c | 1 + .../net/ethernet/mellanox/mlx5/core/fs_core.c | 53 +++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/fs_core.h | 7 ++- include/linux/mlx5/device.h | 6 +++ include/linux/mlx5/fs.h | 1 + include/linux/mlx5/mlx5_ifc.h | 2 +- 6 files changed, 67 insertions(+), 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c +1 -0
@@ -904,6 +904,7 @@ const struct mlx5_flow_cmds *mlx5_fs_cmd_get_default(enum fs_flow_table_type typcase 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
89 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h +5 -2
@@ -86,7 +86,8 @@ enum fs_flow_table_type {FS_FT_SNIFFER_RX =0X5 ,FS_FT_SNIFFER_TX =0X6 ,FS_FT_RDMA_RX =0X7 , - FS_FT_MAX_TYPE = FS_FT_RDMA_RX, +FS_FT_RDMA_TX =0X8 , + FS_FT_MAX_TYPE = FS_FT_RDMA_TX, }; enum fs_flow_table_op_mod {
@@ -116,6 +117,7 @@ struct mlx5_flow_steering {struct mlx5_flow_root_namespace *sniffer_tx_root_ns;struct mlx5_flow_root_namespace *sniffer_rx_root_ns;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; };
@@ -316,7 +318,8 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev); (type ==FS_FT_SNIFFER_RX ) ?MLX5_CAP_FLOWTABLE_SNIFFER_RX (mdev, cap) : \ (type ==FS_FT_SNIFFER_TX ) ?MLX5_CAP_FLOWTABLE_SNIFFER_TX (mdev, cap) : \ (type ==FS_FT_RDMA_RX ) ?MLX5_CAP_FLOWTABLE_RDMA_RX (mdev, cap) : \ - (BUILD_BUG_ON_ZERO(FS_FT_RDMA_RX != FS_FT_MAX_TYPE))\ + (type ==FS_FT_RDMA_TX ) ?MLX5_CAP_FLOWTABLE_RDMA_TX (mdev, cap) : \ + (BUILD_BUG_ON_ZERO (FS_FT_RDMA_TX !=FS_FT_MAX_TYPE ))\ ) #endif
include/linux/mlx5/device.h +6 -0
@@ -1211,6 +1211,12 @@ enum mlx5_qcam_feature_groups {#define MLX5_CAP_FLOWTABLE_RDMA_RX_MAX (mdev, cap) \ MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive_rdma.cap) +#define MLX5_CAP_FLOWTABLE_RDMA_TX (mdev, cap) \ + MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_transmit_rdma.cap) + +#define MLX5_CAP_FLOWTABLE_RDMA_TX_MAX (mdev, cap) \ + MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_transmit_rdma.cap) +#define MLX5_CAP_ESW_FLOWTABLE (mdev, cap) \ MLX5_GET(flow_table_eswitch_cap, \ mdev->caps.hca_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap)
include/linux/mlx5/fs.h +1 -0
@@ -77,6 +77,7 @@ enum mlx5_flow_namespace_type {MLX5_FLOW_NAMESPACE_EGRESS ,MLX5_FLOW_NAMESPACE_RDMA_RX ,MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL , + MLX5_FLOW_NAMESPACE_RDMA_TX, }; enum {
include/linux/mlx5/mlx5_ifc.h +1 -1
@@ -709,7 +709,7 @@ struct mlx5_ifc_flow_table_nic_cap_bits {struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit; -u8 reserved_at_a00[0x200 ]; +struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_rdma;struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_sniffer;
Signature · 1 line
2.24.1
PATCH 2/2 RDMA/mlx5: Add support for RDMA TX flow table
In reply to Leon RomanovskyFrom: Michael Guralnik <[email protected]>
Enable user application to add rules for RDMA TX steering table. Rules in this steering table will allow to steer transmitted RDMA traffic.
--- drivers/infiniband/hw/mlx5/flow.c | 3 +++ drivers/infiniband/hw/mlx5/main.c | 7 +++++++ drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 1 + 4 files changed, 12 insertions(+)
drivers/infiniband/hw/mlx5/flow.c +3 -0
@@ -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
@@ -4064,6 +4064,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 );
@@ -4080,6 +4085,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
@@ -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.
include/uapi/rdma/mlx5_user_ioctl_verbs.h +1 -0
@@ -44,6 +44,7 @@ enum mlx5_ib_uapi_flow_table_type {MLX5_IB_UAPI_FLOW_TABLE_TYPE_NIC_TX =0x1 ,MLX5_IB_UAPI_FLOW_TABLE_TYPE_FDB =0x2 ,MLX5_IB_UAPI_FLOW_TABLE_TYPE_RDMA_RX =0x3 , + MLX5_IB_UAPI_FLOW_TABLE_TYPE_RDMA_TX = 0x4, }; enum mlx5_ib_uapi_flow_action_packet_reformat_type {
Signature · 1 line
2.24.1
Quoted 8 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
Hi,
Those two patches from Michael extends
mlx5_coreandmlx5_ibflow steering to support RDMA TX in similar way to already supported RDMA RX.
Quoted 5 lines
Thanks
Michael Guralnik (2):
net/mlx5: Add support for RDMA TX steering
RDMA/mlx5: Add support for RDMA TX flow table
I applied this to for-next, in the unlikely event that the shared branch is still required the net/mlx5 commit is
24670b1a316618 net/mlx5: Add support for RDMA TX steering
Thanks,
Jason