Commit 0c4cf09e authored by Cosmin Ratiu's avatar Cosmin Ratiu Committed by Paolo Abeni
Browse files

net/mlx5: qos: Add an explicit 'dev' to vport trace calls 



vport qos trace calls used vport->dev implicitly as the device to which
the command was sent (and thus the device logged in traces).
But that will no longer be the case for cross-esw scheduling, where the
commands have to be sent to the group esw device instead.

This commit corrects that.

Signed-off-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b9cfe193

drivers/net/ethernet/mellanox/mlx5/core/esw/diag/qos_tracepoint.h

+13 −10
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include "eswitch.h"



TRACE_EVENT(mlx5_esw_vport_qos_destroy,

	    TP_PROTO(const struct mlx5_vport *vport),

	    TP_ARGS(vport),

	    TP_STRUCT__entry(__string(devname, dev_name(vport->dev->device))

	    TP_PROTO(const struct mlx5_core_dev *dev, const struct mlx5_vport *vport),

	    TP_ARGS(dev, vport),

	    TP_STRUCT__entry(__string(devname, dev_name(dev->device))

			     __field(unsigned short, vport_id)

			     __field(unsigned int,   sched_elem_ix)

			     ),
@@ -27,9 +27,10 @@ TRACE_EVENT(mlx5_esw_vport_qos_destroy, 
);



DECLARE_EVENT_CLASS(mlx5_esw_vport_qos_template,

		    TP_PROTO(const struct mlx5_vport *vport, u32 bw_share, u32 max_rate),

		    TP_ARGS(vport, bw_share, max_rate),

		    TP_STRUCT__entry(__string(devname, dev_name(vport->dev->device))

		    TP_PROTO(const struct mlx5_core_dev *dev, const struct mlx5_vport *vport,

			     u32 bw_share, u32 max_rate),

		    TP_ARGS(dev, vport, bw_share, max_rate),

		    TP_STRUCT__entry(__string(devname, dev_name(dev->device))

				     __field(unsigned short, vport_id)

				     __field(unsigned int, sched_elem_ix)

				     __field(unsigned int, bw_share)
@@ -50,13 +51,15 @@ DECLARE_EVENT_CLASS(mlx5_esw_vport_qos_template, 
);



DEFINE_EVENT(mlx5_esw_vport_qos_template, mlx5_esw_vport_qos_create,

	     TP_PROTO(const struct mlx5_vport *vport, u32 bw_share, u32 max_rate),

	     TP_ARGS(vport, bw_share, max_rate)

	     TP_PROTO(const struct mlx5_core_dev *dev, const struct mlx5_vport *vport,

		      u32 bw_share, u32 max_rate),

	     TP_ARGS(dev, vport, bw_share, max_rate)

	     );



DEFINE_EVENT(mlx5_esw_vport_qos_template, mlx5_esw_vport_qos_config,

	     TP_PROTO(const struct mlx5_vport *vport, u32 bw_share, u32 max_rate),

	     TP_ARGS(vport, bw_share, max_rate)

	     TP_PROTO(const struct mlx5_core_dev *dev, const struct mlx5_vport *vport,

		      u32 bw_share, u32 max_rate),

	     TP_ARGS(dev, vport, bw_share, max_rate)

	     );



DECLARE_EVENT_CLASS(mlx5_esw_group_qos_template,

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

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int esw_qos_vport_config(struct mlx5_vport *vport, 
		return err;

	}



	trace_mlx5_esw_vport_qos_config(vport, bw_share, max_rate);

	trace_mlx5_esw_vport_qos_config(dev, vport, bw_share, max_rate);



	return 0;

}
@@ -675,7 +675,7 @@ static int esw_qos_vport_enable(struct mlx5_vport *vport, 
		goto err_out;



	vport->qos.enabled = true;

	trace_mlx5_esw_vport_qos_create(vport, bw_share, max_rate);

	trace_mlx5_esw_vport_qos_create(vport->dev, vport, bw_share, max_rate);



	return 0;
@@ -707,7 +707,7 @@ void mlx5_esw_qos_vport_disable(struct mlx5_vport *vport) 
			 vport->vport, err);



	memset(&vport->qos, 0, sizeof(vport->qos));

	trace_mlx5_esw_vport_qos_destroy(vport);

	trace_mlx5_esw_vport_qos_destroy(dev, vport);



	esw_qos_put(esw);

}