@@ -93,6 +93,8 @@ enum devlink_command {
DEVLINK_CMD_HEALTH_REPORTER_SET,
DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
+ DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_GET,
+ DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_CLEAR,
/* add new commands above here */
__DEVLINK_CMD_MAX,
@@ -4528,6 +4528,65 @@ static int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb,
return err;
}
+static void
+devlink_health_objdump_clear(struct devlink_health_reporter *reporter)
+{
+ reporter->objdump_avail = false;
+ reporter->objdump_ts = 0;
+ devlink_health_buffers_reset(reporter->objdump_buffers_array,
+ DEVLINK_HEALTH_SIZE_TO_BUFFERS(reporter->ops->objdump_size));
+}
+
+static int devlink_nl_cmd_health_reporter_objdump_get_doit(struct sk_buff *skb,
+ struct genl_info *info)
+{
+ struct devlink *devlink = info->user_ptr[0];
+ struct devlink_health_reporter *reporter;
+ u64 num_of_buffers;
+ int err;
+
+ reporter = devlink_health_reporter_get_from_info(devlink, info);
+ if (!reporter)
+ return -EINVAL;
+
+ if (!reporter->ops->objdump)
+ return -EOPNOTSUPP;
+
+ num_of_buffers =
+ DEVLINK_HEALTH_SIZE_TO_BUFFERS(reporter->ops->objdump_size);
+
+ mutex_lock(&reporter->objdump_lock);
+ err = devlink_health_do_objdump(reporter, NULL);
+ if (err)
+ goto out;
+
+ err = devlink_health_buffer_snd(info,
+ DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_GET,
+ 0, reporter->objdump_buffers_array,
+ num_of_buffers);
+
+out:
+ mutex_unlock(&reporter->objdump_lock);
+ return err;
+}
+
+static int
+devlink_nl_cmd_health_reporter_objdump_clear_doit(struct sk_buff *skb,
+ struct genl_info *info)
+{
+ struct devlink *devlink = info->user_ptr[0];
+ struct devlink_health_reporter *reporter;
+
+ reporter = devlink_health_reporter_get_from_info(devlink, info);
+ if (!reporter)
+ return -EINVAL;
+
+ mutex_lock(&reporter->objdump_lock);
+ devlink_health_objdump_clear(reporter);
+ mutex_unlock(&reporter->objdump_lock);
+ return 0;
+}
+
static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING },
[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING },
@@ -4805,6 +4864,20 @@ static const struct genl_ops devlink_nl_ops[] = {
.flags = GENL_ADMIN_PERM,
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
},
+ {
+ .cmd = DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_GET,
+ .doit = devlink_nl_cmd_health_reporter_objdump_get_doit,
+ .policy = devlink_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
+ },
+ {
+ .cmd = DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_CLEAR,
+ .doit = devlink_nl_cmd_health_reporter_objdump_clear_doit,
+ .policy = devlink_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
+ },
};
static struct genl_family devlink_nl_family __ro_after_init = {
Add devlink health objdump commands, in order to run an objdump operation over a specific reporter. The supported operations are objdump_get in order to get last saved objdump (if not exist, dump now) and objdump_clear to clear last saved objdump. It is expected from driver's callback for diagnose command to fill it via the buffer descriptors API. Devlink will parse it and convert isto netlink nla API in order to pass it to the user. Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com> --- include/uapi/linux/devlink.h | 2 + net/core/devlink.c | 73 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+)