devlink: implement flash update status monitoring

Kernel sends notifications about flash update status, so implement these
messages for monitoring.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/devlink/devlink.c b/devlink/devlink.c
index e4b494eb3e5d32dee6752ac749c56bca51d470bc..26520d34e749d8d140d131a4e86a54122eebba93 100644 (file)
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -443,6 +443,10 @@ static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = {
        [DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT] = MNL_TYPE_U64,
        [DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS] = MNL_TYPE_U64,
        [DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_FLASH_UPDATE_COMPONENT] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL] = MNL_TYPE_U64,
        [DEVLINK_ATTR_STATS] = MNL_TYPE_NESTED,
        [DEVLINK_ATTR_TRAP_NAME] = MNL_TYPE_STRING,
        [DEVLINK_ATTR_TRAP_ACTION] = MNL_TYPE_U8,
@@ -3903,6 +3907,9 @@ static const char *cmd_name(uint8_t cmd)
        case DEVLINK_CMD_REGION_SET: return "set";
        case DEVLINK_CMD_REGION_NEW: return "new";
        case DEVLINK_CMD_REGION_DEL: return "del";
+       case DEVLINK_CMD_FLASH_UPDATE: return "begin";
+       case DEVLINK_CMD_FLASH_UPDATE_END: return "end";
+       case DEVLINK_CMD_FLASH_UPDATE_STATUS: return "status";
        case DEVLINK_CMD_TRAP_GET: return "get";
        case DEVLINK_CMD_TRAP_SET: return "set";
        case DEVLINK_CMD_TRAP_NEW: return "new";
@@ -3939,6 +3946,10 @@ static const char *cmd_obj(uint8_t cmd)
        case DEVLINK_CMD_REGION_NEW:
        case DEVLINK_CMD_REGION_DEL:
                return "region";
+       case DEVLINK_CMD_FLASH_UPDATE:
+       case DEVLINK_CMD_FLASH_UPDATE_END:
+       case DEVLINK_CMD_FLASH_UPDATE_STATUS:
+               return "flash";
        case DEVLINK_CMD_TRAP_GET:
        case DEVLINK_CMD_TRAP_SET:
        case DEVLINK_CMD_TRAP_NEW:
@@ -3973,6 +3984,29 @@ static bool cmd_filter_check(struct dl *dl, uint8_t cmd)
        return false;
 }
 
+static void pr_out_flash_update(struct dl *dl, struct nlattr **tb)
+{
+       __pr_out_handle_start(dl, tb, true, false);
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG])
+               pr_out_str(dl, "msg",
+                          mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG]));
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT])
+               pr_out_str(dl, "component",
+                          mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT]));
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE])
+               pr_out_u64(dl, "done",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE]));
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL])
+               pr_out_u64(dl, "total",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL]));
+
+       pr_out_handle_end(dl);
+}
+
 static void pr_out_region(struct dl *dl, struct nlattr **tb);
 static void pr_out_trap(struct dl *dl, struct nlattr **tb, bool array);
 static void pr_out_trap_group(struct dl *dl, struct nlattr **tb, bool array);
@@ -4031,6 +4065,15 @@ static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
                pr_out_mon_header(genl->cmd);
                pr_out_region(dl, tb);
                break;
+       case DEVLINK_CMD_FLASH_UPDATE: /* fall through */
+       case DEVLINK_CMD_FLASH_UPDATE_END: /* fall through */
+       case DEVLINK_CMD_FLASH_UPDATE_STATUS:
+               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME])
+                       return MNL_CB_ERROR;
+               pr_out_mon_header(genl->cmd);
+               pr_out_flash_update(dl, tb);
+               break;
        case DEVLINK_CMD_TRAP_GET: /* fall through */
        case DEVLINK_CMD_TRAP_SET: /* fall through */
        case DEVLINK_CMD_TRAP_NEW: /* fall through */