Commit 574b1e1f authored Feb 21, 2019 by Aya Levin Committed by David S. Miller Feb 21, 2019

devlink: Modify reply of DEVLINK_CMD_HEALTH_REPORTER_GET



Avoid sending attributes related to recovery:
DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD and
DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER in reply to
DEVLINK_CMD_HEALTH_REPORTER_GET for a reporter which didn't register a
recover operation.
These parameters can't be configured on a reporter that did not provide
a recover operation, thus not needed to return them.

Fixes: 7afe335a ("devlink: Add health get command")
Signed-off-by: Aya Levin <ayal@mellanox.com>
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>

parent 54719527

net/core/devlink.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -4656,11 +4656,13 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg,
		if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT,
		reporter->recovery_count, DEVLINK_ATTR_PAD))
		goto reporter_nest_cancel;
		if (nla_put_u64_64bit(msg, DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,
		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 (nla_put_u8(msg, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,
		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 &&

Admin message