devlink: Add devlink trap group set and show commands

These commands are similar to the trap set and show commands, but
operate on a trap group and not individual traps. Example:

# devlink trap group set netdevsim/netdevsim10 group l3_drops action trap
# devlink -jps trap group show netdevsim/netdevsim10 group l3_drops
{
    "trap_group": {
        "netdevsim/netdevsim10": [ {
                "name": "l3_drops",
                "generic": true,
                "stats": {
                    "rx": {
                        "bytes": 0,
                        "packets": 0
                    }
                }
            } ]
    }
}

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Acked-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 81fff44298414f1bb87421bbf0c75528a84fe3c1..2f084c02076589e9de66edc8dcb44b3021afed6d 100644 (file)
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -235,6 +235,7 @@ static void ifname_map_free(struct ifname_map *ifname_map)
 #define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER    BIT(28)
 #define DL_OPT_TRAP_NAME               BIT(29)
 #define DL_OPT_TRAP_ACTION             BIT(30)
+#define DL_OPT_TRAP_GROUP_NAME         BIT(31)
 
 struct dl_opts {
        uint64_t present; /* flags of present items */
@@ -272,6 +273,7 @@ struct dl_opts {
        uint64_t reporter_graceful_period;
        bool reporter_auto_recover;
        const char *trap_name;
+       const char *trap_group_name;
        enum devlink_trap_action trap_action;
 };
 
@@ -1092,6 +1094,7 @@ static const struct dl_args_metadata dl_args_required[] = {
        {DL_OPT_REGION_LENGTH,        "Region length value expected."},
        {DL_OPT_HEALTH_REPORTER_NAME, "Reporter's name is expected."},
        {DL_OPT_TRAP_NAME,            "Trap's name is expected."},
+       {DL_OPT_TRAP_GROUP_NAME,      "Trap group's name is expected."},
 };
 
 static int dl_args_finding_required_validate(uint64_t o_required,
@@ -1388,6 +1391,13 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required,
                        if (err)
                                return err;
                        o_found |= DL_OPT_TRAP_NAME;
+               } else if (dl_argv_match(dl, "group") &&
+                          (o_all & DL_OPT_TRAP_GROUP_NAME)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->trap_group_name);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_TRAP_GROUP_NAME;
                } else if (dl_argv_match(dl, "action") &&
                           (o_all & DL_OPT_TRAP_ACTION)) {
                        const char *actionstr;
@@ -1516,6 +1526,9 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
        if (opts->present & DL_OPT_TRAP_NAME)
                mnl_attr_put_strz(nlh, DEVLINK_ATTR_TRAP_NAME,
                                  opts->trap_name);
+       if (opts->present & DL_OPT_TRAP_GROUP_NAME)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_TRAP_GROUP_NAME,
+                                 opts->trap_group_name);
        if (opts->present & DL_OPT_TRAP_ACTION)
                mnl_attr_put_u8(nlh, DEVLINK_ATTR_TRAP_ACTION,
                                opts->trap_action);
@@ -3869,6 +3882,10 @@ static const char *cmd_name(uint8_t cmd)
        case DEVLINK_CMD_TRAP_SET: return "set";
        case DEVLINK_CMD_TRAP_NEW: return "new";
        case DEVLINK_CMD_TRAP_DEL: return "del";
+       case DEVLINK_CMD_TRAP_GROUP_GET: return "get";
+       case DEVLINK_CMD_TRAP_GROUP_SET: return "set";
+       case DEVLINK_CMD_TRAP_GROUP_NEW: return "new";
+       case DEVLINK_CMD_TRAP_GROUP_DEL: return "del";
        default: return "<unknown cmd>";
        }
 }
@@ -3902,6 +3919,11 @@ static const char *cmd_obj(uint8_t cmd)
        case DEVLINK_CMD_TRAP_NEW:
        case DEVLINK_CMD_TRAP_DEL:
                return "trap";
+       case DEVLINK_CMD_TRAP_GROUP_GET:
+       case DEVLINK_CMD_TRAP_GROUP_SET:
+       case DEVLINK_CMD_TRAP_GROUP_NEW:
+       case DEVLINK_CMD_TRAP_GROUP_DEL:
+               return "trap-group";
        default: return "<unknown obj>";
        }
 }
@@ -3928,6 +3950,7 @@ static bool cmd_filter_check(struct dl *dl, uint8_t cmd)
 
 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);
 
 static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
 {
@@ -3999,6 +4022,18 @@ static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
                pr_out_mon_header(genl->cmd);
                pr_out_trap(dl, tb, false);
                break;
+       case DEVLINK_CMD_TRAP_GROUP_GET: /* fall through */
+       case DEVLINK_CMD_TRAP_GROUP_SET: /* fall through */
+       case DEVLINK_CMD_TRAP_GROUP_NEW: /* fall through */
+       case DEVLINK_CMD_TRAP_GROUP_DEL:
+               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+                   !tb[DEVLINK_ATTR_TRAP_GROUP_NAME] ||
+                   !tb[DEVLINK_ATTR_STATS])
+                       return MNL_CB_ERROR;
+               pr_out_mon_header(genl->cmd);
+               pr_out_trap_group(dl, tb, false);
+               break;
        }
        return MNL_CB_OK;
 }
@@ -4013,7 +4048,8 @@ static int cmd_mon_show(struct dl *dl)
                if (strcmp(cur_obj, "all") != 0 &&
                    strcmp(cur_obj, "dev") != 0 &&
                    strcmp(cur_obj, "port") != 0 &&
-                   strcmp(cur_obj, "trap") != 0) {
+                   strcmp(cur_obj, "trap") != 0 &&
+                   strcmp(cur_obj, "trap-group") != 0) {
                        pr_err("Unknown object \"%s\"\n", cur_obj);
                        return -EINVAL;
                }
@@ -4030,7 +4066,7 @@ static int cmd_mon_show(struct dl *dl)
 static void cmd_mon_help(void)
 {
        pr_err("Usage: devlink monitor [ all | OBJECT-LIST ]\n"
-              "where  OBJECT-LIST := { dev | port | trap }\n");
+              "where  OBJECT-LIST := { dev | port | trap | trap-group }\n");
 }
 
 static int cmd_mon(struct dl *dl)
@@ -6546,6 +6582,8 @@ static void cmd_trap_help(void)
 {
        pr_err("Usage: devlink trap set DEV trap TRAP [ action { trap | drop } ]\n");
        pr_err("       devlink trap show [ DEV trap TRAP ]\n");
+       pr_err("       devlink trap group set DEV group GROUP [ action { trap | drop } ]\n");
+       pr_err("       devlink trap group show [ DEV group GROUP ]\n");
 }
 
 static int cmd_trap_show(struct dl *dl)
@@ -6589,6 +6627,96 @@ static int cmd_trap_set(struct dl *dl)
        return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
 }
 
+static void pr_out_trap_group(struct dl *dl, struct nlattr **tb, bool array)
+{
+       if (array)
+               pr_out_handle_start_arr(dl, tb);
+       else
+               __pr_out_handle_start(dl, tb, true, false);
+
+       pr_out_str(dl, "name",
+                  mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_GROUP_NAME]));
+       pr_out_bool(dl, "generic", !!tb[DEVLINK_ATTR_TRAP_GENERIC]);
+       pr_out_stats(dl, tb[DEVLINK_ATTR_STATS]);
+       pr_out_handle_end(dl);
+}
+
+static int cmd_trap_group_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_TRAP_GROUP_NAME] || !tb[DEVLINK_ATTR_STATS])
+               return MNL_CB_ERROR;
+
+       pr_out_trap_group(dl, tb, true);
+
+       return MNL_CB_OK;
+}
+
+static int cmd_trap_group_show(struct dl *dl)
+{
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       struct nlmsghdr *nlh;
+       int err;
+
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_TRAP_GROUP_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl,
+                                       DL_OPT_HANDLE | DL_OPT_TRAP_GROUP_NAME,
+                                       0);
+               if (err)
+                       return err;
+       }
+
+       pr_out_section_start(dl, "trap_group");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_trap_group_show_cb, dl);
+       pr_out_section_end(dl);
+
+       return err;
+}
+
+static int cmd_trap_group_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_TRAP_GROUP_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl,
+                               DL_OPT_HANDLE | DL_OPT_TRAP_GROUP_NAME,
+                               DL_OPT_TRAP_ACTION);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_trap_group(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help")) {
+               cmd_trap_help();
+               return 0;
+       } else if (dl_argv_match(dl, "show") ||
+                  dl_argv_match(dl, "list") || dl_no_arg(dl)) {
+               dl_arg_inc(dl);
+               return cmd_trap_group_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_trap_group_set(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
 static int cmd_trap(struct dl *dl)
 {
        if (dl_argv_match(dl, "help")) {
@@ -6601,6 +6729,9 @@ static int cmd_trap(struct dl *dl)
        } else if (dl_argv_match(dl, "set")) {
                dl_arg_inc(dl);
                return cmd_trap_set(dl);
+       } else if (dl_argv_match(dl, "group")) {
+               dl_arg_inc(dl);
+               return cmd_trap_group(dl);
        }
        pr_err("Command \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;