Commit f88c349c authored by Carolina Jubran's avatar Carolina Jubran Committed by Paolo Abeni
Browse files

net/mlx5: Preserve rate settings when creating a rate node 



Modify `esw_qos_create_node_sched_elem()` to receive max_rate and
bw_share values while maintaining the previous configuration.

This change is essential for the upcoming patch that will modify rate
nodes and requires the existing settings to be preserved unless
explicitly changed.

Signed-off-by: default avatarCarolina Jubran <cjubran@nvidia.com>
Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1741642016-44918-4-git-send-email-tariqt@nvidia.com


Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 498bd79c

drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c

+9 −4
Original line number Diff line number Diff line
@@ -320,8 +320,9 @@ static int esw_qos_set_node_min_rate(struct mlx5_esw_sched_node *node, 
	return 0;

}



static int esw_qos_create_node_sched_elem(struct mlx5_core_dev *dev, u32 parent_element_id,

					  u32 *tsar_ix)

static int

esw_qos_create_node_sched_elem(struct mlx5_core_dev *dev, u32 parent_element_id,

			       u32 max_rate, u32 bw_share, u32 *tsar_ix)

{

	u32 tsar_ctx[MLX5_ST_SZ_DW(scheduling_context)] = {};

	void *attr;
@@ -338,6 +339,8 @@ static int esw_qos_create_node_sched_elem(struct mlx5_core_dev *dev, u32 parent_ 
		 SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR);

	MLX5_SET(scheduling_context, tsar_ctx, parent_element_id,

		 parent_element_id);

	MLX5_SET(scheduling_context, tsar_ctx, max_average_bw, max_rate);

	MLX5_SET(scheduling_context, tsar_ctx, bw_share, bw_share);

	attr = MLX5_ADDR_OF(scheduling_context, tsar_ctx, element_attributes);

	MLX5_SET(tsar_element, attr, tsar_type, TSAR_ELEMENT_TSAR_TYPE_DWRR);
@@ -409,7 +412,8 @@ __esw_qos_create_vports_sched_node(struct mlx5_eswitch *esw, struct mlx5_esw_sch 
	u32 tsar_ix;

	int err;



	err = esw_qos_create_node_sched_elem(esw->dev, esw->qos.root_tsar_ix, &tsar_ix);

	err = esw_qos_create_node_sched_elem(esw->dev, esw->qos.root_tsar_ix, 0,

					     0, &tsar_ix);

	if (err) {

		NL_SET_ERR_MSG_MOD(extack, "E-Switch create TSAR for node failed");

		return ERR_PTR(err);
@@ -476,7 +480,8 @@ static int esw_qos_create(struct mlx5_eswitch *esw, struct netlink_ext_ack *exta 
	if (!MLX5_CAP_GEN(dev, qos) || !MLX5_CAP_QOS(dev, esw_scheduling))

		return -EOPNOTSUPP;



	err = esw_qos_create_node_sched_elem(esw->dev, 0, &esw->qos.root_tsar_ix);

	err = esw_qos_create_node_sched_elem(esw->dev, 0, 0, 0,

					     &esw->qos.root_tsar_ix);

	if (err) {

		esw_warn(dev, "E-Switch create root TSAR failed (%d)\n", err);

		return err;