Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c53f59d4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-core-Trace-EMAD-errors' 



Ido Schimmel says:

====================
mlxsw: core: Trace EMAD errors

Nir says:

This patchset adds a trace for EMAD errors to the existing EMAD payload
traces. This tracepoint is useful to track user or firmware errors during
tests execution.

Patch #1 defines the devlink tracepoint.
Patch #2 uses it for reporting mlxsw EMAD errors.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8ce5cd5e d32d02a5

drivers/net/ethernet/mellanox/mlxsw/core.c

+5 −1
Original line number Diff line number Diff line
@@ -1460,13 +1460,17 @@ static int mlxsw_reg_trans_wait(struct mlxsw_reg_trans *trans) 
	if (trans->retries)

		dev_warn(mlxsw_core->bus_info->dev, "EMAD retries (%d/%d) (tid=%llx)\n",

			 trans->retries, MLXSW_EMAD_MAX_RETRY, trans->tid);

	if (err)

	if (err) {

		dev_err(mlxsw_core->bus_info->dev, "EMAD reg access failed (tid=%llx,reg_id=%x(%s),type=%s,status=%x(%s))\n",

			trans->tid, trans->reg->id,

			mlxsw_reg_id_str(trans->reg->id),

			mlxsw_core_reg_access_type_str(trans->type),

			trans->emad_status,

			mlxsw_emad_op_tlv_status_str(trans->emad_status));

		trace_devlink_hwerr(priv_to_devlink(mlxsw_core),

				    trans->emad_status,

				    mlxsw_emad_op_tlv_status_str(trans->emad_status));

	}



	list_del(&trans->bulk_list);

	kfree_rcu(trans, rcu);

include/trace/events/devlink.h

+33 −0
Original line number Diff line number Diff line
@@ -46,6 +46,35 @@ TRACE_EVENT(devlink_hwmsg, 
		  (int) __entry->len, __get_dynamic_array(buf), __entry->len)

);



/*

 * Tracepoint for devlink hardware error:

 */

TRACE_EVENT(devlink_hwerr,

	TP_PROTO(const struct devlink *devlink, int err, const char *msg),



	TP_ARGS(devlink, err, msg),



	TP_STRUCT__entry(

		__string(bus_name, devlink->dev->bus->name)

		__string(dev_name, dev_name(devlink->dev))

		__string(driver_name, devlink->dev->driver->name)

		__field(int, err)

		__string(msg, msg)

		),



	TP_fast_assign(

		__assign_str(bus_name, devlink->dev->bus->name);

		__assign_str(dev_name, dev_name(devlink->dev));

		__assign_str(driver_name, devlink->dev->driver->name);

		__entry->err = err;

		__assign_str(msg, msg);

		),



	TP_printk("bus_name=%s dev_name=%s driver_name=%s err=%d %s",

			__get_str(bus_name), __get_str(dev_name),

			__get_str(driver_name), __entry->err, __get_str(msg))

);



#endif /* _TRACE_DEVLINK_H */



/* This part must be outside protection */
@@ -64,6 +93,10 @@ static inline void trace_devlink_hwmsg(const struct devlink *devlink, 
{

}



static inline void trace_devlink_hwerr(const struct devlink *devlink,

				       int err, const char *msg)

{

}

#endif /* _TRACE_DEVLINK_H */



#endif

net/core/devlink.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct devlink_dpipe_header devlink_dpipe_header_ipv6 = { 
EXPORT_SYMBOL(devlink_dpipe_header_ipv6);



EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwmsg);

EXPORT_TRACEPOINT_SYMBOL_GPL(devlink_hwerr);



static LIST_HEAD(devlink_list);