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

Commit 3167b27a authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

devlink: Add support for direct reporter health state update 



It is possible that a reporter state will be updated due to a recover flow
which is not triggered by a devlink health related operation, but as a side
effect of some other operation in the system.

Expose devlink health API for a direct update of a reporter status.

Move devlink_health_reporter_state enum definition to devlink.h so it could
be used from drivers as a parameter of devlink_health_reporter_state_update.

In addition, add trace_devlink_health_reporter_state_update to provide user
notification for reporter state change.

Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0a21adb

include/net/devlink.h

+14 −0
Original line number Original line Diff line number Diff line
@@ -447,6 +447,11 @@ typedef void devlink_snapshot_data_dest_t(const void *data); 
struct devlink_fmsg;

struct devlink_fmsg;

struct devlink_health_reporter;

struct devlink_health_reporter;





enum devlink_health_reporter_state {

	DEVLINK_HEALTH_REPORTER_STATE_HEALTHY,

	DEVLINK_HEALTH_REPORTER_STATE_ERROR,

};



/**

/**

 * struct devlink_health_reporter_ops - Reporter operations

 * struct devlink_health_reporter_ops - Reporter operations

 * @name: reporter name

 * @name: reporter name
@@ -715,6 +720,9 @@ void * 
devlink_health_reporter_priv(struct devlink_health_reporter *reporter);

devlink_health_reporter_priv(struct devlink_health_reporter *reporter);

int devlink_health_report(struct devlink_health_reporter *reporter,

int devlink_health_report(struct devlink_health_reporter *reporter,

			  const char *msg, void *priv_ctx);

			  const char *msg, void *priv_ctx);

void

devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,

				     enum devlink_health_reporter_state state);





void devlink_compat_running_version(struct net_device *dev,

void devlink_compat_running_version(struct net_device *dev,

				    char *buf, size_t len);

				    char *buf, size_t len);
@@ -1204,6 +1212,12 @@ devlink_health_report(struct devlink_health_reporter *reporter, 
	return 0;

	return 0;

}

}





static inline void

devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,

				     enum devlink_health_reporter_state state)

{

}



static inline void

static inline void

devlink_compat_running_version(struct net_device *dev, char *buf, size_t len)

devlink_compat_running_version(struct net_device *dev, char *buf, size_t len)

{

{

include/trace/events/devlink.h

+31 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,37 @@ TRACE_EVENT(devlink_health_recover_aborted, 
		  __entry->time_since_last_recover)

		  __entry->time_since_last_recover)

);

);





/*

 * Tracepoint for devlink health reporter state update:

 */

TRACE_EVENT(devlink_health_reporter_state_update,

	TP_PROTO(const struct devlink *devlink, const char *reporter_name,

		 bool new_state),



	TP_ARGS(devlink, reporter_name, new_state),



	TP_STRUCT__entry(

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

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

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

		__string(reporter_name, reporter_name)

		__field(u8, new_state)

	),



	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);

		__assign_str(reporter_name, reporter_name);

		__entry->new_state = new_state;

	),



	TP_printk("bus_name=%s dev_name=%s driver_name=%s reporter_name=%s: new_state=%d",

		  __get_str(bus_name), __get_str(dev_name),

		  __get_str(driver_name), __get_str(reporter_name),

		  __entry->new_state)

);



#endif /* _TRACE_DEVLINK_H */

#endif /* _TRACE_DEVLINK_H */





/* This part must be outside protection */

/* This part must be outside protection */

net/core/devlink.c

+17 −5
Original line number Original line Diff line number Diff line
@@ -4409,11 +4409,6 @@ struct devlink_health_reporter { 
	u64 last_recovery_ts;

	u64 last_recovery_ts;

};

};





enum devlink_health_reporter_state {

	DEVLINK_HEALTH_REPORTER_STATE_HEALTHY,

	DEVLINK_HEALTH_REPORTER_STATE_ERROR,

};



void *

void *

devlink_health_reporter_priv(struct devlink_health_reporter *reporter)

devlink_health_reporter_priv(struct devlink_health_reporter *reporter)

{

{
@@ -4498,6 +4493,23 @@ devlink_health_reporter_destroy(struct devlink_health_reporter *reporter) 
}

}

EXPORT_SYMBOL_GPL(devlink_health_reporter_destroy);

EXPORT_SYMBOL_GPL(devlink_health_reporter_destroy);





void

devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,

				     enum devlink_health_reporter_state state)

{

	if (WARN_ON(state != DEVLINK_HEALTH_REPORTER_STATE_HEALTHY &&

		    state != DEVLINK_HEALTH_REPORTER_STATE_ERROR))

		return;



	if (reporter->health_state == state)

		return;



	reporter->health_state = state;

	trace_devlink_health_reporter_state_update(reporter->devlink,

						   reporter->ops->name, state);

}

EXPORT_SYMBOL_GPL(devlink_health_reporter_state_update);



static int

static int

devlink_health_reporter_recover(struct devlink_health_reporter *reporter,

devlink_health_reporter_recover(struct devlink_health_reporter *reporter,

				void *priv_ctx)

				void *priv_ctx)