Commit 20d80b95 authored by Daniel Jurgens's avatar Daniel Jurgens Committed by Jakub Kicinski

net/mlx5: Set default max eqs for SFs

If the user hasn't configured max_io_eqs set a low default. The SF
driver shouldn't try to create more than this, but FW will enforce this
limit.
Signed-off-by: default avatarDaniel Jurgens <danielj@nvidia.com>
Reviewed-by: default avatarWilliam Tu <witu@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Link: https://patch.msgid.link/20240712003310.355106-4-saeed@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2ece6c72
...@@ -223,6 +223,7 @@ struct mlx5_vport { ...@@ -223,6 +223,7 @@ struct mlx5_vport {
u16 vport; u16 vport;
bool enabled; bool enabled;
bool max_eqs_set;
enum mlx5_eswitch_vport_event enabled_events; enum mlx5_eswitch_vport_event enabled_events;
int index; int index;
struct mlx5_devlink_port *dl_port; struct mlx5_devlink_port *dl_port;
...@@ -579,6 +580,8 @@ int mlx5_devlink_port_fn_max_io_eqs_get(struct devlink_port *port, ...@@ -579,6 +580,8 @@ int mlx5_devlink_port_fn_max_io_eqs_get(struct devlink_port *port,
int mlx5_devlink_port_fn_max_io_eqs_set(struct devlink_port *port, int mlx5_devlink_port_fn_max_io_eqs_set(struct devlink_port *port,
u32 max_io_eqs, u32 max_io_eqs,
struct netlink_ext_ack *extack); struct netlink_ext_ack *extack);
int mlx5_devlink_port_fn_max_io_eqs_set_sf_default(struct devlink_port *port,
struct netlink_ext_ack *extack);
void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type); void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type);
......
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#define MLX5_ESW_FT_OFFLOADS_DROP_RULE (1) #define MLX5_ESW_FT_OFFLOADS_DROP_RULE (1)
#define MLX5_ESW_MAX_CTRL_EQS 4 #define MLX5_ESW_MAX_CTRL_EQS 4
#define MLX5_ESW_DEFAULT_SF_COMP_EQS 8
static struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_mirror_ns = { static struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_mirror_ns = {
.max_fte = MLX5_ESW_VPORT_TBL_SIZE, .max_fte = MLX5_ESW_VPORT_TBL_SIZE,
...@@ -4683,9 +4684,18 @@ mlx5_devlink_port_fn_max_io_eqs_set(struct devlink_port *port, u32 max_io_eqs, ...@@ -4683,9 +4684,18 @@ mlx5_devlink_port_fn_max_io_eqs_set(struct devlink_port *port, u32 max_io_eqs,
MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE2); MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE2);
if (err) if (err)
NL_SET_ERR_MSG_MOD(extack, "Failed setting HCA caps"); NL_SET_ERR_MSG_MOD(extack, "Failed setting HCA caps");
vport->max_eqs_set = true;
out: out:
mutex_unlock(&esw->state_lock); mutex_unlock(&esw->state_lock);
kfree(query_ctx); kfree(query_ctx);
return err; return err;
} }
int
mlx5_devlink_port_fn_max_io_eqs_set_sf_default(struct devlink_port *port,
struct netlink_ext_ack *extack)
{
return mlx5_devlink_port_fn_max_io_eqs_set(port,
MLX5_ESW_DEFAULT_SF_COMP_EQS,
extack);
}
...@@ -161,6 +161,7 @@ int mlx5_devlink_sf_port_fn_state_get(struct devlink_port *dl_port, ...@@ -161,6 +161,7 @@ int mlx5_devlink_sf_port_fn_state_get(struct devlink_port *dl_port,
static int mlx5_sf_activate(struct mlx5_core_dev *dev, struct mlx5_sf *sf, static int mlx5_sf_activate(struct mlx5_core_dev *dev, struct mlx5_sf *sf,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct mlx5_vport *vport;
int err; int err;
if (mlx5_sf_is_active(sf)) if (mlx5_sf_is_active(sf))
...@@ -170,6 +171,13 @@ static int mlx5_sf_activate(struct mlx5_core_dev *dev, struct mlx5_sf *sf, ...@@ -170,6 +171,13 @@ static int mlx5_sf_activate(struct mlx5_core_dev *dev, struct mlx5_sf *sf,
return -EBUSY; return -EBUSY;
} }
vport = mlx5_devlink_port_vport_get(&sf->dl_port.dl_port);
if (!vport->max_eqs_set && MLX5_CAP_GEN_2(dev, max_num_eqs_24b)) {
err = mlx5_devlink_port_fn_max_io_eqs_set_sf_default(&sf->dl_port.dl_port,
extack);
if (err)
return err;
}
err = mlx5_cmd_sf_enable_hca(dev, sf->hw_fn_id); err = mlx5_cmd_sf_enable_hca(dev, sf->hw_fn_id);
if (err) if (err)
return err; return err;
...@@ -318,7 +326,11 @@ int mlx5_devlink_sf_port_new(struct devlink *devlink, ...@@ -318,7 +326,11 @@ int mlx5_devlink_sf_port_new(struct devlink *devlink,
static void mlx5_sf_dealloc(struct mlx5_sf_table *table, struct mlx5_sf *sf) static void mlx5_sf_dealloc(struct mlx5_sf_table *table, struct mlx5_sf *sf)
{ {
struct mlx5_vport *vport;
mutex_lock(&table->sf_state_lock); mutex_lock(&table->sf_state_lock);
vport = mlx5_devlink_port_vport_get(&sf->dl_port.dl_port);
vport->max_eqs_set = false;
mlx5_sf_function_id_erase(table, sf); mlx5_sf_function_id_erase(table, sf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment