Skip to content

Commit 24670b1

Browse files
mikijoyjgunthorpe
authored andcommitted
net/mlx5: Add support for RDMA TX steering
Add new RDMA TX flow steering namespace. Flow steering rules in this namespace are used to filter transmitted RDMA traffic. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Michael Guralnik <[email protected]> Reviewed-by: Maor Gottlieb <[email protected]> Reviewed-by: Mark Bloch <[email protected]> Signed-off-by: Leon Romanovsky <[email protected]> Signed-off-by: Jason Gunthorpe <[email protected]>
1 parent 826096d commit 24670b1

File tree

6 files changed

+67
-3
lines changed

6 files changed

+67
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,7 @@ const struct mlx5_flow_cmds *mlx5_fs_cmd_get_default(enum fs_flow_table_type typ
904904
case FS_FT_SNIFFER_TX:
905905
case FS_FT_NIC_TX:
906906
case FS_FT_RDMA_RX:
907+
case FS_FT_RDMA_TX:
907908
return mlx5_fs_cmd_get_fw_cmds();
908909
default:
909910
return mlx5_fs_cmd_get_stub_cmds();

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

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@
8787
.identified_miss_table_mode), \
8888
FS_CAP(flow_table_properties_nic_transmit.flow_table_modify))
8989

90+
#define FS_CHAINING_CAPS_RDMA_TX \
91+
FS_REQUIRED_CAPS( \
92+
FS_CAP(flow_table_properties_nic_transmit_rdma.flow_modify_en), \
93+
FS_CAP(flow_table_properties_nic_transmit_rdma.modify_root), \
94+
FS_CAP(flow_table_properties_nic_transmit_rdma \
95+
.identified_miss_table_mode), \
96+
FS_CAP(flow_table_properties_nic_transmit_rdma \
97+
.flow_table_modify))
98+
9099
#define LEFTOVERS_NUM_LEVELS 1
91100
#define LEFTOVERS_NUM_PRIOS 1
92101

@@ -202,6 +211,18 @@ static struct init_tree_node rdma_rx_root_fs = {
202211
}
203212
};
204213

214+
static struct init_tree_node rdma_tx_root_fs = {
215+
.type = FS_TYPE_NAMESPACE,
216+
.ar_size = 1,
217+
.children = (struct init_tree_node[]) {
218+
ADD_PRIO(0, MLX5_BY_PASS_NUM_PRIOS, 0,
219+
FS_CHAINING_CAPS_RDMA_TX,
220+
ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,
221+
ADD_MULTIPLE_PRIO(MLX5_BY_PASS_NUM_PRIOS,
222+
BY_PASS_PRIO_NUM_LEVELS))),
223+
}
224+
};
225+
205226
enum fs_i_lock_class {
206227
FS_LOCK_GRANDPARENT,
207228
FS_LOCK_PARENT,
@@ -2132,6 +2153,8 @@ struct mlx5_flow_namespace *mlx5_get_flow_namespace(struct mlx5_core_dev *dev,
21322153
} else if (type == MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL) {
21332154
root_ns = steering->rdma_rx_root_ns;
21342155
prio = RDMA_RX_KERNEL_PRIO;
2156+
} else if (type == MLX5_FLOW_NAMESPACE_RDMA_TX) {
2157+
root_ns = steering->rdma_tx_root_ns;
21352158
} else { /* Must be NIC RX */
21362159
root_ns = steering->root_ns;
21372160
prio = type;
@@ -2535,6 +2558,7 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev)
25352558
cleanup_root_ns(steering->sniffer_rx_root_ns);
25362559
cleanup_root_ns(steering->sniffer_tx_root_ns);
25372560
cleanup_root_ns(steering->rdma_rx_root_ns);
2561+
cleanup_root_ns(steering->rdma_tx_root_ns);
25382562
cleanup_root_ns(steering->egress_root_ns);
25392563
mlx5_cleanup_fc_stats(dev);
25402564
kmem_cache_destroy(steering->ftes_cache);
@@ -2591,6 +2615,29 @@ static int init_rdma_rx_root_ns(struct mlx5_flow_steering *steering)
25912615
return err;
25922616
}
25932617

2618+
static int init_rdma_tx_root_ns(struct mlx5_flow_steering *steering)
2619+
{
2620+
int err;
2621+
2622+
steering->rdma_tx_root_ns = create_root_ns(steering, FS_FT_RDMA_TX);
2623+
if (!steering->rdma_tx_root_ns)
2624+
return -ENOMEM;
2625+
2626+
err = init_root_tree(steering, &rdma_tx_root_fs,
2627+
&steering->rdma_tx_root_ns->ns.node);
2628+
if (err)
2629+
goto out_err;
2630+
2631+
set_prio_attrs(steering->rdma_tx_root_ns);
2632+
2633+
return 0;
2634+
2635+
out_err:
2636+
cleanup_root_ns(steering->rdma_tx_root_ns);
2637+
steering->rdma_tx_root_ns = NULL;
2638+
return err;
2639+
}
2640+
25942641
/* FT and tc chains are stored in the same array so we can re-use the
25952642
* mlx5_get_fdb_sub_ns() and tc api for FT chains.
25962643
* 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)
28902937
goto err;
28912938
}
28922939

2940+
if (MLX5_CAP_FLOWTABLE_RDMA_TX(dev, ft_support)) {
2941+
err = init_rdma_tx_root_ns(steering);
2942+
if (err)
2943+
goto err;
2944+
}
2945+
28932946
if (MLX5_IPSEC_DEV(dev) || MLX5_CAP_FLOWTABLE_NIC_TX(dev, ft_support)) {
28942947
err = init_egress_root_ns(steering);
28952948
if (err)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ enum fs_flow_table_type {
8686
FS_FT_SNIFFER_RX = 0X5,
8787
FS_FT_SNIFFER_TX = 0X6,
8888
FS_FT_RDMA_RX = 0X7,
89-
FS_FT_MAX_TYPE = FS_FT_RDMA_RX,
89+
FS_FT_RDMA_TX = 0X8,
90+
FS_FT_MAX_TYPE = FS_FT_RDMA_TX,
9091
};
9192

9293
enum fs_flow_table_op_mod {
@@ -116,6 +117,7 @@ struct mlx5_flow_steering {
116117
struct mlx5_flow_root_namespace *sniffer_tx_root_ns;
117118
struct mlx5_flow_root_namespace *sniffer_rx_root_ns;
118119
struct mlx5_flow_root_namespace *rdma_rx_root_ns;
120+
struct mlx5_flow_root_namespace *rdma_tx_root_ns;
119121
struct mlx5_flow_root_namespace *egress_root_ns;
120122
};
121123

@@ -316,7 +318,8 @@ void mlx5_cleanup_fs(struct mlx5_core_dev *dev);
316318
(type == FS_FT_SNIFFER_RX) ? MLX5_CAP_FLOWTABLE_SNIFFER_RX(mdev, cap) : \
317319
(type == FS_FT_SNIFFER_TX) ? MLX5_CAP_FLOWTABLE_SNIFFER_TX(mdev, cap) : \
318320
(type == FS_FT_RDMA_RX) ? MLX5_CAP_FLOWTABLE_RDMA_RX(mdev, cap) : \
319-
(BUILD_BUG_ON_ZERO(FS_FT_RDMA_RX != FS_FT_MAX_TYPE))\
321+
(type == FS_FT_RDMA_TX) ? MLX5_CAP_FLOWTABLE_RDMA_TX(mdev, cap) : \
322+
(BUILD_BUG_ON_ZERO(FS_FT_RDMA_TX != FS_FT_MAX_TYPE))\
320323
)
321324

322325
#endif

include/linux/mlx5/device.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,6 +1211,12 @@ enum mlx5_qcam_feature_groups {
12111211
#define MLX5_CAP_FLOWTABLE_RDMA_RX_MAX(mdev, cap) \
12121212
MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_receive_rdma.cap)
12131213

1214+
#define MLX5_CAP_FLOWTABLE_RDMA_TX(mdev, cap) \
1215+
MLX5_CAP_FLOWTABLE(mdev, flow_table_properties_nic_transmit_rdma.cap)
1216+
1217+
#define MLX5_CAP_FLOWTABLE_RDMA_TX_MAX(mdev, cap) \
1218+
MLX5_CAP_FLOWTABLE_MAX(mdev, flow_table_properties_nic_transmit_rdma.cap)
1219+
12141220
#define MLX5_CAP_ESW_FLOWTABLE(mdev, cap) \
12151221
MLX5_GET(flow_table_eswitch_cap, \
12161222
mdev->caps.hca_cur[MLX5_CAP_ESWITCH_FLOW_TABLE], cap)

include/linux/mlx5/fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ enum mlx5_flow_namespace_type {
7777
MLX5_FLOW_NAMESPACE_EGRESS,
7878
MLX5_FLOW_NAMESPACE_RDMA_RX,
7979
MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL,
80+
MLX5_FLOW_NAMESPACE_RDMA_TX,
8081
};
8182

8283
enum {

include/linux/mlx5/mlx5_ifc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ struct mlx5_ifc_flow_table_nic_cap_bits {
705705

706706
struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit;
707707

708-
u8 reserved_at_a00[0x200];
708+
struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_rdma;
709709

710710
struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_transmit_sniffer;
711711

0 commit comments

Comments
 (0)