[PATCH net-next RFC v4 04/15] devlink: Add reload actions stats to dev get

Moshe Shemesh
2020-09-14T06:10:52Z

Expose devlink reload actions stats to the user through devlink dev
get command.

Examples:
$ devlink dev show
pci/0000:82:00.0:
reload_action_stats:
driver_reinit 2
fw_activate 1
driver_reinit_no_reset 0
fw_activate_no_reset 0
pci/0000:82:00.1:
reload_action_stats:
driver_reinit 1
fw_activate 1
driver_reinit_no_reset 0
fw_activate_no_reset 0

$ devlink dev show -jp
{
"dev": {
"pci/0000:82:00.0": {
"reload_action_stats": [ {
"driver_reinit": 2
},{
"fw_activate": 1
},{
"driver_reinit_no_reset": 0
},{
"fw_activate_no_reset": 0
} ]
},
"pci/0000:82:00.1": {
"reload_action_stats": [ {
"driver_reinit": 1
},{
"fw_activate": 1
},{
"driver_reinit_no_reset": 0
},{
"fw_activate_no_reset": 0
} ]
}
}
}

Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
---
v3 -> v4:
- Renamed DEVLINK_ATTR_RELOAD_ACTION_CNT to
DEVLINK_ATTR_RELOAD_ACTION_STAT
- Add stats per action per limit level
v2 -> v3:
- Add reload actions counters instead of supported reload actions
(reload actions counters are only for supported action so no need for
both)
v1 -> v2:
- Removed DEVLINK_ATTR_RELOAD_DEFAULT_LEVEL
- Removed DEVLINK_ATTR_RELOAD_LEVELS_INFO
- Have actions instead of levels
---
include/uapi/linux/devlink.h | 3 +++
net/core/devlink.c | 45 ++++++++++++++++++++++++++++++++----
2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index b19686fd80ff..ac9be467d243 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -495,6 +495,9 @@ enum devlink_attr {
DEVLINK_ATTR_RELOAD_ACTION, /* u8 */
DEVLINK_ATTR_RELOAD_ACTIONS_PERFORMED, /* nested */
DEVLINK_ATTR_RELOAD_ACTION_LIMIT_LEVEL, /* u8 */
+ DEVLINK_ATTR_RELOAD_ACTION_STATS, /* nested */
+ DEVLINK_ATTR_RELOAD_ACTION_STAT, /* nested */
+ DEVLINK_ATTR_RELOAD_ACTION_STAT_VALUE, /* u32 */

/* add new attributes above here, update the policy in devlink.c */

diff --git a/net/core/devlink.c b/net/core/devlink.c
index cbf746966913..1063b7a4123a 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -462,6 +462,11 @@ static int devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)
return 0;
}

+static bool devlink_reload_supported(struct devlink *devlink)
+{
+ return devlink->ops->reload_down && devlink->ops->reload_up;
+}
+
static bool
devlink_reload_action_is_supported(struct devlink *devlink, enum devlink_reload_action action)
{
@@ -479,7 +484,9 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
enum devlink_command cmd, u32 portid,
u32 seq, int flags)
{
+ struct nlattr *reload_action_stats, *reload_action_stat;
+ int i, j, stat_idx;
void *hdr;

hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
if (!hdr)
@@ -490,9 +497,42 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_FAILED, devlink->reload_failed))
goto nla_put_failure;

+ if (!devlink_reload_supported(devlink))
+ goto out;
+
+ reload_action_stats = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_ACTION_STATS);
+ if (!reload_action_stats)
+ goto nla_put_failure;
+
+ for (j = 0; j <= DEVLINK_RELOAD_ACTION_LIMIT_LEVEL_MAX; j++) {
+ if (!devlink_reload_action_limit_level_is_supported(devlink, j))
+ continue;
+ for (i = 0; i <= DEVLINK_RELOAD_ACTION_MAX; i++) {
+ if (!devlink_reload_action_is_supported(devlink, i))
+ continue;
+ reload_action_stat = nla_nest_start(msg, DEVLINK_ATTR_RELOAD_ACTION_STAT);
+ if (!reload_action_stat)
+ goto reload_action_stats_nest_cancel;
+ if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_ACTION, i))
+ goto reload_action_stat_nest_cancel;
+ if (nla_put_u8(msg, DEVLINK_ATTR_RELOAD_ACTION_LIMIT_LEVEL, j))
+ goto reload_action_stat_nest_cancel;
+ stat_idx = j * __DEVLINK_RELOAD_ACTION_MAX + i;
+ if (nla_put_u32(msg, DEVLINK_ATTR_RELOAD_ACTION_STAT_VALUE,
+ devlink->reload_action_stats[stat_idx]))
+ goto reload_action_stat_nest_cancel;
+ nla_nest_end(msg, reload_action_stat);
+ }
+ nla_nest_end(msg, reload_action_stats);
+ }
+out:
genlmsg_end(msg, hdr);
return 0;

+reload_action_stat_nest_cancel:
+ nla_nest_cancel(msg, reload_action_stat);
+reload_action_stats_nest_cancel:
+ nla_nest_cancel(msg, reload_action_stats);
nla_put_failure:
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
@@ -2961,11 +3001,6 @@ static void devlink_reload_netns_change(struct devlink *devlink,
DEVLINK_CMD_PARAM_NEW);
}

-static bool devlink_reload_supported(const struct devlink *devlink)
-{
- return devlink->ops->reload_down && devlink->ops->reload_up;
-}
-
static void devlink_reload_failed_set(struct devlink *devlink,
bool reload_failed)
{
--
2.17.1