Commit d421e466 authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Jakub Kicinski
Browse files

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: 26d688e3 ("net/mlx5: DR, Add Steering entry (STE) utilities")
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b336e6b2

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

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ int mlx5dr_cmd_query_device(struct mlx5_core_dev *mdev, 
	caps->eswitch_manager	= MLX5_CAP_GEN(mdev, eswitch_manager);

	caps->gvmi		= MLX5_CAP_GEN(mdev, vhca_id);

	caps->flex_protocols	= MLX5_CAP_GEN(mdev, flex_parser_protocols);

	caps->sw_format_ver	= MLX5_CAP_GEN(mdev, steering_format_version);



	if (mlx5dr_matcher_supp_flex_parser_icmp_v4(caps)) {

		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

+5 −0
Original line number Diff line number Diff line
@@ -223,6 +223,11 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
	if (ret)

		return ret;



	if (dmn->info.caps.sw_format_ver != MLX5_STEERING_FORMAT_CONNECTX_5) {

		mlx5dr_err(dmn, "SW steering is not supported on this device\n");

		return -EOPNOTSUPP;

	}



	ret = dr_domain_query_fdb_caps(mdev, dmn);

	if (ret)

		return ret;

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

+1 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ struct mlx5dr_cmd_caps { 
	u8 max_ft_level;

	u16 roce_min_src_udp;

	u8 num_esw_ports;

	u8 sw_format_ver;

	bool eswitch_manager;

	bool rx_sw_owner;

	bool tx_sw_owner;

include/linux/mlx5/mlx5_ifc.h

+8 −1
Original line number Diff line number Diff line
@@ -1223,6 +1223,11 @@ enum mlx5_fc_bulk_alloc_bitmask { 


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



enum {

	MLX5_STEERING_FORMAT_CONNECTX_5   = 0,

	MLX5_STEERING_FORMAT_CONNECTX_6DX = 1,

};



struct mlx5_ifc_cmd_hca_cap_bits {

	u8         reserved_at_0[0x30];

	u8         vhca_id[0x10];
@@ -1521,7 +1526,9 @@ struct mlx5_ifc_cmd_hca_cap_bits { 


	u8         general_obj_types[0x40];



	u8         reserved_at_440[0x20];

	u8         reserved_at_440[0x4];

	u8         steering_format_version[0x4];

	u8         create_qp_start_hint[0x18];



	u8         reserved_at_460[0x3];

	u8         log_max_uctx[0x5];