Commit 6ec8b6cd authored by Moshe Shemesh's avatar Moshe Shemesh Committed by David S. Miller
Browse files

devlink: Add health recover notifications on devlink flows 



Devlink health recover notifications were added only on driver direct
updates of health_state through devlink_health_reporter_state_update().
Add notifications on updates of health_state by devlink flows of report
and recover.

Moved functions devlink_nl_health_reporter_fill() and
devlink_recover_notify() to avoid forward declaration.

Fixes: 97ff3bd3 ("devlink: add devink notification when reporter update health state")
Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53c67700

net/core/devlink.c

+89 −87
Original line number Diff line number Diff line
@@ -4843,6 +4843,93 @@ devlink_health_reporter_destroy(struct devlink_health_reporter *reporter) 
}

EXPORT_SYMBOL_GPL(devlink_health_reporter_destroy);



static int

devlink_nl_health_reporter_fill(struct sk_buff *msg,

				struct devlink *devlink,

				struct devlink_health_reporter *reporter,

				enum devlink_command cmd, u32 portid,

				u32 seq, int flags)

{

	struct nlattr *reporter_attr;

	void *hdr;



	hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);

	if (!hdr)

		return -EMSGSIZE;



	if (devlink_nl_put_handle(msg, devlink))

		goto genlmsg_cancel;



	reporter_attr = nla_nest_start_noflag(msg,

					      DEVLINK_ATTR_HEALTH_REPORTER);

	if (!reporter_attr)

		goto genlmsg_cancel;

	if (nla_put_string(msg, DEVLINK_ATTR_HEALTH_REPORTER_NAME,

			   reporter->ops->name))

		goto reporter_nest_cancel;

	if (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_STATE,

		       reporter->health_state))

		goto reporter_nest_cancel;

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,

			      reporter->error_count, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,

			      reporter->recovery_count, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (reporter->ops->recover &&

	    nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,

			      reporter->graceful_period,

			      DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (reporter->ops->recover &&

	    nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,

		       reporter->auto_recover))

		goto reporter_nest_cancel;

	if (reporter->dump_fmsg &&

	    nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,

			      jiffies_to_msecs(reporter->dump_ts),

			      DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (reporter->dump_fmsg &&

	    nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,

			      reporter->dump_real_ts, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;



	nla_nest_end(msg, reporter_attr);

	genlmsg_end(msg, hdr);

	return 0;



reporter_nest_cancel:

	nla_nest_end(msg, reporter_attr);

genlmsg_cancel:

	genlmsg_cancel(msg, hdr);

	return -EMSGSIZE;

}



static void devlink_recover_notify(struct devlink_health_reporter *reporter,

				   enum devlink_command cmd)

{

	struct sk_buff *msg;

	int err;



	WARN_ON(cmd != DEVLINK_CMD_HEALTH_REPORTER_RECOVER);



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)

		return;



	err = devlink_nl_health_reporter_fill(msg, reporter->devlink,

					      reporter, cmd, 0, 0, 0);

	if (err) {

		nlmsg_free(msg);

		return;

	}



	genlmsg_multicast_netns(&devlink_nl_family,

				devlink_net(reporter->devlink),

				msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);

}



void

devlink_health_reporter_recovery_done(struct devlink_health_reporter *reporter)

{
@@ -4869,6 +4956,7 @@ devlink_health_reporter_recover(struct devlink_health_reporter *reporter, 


	devlink_health_reporter_recovery_done(reporter);

	reporter->health_state = DEVLINK_HEALTH_REPORTER_STATE_HEALTHY;

	devlink_recover_notify(reporter, DEVLINK_CMD_HEALTH_REPORTER_RECOVER);



	return 0;

}
@@ -4935,6 +5023,7 @@ int devlink_health_report(struct devlink_health_reporter *reporter, 
	reporter->error_count++;

	prev_health_state = reporter->health_state;

	reporter->health_state = DEVLINK_HEALTH_REPORTER_STATE_ERROR;

	devlink_recover_notify(reporter, DEVLINK_CMD_HEALTH_REPORTER_RECOVER);



	/* abort if the previous error wasn't recovered */

	if (reporter->auto_recover &&
@@ -5017,93 +5106,6 @@ devlink_health_reporter_put(struct devlink_health_reporter *reporter) 
	refcount_dec(&reporter->refcount);

}



static int

devlink_nl_health_reporter_fill(struct sk_buff *msg,

				struct devlink *devlink,

				struct devlink_health_reporter *reporter,

				enum devlink_command cmd, u32 portid,

				u32 seq, int flags)

{

	struct nlattr *reporter_attr;

	void *hdr;



	hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);

	if (!hdr)

		return -EMSGSIZE;



	if (devlink_nl_put_handle(msg, devlink))

		goto genlmsg_cancel;



	reporter_attr = nla_nest_start_noflag(msg,

					      DEVLINK_ATTR_HEALTH_REPORTER);

	if (!reporter_attr)

		goto genlmsg_cancel;

	if (nla_put_string(msg, DEVLINK_ATTR_HEALTH_REPORTER_NAME,

			   reporter->ops->name))

		goto reporter_nest_cancel;

	if (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_STATE,

		       reporter->health_state))

		goto reporter_nest_cancel;

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT,

			      reporter->error_count, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,

			      reporter->recovery_count, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (reporter->ops->recover &&

	    nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,

			      reporter->graceful_period,

			      DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (reporter->ops->recover &&

	    nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,

		       reporter->auto_recover))

		goto reporter_nest_cancel;

	if (reporter->dump_fmsg &&

	    nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS,

			      jiffies_to_msecs(reporter->dump_ts),

			      DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;

	if (reporter->dump_fmsg &&

	    nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS,

			      reporter->dump_real_ts, DEVLINK_ATTR_PAD))

		goto reporter_nest_cancel;



	nla_nest_end(msg, reporter_attr);

	genlmsg_end(msg, hdr);

	return 0;



reporter_nest_cancel:

	nla_nest_end(msg, reporter_attr);

genlmsg_cancel:

	genlmsg_cancel(msg, hdr);

	return -EMSGSIZE;

}



static void devlink_recover_notify(struct devlink_health_reporter *reporter,

				   enum devlink_command cmd)

{

	struct sk_buff *msg;

	int err;



	WARN_ON(cmd != DEVLINK_CMD_HEALTH_REPORTER_RECOVER);



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)

		return;



	err = devlink_nl_health_reporter_fill(msg, reporter->devlink,

					      reporter, cmd, 0, 0, 0);

	if (err) {

		nlmsg_free(msg);

		return;

	}



	genlmsg_multicast_netns(&devlink_nl_family,

				devlink_net(reporter->devlink),

				msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);

}



void

devlink_health_reporter_state_update(struct devlink_health_reporter *reporter,

				     enum devlink_health_reporter_state state)

CRA Git | Maintained and supported by SUSTech CRA and CCSE