diff options
Diffstat (limited to 'devlink/devlink.c')
| -rw-r--r-- | devlink/devlink.c | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/devlink/devlink.c b/devlink/devlink.c index 056ac95e..9c96d05e 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -32,6 +32,7 @@ #include "mnlg.h" #include "json_writer.h" #include "utils.h" +#include "namespace.h" #define ESWITCH_MODE_LEGACY "legacy" #define ESWITCH_MODE_SWITCHDEV "switchdev" @@ -260,6 +261,7 @@ static void ifname_map_free(struct ifname_map *ifname_map) #define DL_OPT_TRAP_NAME BIT(30) #define DL_OPT_TRAP_ACTION BIT(31) #define DL_OPT_TRAP_GROUP_NAME BIT(32) +#define DL_OPT_NETNS BIT(33) struct dl_opts { uint64_t present; /* flags of present items */ @@ -299,6 +301,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 { @@ -1447,6 +1451,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; @@ -1569,7 +1589,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, @@ -1630,7 +1654,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"); } @@ -2727,7 +2751,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) @@ -2743,7 +2767,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; @@ -7025,7 +7049,7 @@ static int cmd_trap(struct dl *dl) static void help(void) { pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n" - " devlink [ -f[orce] ] -b[atch] filename\n" + " devlink [ -f[orce] ] -b[atch] filename -N[etns] netnsname\n" "where OBJECT := { dev | port | sb | monitor | dpipe | resource | region | health | trap }\n" " OPTIONS := { -V[ersion] | -n[o-nice-names] | -j[son] | -p[retty] | -v[erbose] -s[tatistics] }\n"); } @@ -7175,6 +7199,7 @@ int main(int argc, char **argv) { "pretty", no_argument, NULL, 'p' }, { "verbose", no_argument, NULL, 'v' }, { "statistics", no_argument, NULL, 's' }, + { "Netns", required_argument, NULL, 'N' }, { NULL, 0, NULL, 0 } }; const char *batch_file = NULL; @@ -7190,7 +7215,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - while ((opt = getopt_long(argc, argv, "Vfb:njpvs", + while ((opt = getopt_long(argc, argv, "Vfb:njpvsN:", long_options, NULL)) >= 0) { switch (opt) { @@ -7219,6 +7244,12 @@ int main(int argc, char **argv) case 's': dl->stats = true; break; + case 'N': + if (netns_switch(optarg)) { + ret = EXIT_FAILURE; + goto dl_free; + } + break; default: pr_err("Unknown option.\n"); help(); |