Skip to content

Commit

Permalink
net/mlx5: qos: Drop 'esw' param from vport qos functions
Browse files Browse the repository at this point in the history 
The vport has a pointer to its own eswitch in vport->dev->priv.eswitch,
so passing the same eswitch as a parameter to the various functions
manipulating vport qos is superfluous at best and prone to errors at
worst.

More importantly, with the upcoming cross-esw scheduling changes, the
eswitch that should receive the various scheduling element commands is
NOT the same as the vport's eswitch, so the current code's assumptions
will break.

To avoid confusion and bugs, this commit drops the 'esw' parameter from
all vport qos functions and uses the vport's own eswitch pointer
instead.

Signed-off-by: Cosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: Carolina Jubran <cjubran@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Cosmin Ratiu authored and Paolo Abeni committed Oct 10, 2024
1 parent a87a561 commit e9fa32f
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 60 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, struct mlx
return err;
}

void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_eswitch *esw, struct mlx5_vport *vport)
void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_vport *vport)
{
struct mlx5_devlink_port *dl_port;

if (!vport->dl_port)
return;
dl_port = vport->dl_port;

mlx5_esw_qos_vport_update_group(esw, vport, NULL, NULL);
mlx5_esw_qos_vport_update_group(vport, NULL, NULL);
devl_rate_leaf_destroy(&dl_port->dl_port);

devl_port_unregister(&dl_port->dl_port);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/esw/legacy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, u16 vport,
return PTR_ERR(evport);

mutex_lock(&esw->state_lock);
err = mlx5_esw_qos_set_vport_rate(esw, evport, max_rate, min_rate);
err = mlx5_esw_qos_set_vport_rate(evport, max_rate, min_rate);
mutex_unlock(&esw->state_lock);
return err;
}
95 changes: 47 additions & 48 deletions drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,19 @@ static int esw_qos_group_config(struct mlx5_eswitch *esw, struct mlx5_esw_rate_g
return err;
}

static int esw_qos_vport_config(struct mlx5_eswitch *esw,
struct mlx5_vport *vport,
static int esw_qos_vport_config(struct mlx5_vport *vport,
u32 max_rate, u32 bw_share,
struct netlink_ext_ack *extack)
{
struct mlx5_core_dev *dev = esw->dev;
int err;

if (!vport->qos.enabled)
return -EIO;

err = esw_qos_sched_elem_config(dev, vport->qos.esw_sched_elem_ix, max_rate, bw_share);
err = esw_qos_sched_elem_config(vport->dev, vport->qos.esw_sched_elem_ix, max_rate,
bw_share);
if (err) {
esw_warn(esw->dev,
esw_warn(vport->dev,
"E-Switch modify vport scheduling element failed (vport=%d,err=%d)\n",
vport->vport, err);
NL_SET_ERR_MSG_MOD(extack, "E-Switch modify vport scheduling element failed");
Expand Down Expand Up @@ -169,7 +168,7 @@ static int esw_qos_normalize_group_min_rate(struct mlx5_eswitch *esw,
if (bw_share == vport->qos.bw_share)
continue;

err = esw_qos_vport_config(esw, vport, vport->qos.max_rate, bw_share, extack);
err = esw_qos_vport_config(vport, vport->qos.max_rate, bw_share, extack);
if (err)
return err;

Expand Down Expand Up @@ -213,16 +212,17 @@ static int esw_qos_normalize_min_rate(struct mlx5_eswitch *esw, struct netlink_e
return 0;
}

static int esw_qos_set_vport_min_rate(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
static int esw_qos_set_vport_min_rate(struct mlx5_vport *vport,
u32 min_rate, struct netlink_ext_ack *extack)
{
struct mlx5_eswitch *esw = vport->dev->priv.eswitch;
u32 fw_max_bw_share, previous_min_rate;
bool min_rate_supported;
int err;

lockdep_assert_held(&esw->state_lock);
fw_max_bw_share = MLX5_CAP_QOS(esw->dev, max_tsar_bw_share);
min_rate_supported = MLX5_CAP_QOS(esw->dev, esw_bw_share) &&
fw_max_bw_share = MLX5_CAP_QOS(vport->dev, max_tsar_bw_share);
min_rate_supported = MLX5_CAP_QOS(vport->dev, esw_bw_share) &&
fw_max_bw_share >= MLX5_MIN_BW_SHARE;
if (min_rate && !min_rate_supported)
return -EOPNOTSUPP;
Expand All @@ -238,15 +238,16 @@ static int esw_qos_set_vport_min_rate(struct mlx5_eswitch *esw, struct mlx5_vpor
return err;
}

static int esw_qos_set_vport_max_rate(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
static int esw_qos_set_vport_max_rate(struct mlx5_vport *vport,
u32 max_rate, struct netlink_ext_ack *extack)
{
struct mlx5_eswitch *esw = vport->dev->priv.eswitch;
u32 act_max_rate = max_rate;
bool max_rate_supported;
int err;

lockdep_assert_held(&esw->state_lock);
max_rate_supported = MLX5_CAP_QOS(esw->dev, esw_rate_limit);
max_rate_supported = MLX5_CAP_QOS(vport->dev, esw_rate_limit);

if (max_rate && !max_rate_supported)
return -EOPNOTSUPP;
Expand All @@ -257,7 +258,7 @@ static int esw_qos_set_vport_max_rate(struct mlx5_eswitch *esw, struct mlx5_vpor
if (!max_rate)
act_max_rate = vport->qos.group->max_rate;

err = esw_qos_vport_config(esw, vport, act_max_rate, vport->qos.bw_share, extack);
err = esw_qos_vport_config(vport, act_max_rate, vport->qos.bw_share, extack);

if (!err)
vport->qos.max_rate = max_rate;
Expand Down Expand Up @@ -315,7 +316,7 @@ static int esw_qos_set_group_max_rate(struct mlx5_eswitch *esw,
if (vport->qos.max_rate)
continue;

err = esw_qos_vport_config(esw, vport, max_rate, vport->qos.bw_share, extack);
err = esw_qos_vport_config(vport, max_rate, vport->qos.bw_share, extack);
if (err)
NL_SET_ERR_MSG_MOD(extack,
"E-Switch vport implicit rate limit setting failed");
Expand Down Expand Up @@ -343,13 +344,12 @@ static bool esw_qos_element_type_supported(struct mlx5_core_dev *dev, int type)
return false;
}

static int esw_qos_vport_create_sched_element(struct mlx5_eswitch *esw,
struct mlx5_vport *vport,
static int esw_qos_vport_create_sched_element(struct mlx5_vport *vport,
u32 max_rate, u32 bw_share)
{
u32 sched_ctx[MLX5_ST_SZ_DW(scheduling_context)] = {};
struct mlx5_esw_rate_group *group = vport->qos.group;
struct mlx5_core_dev *dev = esw->dev;
struct mlx5_core_dev *dev = vport->dev;
void *attr;
int err;

Expand All @@ -369,7 +369,7 @@ static int esw_qos_vport_create_sched_element(struct mlx5_eswitch *esw,
sched_ctx,
&vport->qos.esw_sched_elem_ix);
if (err) {
esw_warn(vport->dev,
esw_warn(dev,
"E-Switch create vport scheduling element failed (vport=%d,err=%d)\n",
vport->vport, err);
return err;
Expand All @@ -378,16 +378,15 @@ static int esw_qos_vport_create_sched_element(struct mlx5_eswitch *esw,
return 0;
}

static int esw_qos_update_group_scheduling_element(struct mlx5_eswitch *esw,
struct mlx5_vport *vport,
static int esw_qos_update_group_scheduling_element(struct mlx5_vport *vport,
struct mlx5_esw_rate_group *curr_group,
struct mlx5_esw_rate_group *new_group,
struct netlink_ext_ack *extack)
{
u32 max_rate;
int err;

err = mlx5_destroy_scheduling_element_cmd(esw->dev,
err = mlx5_destroy_scheduling_element_cmd(vport->dev,
SCHEDULING_HIERARCHY_E_SWITCH,
vport->qos.esw_sched_elem_ix);
if (err) {
Expand All @@ -398,7 +397,7 @@ static int esw_qos_update_group_scheduling_element(struct mlx5_eswitch *esw,
esw_qos_vport_set_group(vport, new_group);
/* Use new group max rate if vport max rate is unlimited. */
max_rate = vport->qos.max_rate ? vport->qos.max_rate : new_group->max_rate;
err = esw_qos_vport_create_sched_element(esw, vport, max_rate, vport->qos.bw_share);
err = esw_qos_vport_create_sched_element(vport, max_rate, vport->qos.bw_share);
if (err) {
NL_SET_ERR_MSG_MOD(extack, "E-Switch vport group set failed.");
goto err_sched;
Expand All @@ -409,18 +408,18 @@ static int esw_qos_update_group_scheduling_element(struct mlx5_eswitch *esw,
err_sched:
esw_qos_vport_set_group(vport, curr_group);
max_rate = vport->qos.max_rate ? vport->qos.max_rate : curr_group->max_rate;
if (esw_qos_vport_create_sched_element(esw, vport, max_rate, vport->qos.bw_share))
esw_warn(esw->dev, "E-Switch vport group restore failed (vport=%d)\n",
if (esw_qos_vport_create_sched_element(vport, max_rate, vport->qos.bw_share))
esw_warn(vport->dev, "E-Switch vport group restore failed (vport=%d)\n",
vport->vport);

return err;
}

static int esw_qos_vport_update_group(struct mlx5_eswitch *esw,
struct mlx5_vport *vport,
static int esw_qos_vport_update_group(struct mlx5_vport *vport,
struct mlx5_esw_rate_group *group,
struct netlink_ext_ack *extack)
{
struct mlx5_eswitch *esw = vport->dev->priv.eswitch;
struct mlx5_esw_rate_group *new_group, *curr_group;
int err;

Expand All @@ -432,7 +431,7 @@ static int esw_qos_vport_update_group(struct mlx5_eswitch *esw,
if (curr_group == new_group)
return 0;

err = esw_qos_update_group_scheduling_element(esw, vport, curr_group, new_group, extack);
err = esw_qos_update_group_scheduling_element(vport, curr_group, new_group, extack);
if (err)
return err;

Expand Down Expand Up @@ -669,9 +668,10 @@ static void esw_qos_put(struct mlx5_eswitch *esw)
esw_qos_destroy(esw);
}

static int esw_qos_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
static int esw_qos_vport_enable(struct mlx5_vport *vport,
u32 max_rate, u32 bw_share, struct netlink_ext_ack *extack)
{
struct mlx5_eswitch *esw = vport->dev->priv.eswitch;
int err;

lockdep_assert_held(&esw->state_lock);
Expand All @@ -685,7 +685,7 @@ static int esw_qos_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vpo
INIT_LIST_HEAD(&vport->qos.group_entry);
esw_qos_vport_set_group(vport, esw->qos.group0);

err = esw_qos_vport_create_sched_element(esw, vport, max_rate, bw_share);
err = esw_qos_vport_create_sched_element(vport, max_rate, bw_share);
if (err)
goto err_out;

Expand All @@ -700,8 +700,9 @@ static int esw_qos_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vpo
return err;
}

void mlx5_esw_qos_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vport)
void mlx5_esw_qos_vport_disable(struct mlx5_vport *vport)
{
struct mlx5_eswitch *esw = vport->dev->priv.eswitch;
int err;

lockdep_assert_held(&esw->state_lock);
Expand All @@ -723,20 +724,19 @@ void mlx5_esw_qos_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vpo
esw_qos_put(esw);
}

int mlx5_esw_qos_set_vport_rate(struct mlx5_eswitch *esw, struct mlx5_vport *vport,
u32 max_rate, u32 min_rate)
int mlx5_esw_qos_set_vport_rate(struct mlx5_vport *vport, u32 max_rate, u32 min_rate)
{
struct mlx5_eswitch *esw = vport->dev->priv.eswitch;
int err;

lockdep_assert_held(&esw->state_lock);
err = esw_qos_vport_enable(esw, vport, 0, 0, NULL);
err = esw_qos_vport_enable(vport, 0, 0, NULL);
if (err)
return err;

err = esw_qos_set_vport_min_rate(esw, vport, min_rate, NULL);
err = esw_qos_set_vport_min_rate(vport, min_rate, NULL);
if (!err)
err = esw_qos_set_vport_max_rate(esw, vport, max_rate, NULL);

err = esw_qos_set_vport_max_rate(vport, max_rate, NULL);
return err;
}

Expand Down Expand Up @@ -830,12 +830,12 @@ int mlx5_esw_qos_modify_vport_rate(struct mlx5_eswitch *esw, u16 vport_num, u32
mutex_lock(&esw->state_lock);
if (!vport->qos.enabled) {
/* Eswitch QoS wasn't enabled yet. Enable it and vport QoS. */
err = esw_qos_vport_enable(esw, vport, rate_mbps, vport->qos.bw_share, NULL);
err = esw_qos_vport_enable(vport, rate_mbps, vport->qos.bw_share, NULL);
} else {
MLX5_SET(scheduling_context, ctx, max_average_bw, rate_mbps);

bitmask = MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW;
err = mlx5_modify_scheduling_element_cmd(esw->dev,
err = mlx5_modify_scheduling_element_cmd(vport->dev,
SCHEDULING_HIERARCHY_E_SWITCH,
ctx,
vport->qos.esw_sched_elem_ix,
Expand Down Expand Up @@ -897,11 +897,11 @@ int mlx5_esw_devlink_rate_leaf_tx_share_set(struct devlink_rate *rate_leaf, void
return err;

mutex_lock(&esw->state_lock);
err = esw_qos_vport_enable(esw, vport, 0, 0, extack);
err = esw_qos_vport_enable(vport, 0, 0, extack);
if (err)
goto unlock;

err = esw_qos_set_vport_min_rate(esw, vport, tx_share, extack);
err = esw_qos_set_vport_min_rate(vport, tx_share, extack);
unlock:
mutex_unlock(&esw->state_lock);
return err;
Expand All @@ -923,11 +923,11 @@ int mlx5_esw_devlink_rate_leaf_tx_max_set(struct devlink_rate *rate_leaf, void *
return err;

mutex_lock(&esw->state_lock);
err = esw_qos_vport_enable(esw, vport, 0, 0, extack);
err = esw_qos_vport_enable(vport, 0, 0, extack);
if (err)
goto unlock;

err = esw_qos_set_vport_max_rate(esw, vport, tx_max, extack);
err = esw_qos_set_vport_max_rate(vport, tx_max, extack);
unlock:
mutex_unlock(&esw->state_lock);
return err;
Expand Down Expand Up @@ -1017,20 +1017,20 @@ int mlx5_esw_devlink_rate_node_del(struct devlink_rate *rate_node, void *priv,
return err;
}

int mlx5_esw_qos_vport_update_group(struct mlx5_eswitch *esw,
struct mlx5_vport *vport,
int mlx5_esw_qos_vport_update_group(struct mlx5_vport *vport,
struct mlx5_esw_rate_group *group,
struct netlink_ext_ack *extack)
{
struct mlx5_eswitch *esw = vport->dev->priv.eswitch;
int err = 0;

mutex_lock(&esw->state_lock);
if (!vport->qos.enabled && !group)
goto unlock;

err = esw_qos_vport_enable(esw, vport, 0, 0, extack);
err = esw_qos_vport_enable(vport, 0, 0, extack);
if (!err)
err = esw_qos_vport_update_group(esw, vport, group, extack);
err = esw_qos_vport_update_group(vport, group, extack);
unlock:
mutex_unlock(&esw->state_lock);
return err;
Expand All @@ -1045,9 +1045,8 @@ int mlx5_esw_devlink_rate_parent_set(struct devlink_rate *devlink_rate,
struct mlx5_vport *vport = priv;

if (!parent)
return mlx5_esw_qos_vport_update_group(vport->dev->priv.eswitch,
vport, NULL, extack);
return mlx5_esw_qos_vport_update_group(vport, NULL, extack);

group = parent_priv;
return mlx5_esw_qos_vport_update_group(vport->dev->priv.eswitch, vport, group, extack);
return mlx5_esw_qos_vport_update_group(vport, group, extack);
}
5 changes: 2 additions & 3 deletions drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@

#ifdef CONFIG_MLX5_ESWITCH

int mlx5_esw_qos_set_vport_rate(struct mlx5_eswitch *esw, struct mlx5_vport *evport,
u32 max_rate, u32 min_rate);
void mlx5_esw_qos_vport_disable(struct mlx5_eswitch *esw, struct mlx5_vport *vport);
int mlx5_esw_qos_set_vport_rate(struct mlx5_vport *evport, u32 max_rate, u32 min_rate);
void mlx5_esw_qos_vport_disable(struct mlx5_vport *vport);

int mlx5_esw_devlink_rate_leaf_tx_share_set(struct devlink_rate *rate_leaf, void *priv,
u64 tx_share, struct netlink_ext_ack *extack);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,7 @@ static void esw_vport_cleanup(struct mlx5_eswitch *esw, struct mlx5_vport *vport
vport_num, 1,
MLX5_VPORT_ADMIN_STATE_DOWN);

mlx5_esw_qos_vport_disable(esw, vport);
mlx5_esw_qos_vport_disable(vport);
esw_vport_cleanup_acl(esw, vport);
}

Expand Down
5 changes: 2 additions & 3 deletions drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,7 @@ int mlx5_eswitch_set_vport_trust(struct mlx5_eswitch *esw,
u16 vport_num, bool setting);
int mlx5_eswitch_set_vport_rate(struct mlx5_eswitch *esw, u16 vport,
u32 max_rate, u32 min_rate);
int mlx5_esw_qos_vport_update_group(struct mlx5_eswitch *esw,
struct mlx5_vport *vport,
int mlx5_esw_qos_vport_update_group(struct mlx5_vport *vport,
struct mlx5_esw_rate_group *group,
struct netlink_ext_ack *extack);
int mlx5_eswitch_set_vepa(struct mlx5_eswitch *esw, u8 setting);
Expand Down Expand Up @@ -812,7 +811,7 @@ int mlx5_esw_offloads_sf_devlink_port_init(struct mlx5_eswitch *esw, struct mlx5
void mlx5_esw_offloads_sf_devlink_port_cleanup(struct mlx5_eswitch *esw, struct mlx5_vport *vport);

int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, struct mlx5_vport *vport);
void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_eswitch *esw, struct mlx5_vport *vport);
void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_vport *vport);
struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u16 vport_num);

int mlx5_esw_sf_max_hpf_functions(struct mlx5_core_dev *dev, u16 *max_sfs, u16 *sf_base_id);
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2617,7 +2617,7 @@ int mlx5_esw_offloads_load_rep(struct mlx5_eswitch *esw, struct mlx5_vport *vpor
return err;

load_err:
mlx5_esw_offloads_devlink_port_unregister(esw, vport);
mlx5_esw_offloads_devlink_port_unregister(vport);
return err;
}

Expand All @@ -2628,7 +2628,7 @@ void mlx5_esw_offloads_unload_rep(struct mlx5_eswitch *esw, struct mlx5_vport *v

mlx5_esw_offloads_rep_unload(esw, vport->vport);

mlx5_esw_offloads_devlink_port_unregister(esw, vport);
mlx5_esw_offloads_devlink_port_unregister(vport);
}

static int esw_set_slave_root_fdb(struct mlx5_core_dev *master,
Expand Down

0 comments on commit e9fa32f

Please sign in to comment.