Merge branch 'devlink-next'
Eran Ben Elisha says: ==================== Devlink health fixes series This series includes two small fixes from Aya for the devlink health infrastructure introduced earlier in this window. First patch rename some UAPI attributes to better reflect their use. Second patch reduces the amount of data passed from the devlink to the netlink layer upon get reporter command, in case of no-recovery reporter. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>hifive-unleashed-5.1
commit
cceb58b113
|
@ -323,8 +323,8 @@ enum devlink_attr {
|
|||
DEVLINK_ATTR_HEALTH_REPORTER, /* nested */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_NAME, /* string */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_STATE, /* u8 */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_ERR, /* u64 */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_RECOVER, /* u64 */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT, /* u64 */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT, /* u64 */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS, /* u64 */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD, /* u64 */
|
||||
DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER, /* u8 */
|
||||
|
|
|
@ -4650,17 +4650,19 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg,
|
|||
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,
|
||||
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,
|
||||
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 &&
|
||||
|
|
Loading…
Reference in New Issue