Skip to content

Commit d421e46

Browse files
kliteynkuba-moo
authored andcommitted
net/mlx5: DR, Proper handling of unsupported Connect-X6DX SW steering
STEs format for Connect-X5 and Connect-X6DX different. Currently, on Connext-X6DX the SW steering would break at some point when building STEs w/o giving a proper error message. Fix this by checking the STE format of the current device when initializing domain: add mlx5_ifc definitions for Connect-X6DX SW steering, read FW capability to get the current format version, and check this version when domain is being created. Fixes: 26d688e ("net/mlx5: DR, Add Steering entry (STE) utilities") Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b336e6b commit d421e46

4 files changed

Lines changed: 15 additions & 1 deletion

File tree

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ int mlx5dr_cmd_query_device(struct mlx5_core_dev *mdev,
9292
caps->eswitch_manager = MLX5_CAP_GEN(mdev, eswitch_manager);
9393
caps->gvmi = MLX5_CAP_GEN(mdev, vhca_id);
9494
caps->flex_protocols = MLX5_CAP_GEN(mdev, flex_parser_protocols);
95+
caps->sw_format_ver = MLX5_CAP_GEN(mdev, steering_format_version);
9596

9697
if (mlx5dr_matcher_supp_flex_parser_icmp_v4(caps)) {
9798
caps->flex_parser_id_icmp_dw0 = MLX5_CAP_GEN(mdev, flex_parser_id_icmp_dw0);

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,11 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev,
223223
if (ret)
224224
return ret;
225225

226+
if (dmn->info.caps.sw_format_ver != MLX5_STEERING_FORMAT_CONNECTX_5) {
227+
mlx5dr_err(dmn, "SW steering is not supported on this device\n");
228+
return -EOPNOTSUPP;
229+
}
230+
226231
ret = dr_domain_query_fdb_caps(mdev, dmn);
227232
if (ret)
228233
return ret;

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ struct mlx5dr_cmd_caps {
625625
u8 max_ft_level;
626626
u16 roce_min_src_udp;
627627
u8 num_esw_ports;
628+
u8 sw_format_ver;
628629
bool eswitch_manager;
629630
bool rx_sw_owner;
630631
bool tx_sw_owner;

include/linux/mlx5/mlx5_ifc.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,6 +1223,11 @@ enum mlx5_fc_bulk_alloc_bitmask {
12231223

12241224
#define MLX5_FC_BULK_NUM_FCS(fc_enum) (MLX5_FC_BULK_SIZE_FACTOR * (fc_enum))
12251225

1226+
enum {
1227+
MLX5_STEERING_FORMAT_CONNECTX_5 = 0,
1228+
MLX5_STEERING_FORMAT_CONNECTX_6DX = 1,
1229+
};
1230+
12261231
struct mlx5_ifc_cmd_hca_cap_bits {
12271232
u8 reserved_at_0[0x30];
12281233
u8 vhca_id[0x10];
@@ -1521,7 +1526,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {
15211526

15221527
u8 general_obj_types[0x40];
15231528

1524-
u8 reserved_at_440[0x20];
1529+
u8 reserved_at_440[0x4];
1530+
u8 steering_format_version[0x4];
1531+
u8 create_qp_start_hint[0x18];
15251532

15261533
u8 reserved_at_460[0x3];
15271534
u8 log_max_uctx[0x5];

0 commit comments

Comments
 (0)