]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
devlink: Change devlink health dump show command to dumpit
authorAya Levin <ayal@mellanox.com>
Wed, 10 Jul 2019 11:03:19 +0000 (14:03 +0300)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 15 Jul 2019 20:50:55 +0000 (13:50 -0700)
Although devlink health dump show command is given per reporter, it
returns large amounts of data. Trying to use the doit cb results in
OUT-OF-BUFFER error. This complementary patch raises the DUMP flag in
order to invoke the dumpit cb. We're safe as no existing drivers
implement the dump health reporter option yet.

Fixes: 041e6e651a8e ("devlink: Add devlink health dump show command")
Signed-off-by: Aya Levin <ayal@mellanox.com>
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
devlink/devlink.c

index d8197ea3a478d1f5b870696279619df6868ffa90..637cb5fc40de3ab8fe379e9f1db2db8c90fa75aa 100644 (file)
@@ -6105,13 +6105,13 @@ static int cmd_fmsg_object_cb(const struct nlmsghdr *nlh, void *data)
        return MNL_CB_OK;
 }
 
-static int cmd_health_object_common(struct dl *dl, uint8_t cmd)
+static int cmd_health_object_common(struct dl *dl, uint8_t cmd, uint16_t flags)
 {
        struct fmsg_cb_data data;
        struct nlmsghdr *nlh;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, cmd,  NLM_F_REQUEST | NLM_F_ACK);
+       nlh = mnlg_msg_prepare(dl->nlg, cmd, flags | NLM_F_REQUEST | NLM_F_ACK);
 
        err = dl_argv_parse_put(nlh, dl,
                                DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0);
@@ -6126,12 +6126,16 @@ static int cmd_health_object_common(struct dl *dl, uint8_t cmd)
 
 static int cmd_health_dump_show(struct dl *dl)
 {
-       return cmd_health_object_common(dl, DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET);
+       return cmd_health_object_common(dl,
+                                       DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
+                                       NLM_F_DUMP);
 }
 
 static int cmd_health_diagnose(struct dl *dl)
 {
-       return cmd_health_object_common(dl, DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE);
+       return cmd_health_object_common(dl,
+                                       DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
+                                       0);
 }
 
 static int cmd_health_recover(struct dl *dl)