From a0a21adb6a935c24111ae3a68ed406025753ce98 Mon Sep 17 00:00:00 2001 From: Eran Ben Elisha Date: Sun, 3 Mar 2019 10:57:29 +0200 Subject: devlink: Update reporter state to error even if recover aborted 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: c8e1da0bf923 ("devlink: Add health report functionality") Signed-off-by: Eran Ben Elisha Acked-by: Jiri Pirko Signed-off-by: David S. Miller --- net/core/devlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 6515fbec0dcd..376e01a70c6d 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -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, -- cgit v1.2.3-59-g8ed1b