devlink: Update reporter state to error even if recover aborted (a0a21adb) · Commits · 戴 / test

If devlink_health_report() aborted the recover flow due to grace period checker, it left the reporter status as DEVLINK_HEALTH_REPORTER_STATE_HEALTHY, which is a bug. Fix that by always setting the reporter state to DEVLINK_HEALTH_REPORTER_STATE_ERROR prior to running the checker mentioned above. In addition, save the previous health_state in a temporary variable, then use it in the abort check comparison instead of using reporter->health_state which might be already changed. Fixes: ("devlink: Add health report functionality") Signed-off-by:

Eran Ben Elisha <eranbe@mellanox.com> Acked-by:

Jiri Pirko <jiri@mellanox.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/devlink.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -4569,16 +4569,19 @@ dump_err:
		int devlink_health_report(struct devlink_health_reporter *reporter,
		const char msg, void priv_ctx)
		{
		enum devlink_health_reporter_state prev_health_state;
		struct devlink *devlink = reporter->devlink;

		/* write a log message of the current error */
		WARN_ON(!msg);
		trace_devlink_health_report(devlink, reporter->ops->name, msg);
		reporter->error_count++;
		prev_health_state = reporter->health_state;
		reporter->health_state = DEVLINK_HEALTH_REPORTER_STATE_ERROR;

		/* abort if the previous error wasn't recovered */
		if (reporter->auto_recover &&
		(reporter->health_state != DEVLINK_HEALTH_REPORTER_STATE_HEALTHY \|\|
		(prev_health_state != DEVLINK_HEALTH_REPORTER_STATE_HEALTHY \|\|
		jiffies - reporter->last_recovery_ts <
		msecs_to_jiffies(reporter->graceful_period))) {
		trace_devlink_health_recover_aborted(devlink,

Admin message