[patch iproute2-next 2/2] devlink: extend reload command to add support for network namespace change

[Jiri Pirko]

From: Jiri Pirko <j...@mellanox.com>

Signed-off-by: Jiri Pirko <j...@mellanox.com>
---
v3->v4:
- rebased on top of trap patches
- moved netns change to reload command instead of set
---
 devlink/devlink.c            | 31 +++++++++++++++++++++++++++----
 include/uapi/linux/devlink.h |  4 ++++
 man/man8/devlink-dev.8       | 12 ++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/devlink/devlink.c b/devlink/devlink.c
index 8020d76dd7f7..6a28a7aa58a4 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -237,6 +237,7 @@ static void ifname_map_free(struct ifname_map *ifname_map)
 #define DL_OPT_TRAP_NAME               BIT(29)
 #define DL_OPT_TRAP_ACTION             BIT(30)
 #define DL_OPT_TRAP_GROUP_NAME         BIT(31)
+#define DL_OPT_NETNS   BIT(32)
 
 struct dl_opts {
        uint64_t present; /* flags of present items */
@@ -276,6 +277,8 @@ struct dl_opts {
        const char *trap_name;
        const char *trap_group_name;
        enum devlink_trap_action trap_action;
+       bool netns_is_pid;
+       uint32_t netns;
 };
 
 struct dl {
@@ -1412,6 +1415,22 @@ static int dl_argv_parse(struct dl *dl, uint64_t 
o_required,
                        if (err)
                                return err;
                        o_found |= DL_OPT_TRAP_ACTION;
+               } else if (dl_argv_match(dl, "netns") &&
+                       (o_all & DL_OPT_NETNS)) {
+                       const char *netns_str;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &netns_str);
+                       if (err)
+                               return err;
+                       opts->netns = netns_get_fd(netns_str);
+                       if (opts->netns < 0) {
+                               err = dl_argv_uint32_t(dl, &opts->netns);
+                               if (err)
+                                       return err;
+                               opts->netns_is_pid = true;
+                       }
+                       o_found |= DL_OPT_NETNS;
                } else {
                        pr_err("Unknown option \"%s\"\n", dl_argv(dl));
                        return -EINVAL;
@@ -1534,7 +1553,11 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl 
*dl)
        if (opts->present & DL_OPT_TRAP_ACTION)
                mnl_attr_put_u8(nlh, DEVLINK_ATTR_TRAP_ACTION,
                                opts->trap_action);
-
+       if (opts->present & DL_OPT_NETNS)
+               mnl_attr_put_u32(nlh,
+                                opts->netns_is_pid ? DEVLINK_ATTR_NETNS_PID :
+                                                     DEVLINK_ATTR_NETNS_FD,
+                                opts->netns);
 }
 
 static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
@@ -1595,7 +1618,7 @@ static void cmd_dev_help(void)
        pr_err("       devlink dev eswitch show DEV\n");
        pr_err("       devlink dev param set DEV name PARAMETER value VALUE 
cmode { permanent | driverinit | runtime }\n");
        pr_err("       devlink dev param show [DEV name PARAMETER]\n");
-       pr_err("       devlink dev reload DEV\n");
+       pr_err("       devlink dev reload DEV [ netns { PID | NAME | ID } ]\n");
        pr_err("       devlink dev info [ DEV ]\n");
        pr_err("       devlink dev flash DEV file PATH [ component NAME ]\n");
 }
@@ -2671,7 +2694,7 @@ static int cmd_dev_show(struct dl *dl)
 
 static void cmd_dev_reload_help(void)
 {
-       pr_err("Usage: devlink dev reload [ DEV ]\n");
+       pr_err("Usage: devlink dev reload DEV [ netns { PID | NAME | ID } ]\n");
 }
 
 static int cmd_dev_reload(struct dl *dl)
@@ -2687,7 +2710,7 @@ static int cmd_dev_reload(struct dl *dl)
        nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_RELOAD,
                               NLM_F_REQUEST | NLM_F_ACK);
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, DL_OPT_NETNS);
        if (err)
                return err;
 
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index d63cf9723f57..f2608cfc9706 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -412,6 +412,10 @@ enum devlink_attr {
 
        DEVLINK_ATTR_RELOAD_FAILED,                     /* u8 0 or 1 */
 
+       DEVLINK_ATTR_NETNS_FD,                  /* u32 */
+       DEVLINK_ATTR_NETNS_PID,                 /* u32 */
+       DEVLINK_ATTR_NETNS_ID,                  /* u32 */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,
diff --git a/man/man8/devlink-dev.8 b/man/man8/devlink-dev.8
index 1804463b2321..0e1a5523fa7b 100644
--- a/man/man8/devlink-dev.8
+++ b/man/man8/devlink-dev.8
@@ -25,6 +25,13 @@ devlink-dev \- devlink device configuration
 .ti -8
 .B devlink dev help
 
+.ti -8
+.BR "devlink dev set"
+.IR DEV
+.RI "[ "
+.BI "netns { " PID " | " NAME " | " ID " }
+.RI "]"
+
 .ti -8
 .BR "devlink dev eswitch set"
 .IR DEV
@@ -92,6 +99,11 @@ Format is:
 .in +2
 BUS_NAME/BUS_ADDRESS
 
+.SS devlink dev set  - sets devlink device attributes
+
+.TP
+.BI "netns { " PID " | " NAME " | " ID " }
+
 .SS devlink dev eswitch show - display devlink device eswitch attributes
 .SS devlink dev eswitch set  - sets devlink device eswitch attributes
 
-- 
2.21.0