]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
Merge branch 'master' into net-next
authorStephen Hemminger <shemming@brocade.com>
Wed, 18 May 2016 18:57:28 +0000 (11:57 -0700)
committerStephen Hemminger <shemming@brocade.com>
Wed, 18 May 2016 18:57:28 +0000 (11:57 -0700)
35 files changed:
devlink/devlink.c
include/linux/bpf.h
include/linux/devlink.h
include/linux/fib_rules.h
include/linux/gen_stats.h
include/linux/if_bridge.h
include/linux/if_ether.h
include/linux/if_link.h
include/linux/ila.h
include/linux/inet_diag.h
include/linux/l2tp.h
include/linux/lwtunnel.h
include/linux/neighbour.h
include/linux/pkt_cls.h
include/linux/pkt_sched.h
include/linux/rtnetlink.h
include/linux/sock_diag.h
include/linux/tc_act/tc_bpf.h
include/linux/tc_act/tc_connmark.h
include/linux/tc_act/tc_csum.h
include/linux/tc_act/tc_defact.h
include/linux/tc_act/tc_gact.h
include/linux/tc_act/tc_ipt.h
include/linux/tc_act/tc_mirred.h
include/linux/tc_act/tc_nat.h
include/linux/tc_act/tc_pedit.h
include/linux/tc_act/tc_skbedit.h
include/linux/tc_act/tc_vlan.h
include/linux/tcp_metrics.h
include/linux/xfrm.h
ip/iplink_vxlan.c
man/man8/ip-link.8.in
misc/ss.c
tc/q_clsact.c
tc/q_ingress.c

index 89a3083172ba3af26f6ad4f5c36f1a71b2ae33e6..ffefa86d2ed287449abf2c9b401cced0891dd79b 100644 (file)
 
 #define pr_err(args...) fprintf(stderr, ##args)
 #define pr_out(args...) fprintf(stdout, ##args)
+#define pr_out_sp(num, args...)                                        \
+       do {                                                    \
+               int ret = fprintf(stdout, ##args);              \
+               if (ret < num)                                  \
+                       fprintf(stdout, "%*s", num - ret, "");  \
+       } while (0)
 
 static int _mnlg_socket_recv_run(struct mnlg_socket *nlg,
                                 mnl_cb_t data_cb, void *data)
@@ -114,6 +120,13 @@ static void ifname_map_free(struct ifname_map *ifname_map)
 #define DL_OPT_HANDLEP         BIT(1)
 #define DL_OPT_PORT_TYPE       BIT(2)
 #define DL_OPT_PORT_COUNT      BIT(3)
+#define DL_OPT_SB              BIT(4)
+#define DL_OPT_SB_POOL         BIT(5)
+#define DL_OPT_SB_SIZE         BIT(6)
+#define DL_OPT_SB_TYPE         BIT(7)
+#define DL_OPT_SB_THTYPE       BIT(8)
+#define DL_OPT_SB_TH           BIT(9)
+#define DL_OPT_SB_TC           BIT(10)
 
 struct dl_opts {
        uint32_t present; /* flags of present items */
@@ -122,6 +135,13 @@ struct dl_opts {
        uint32_t port_index;
        enum devlink_port_type port_type;
        uint32_t port_count;
+       uint32_t sb_index;
+       uint16_t sb_pool_index;
+       uint32_t sb_pool_size;
+       enum devlink_sb_pool_type sb_pool_type;
+       enum devlink_sb_threshold_type sb_pool_thtype;
+       uint32_t sb_threshold;
+       uint16_t sb_tc_index;
 };
 
 struct dl {
@@ -225,6 +245,48 @@ static int attr_cb(const struct nlattr *attr, void *data)
        if (type == DEVLINK_ATTR_PORT_IBDEV_NAME &&
            mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0)
                return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_INDEX &&
+           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_SIZE &&
+           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_INGRESS_POOL_COUNT &&
+           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_EGRESS_POOL_COUNT &&
+           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_INGRESS_TC_COUNT &&
+           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_EGRESS_TC_COUNT &&
+           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_POOL_INDEX &&
+           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_POOL_TYPE &&
+           mnl_attr_validate(attr, MNL_TYPE_U8) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_POOL_SIZE &&
+           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE &&
+           mnl_attr_validate(attr, MNL_TYPE_U8) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_THRESHOLD &&
+           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_TC_INDEX &&
+           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_OCC_CUR &&
+           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+               return MNL_CB_ERROR;
+       if (type == DEVLINK_ATTR_SB_OCC_MAX &&
+           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
+               return MNL_CB_ERROR;
        tb[type] = attr;
        return MNL_CB_OK;
 }
@@ -307,6 +369,23 @@ static int ifname_map_lookup(struct dl *dl, const char *ifname,
        return -ENOENT;
 }
 
+static int ifname_map_rev_lookup(struct dl *dl, const char *bus_name,
+                                const char *dev_name, uint32_t port_index,
+                                char **p_ifname)
+{
+       struct ifname_map *ifname_map;
+
+       list_for_each_entry(ifname_map, &dl->ifname_map_list, list) {
+               if (strcmp(bus_name, ifname_map->bus_name) == 0 &&
+                   strcmp(dev_name, ifname_map->dev_name) == 0 &&
+                   port_index == ifname_map->port_index) {
+                       *p_ifname = ifname_map->ifname;
+                       return 0;
+               }
+       }
+       return -ENOENT;
+}
+
 static unsigned int strslashcount(char *str)
 {
        unsigned int count = 0;
@@ -346,6 +425,20 @@ static int strtouint32_t(const char *str, uint32_t *p_val)
        return 0;
 }
 
+static int strtouint16_t(const char *str, uint16_t *p_val)
+{
+       char *endptr;
+       unsigned long int val;
+
+       val = strtoul(str, &endptr, 10);
+       if (endptr == str || *endptr != '\0')
+               return -EINVAL;
+       if (val > USHRT_MAX)
+               return -ERANGE;
+       *p_val = val;
+       return 0;
+}
+
 static int __dl_argv_handle(char *str, char **p_bus_name, char **p_dev_name)
 {
        strslashrsplit(str, p_bus_name, p_dev_name);
@@ -486,6 +579,24 @@ static int dl_argv_uint32_t(struct dl *dl, uint32_t *p_val)
        return 0;
 }
 
+static int dl_argv_uint16_t(struct dl *dl, uint16_t *p_val)
+{
+       char *str = dl_argv_next(dl);
+       int err;
+
+       if (!str) {
+               pr_err("Unsigned number argument expected\n");
+               return -EINVAL;
+       }
+
+       err = strtouint16_t(str, p_val);
+       if (err) {
+               pr_err("\"%s\" is not a number or not within range\n", str);
+               return err;
+       }
+       return 0;
+}
+
 static int dl_argv_str(struct dl *dl, const char **p_str)
 {
        const char *str = dl_argv_next(dl);
@@ -513,6 +624,33 @@ static int port_type_get(const char *typestr, enum devlink_port_type *p_type)
        return 0;
 }
 
+static int pool_type_get(const char *typestr, enum devlink_sb_pool_type *p_type)
+{
+       if (strcmp(typestr, "ingress") == 0) {
+               *p_type = DEVLINK_SB_POOL_TYPE_INGRESS;
+       } else if (strcmp(typestr, "egress") == 0) {
+               *p_type = DEVLINK_SB_POOL_TYPE_EGRESS;
+       } else {
+               pr_err("Unknown pool type \"%s\"\n", typestr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int threshold_type_get(const char *typestr,
+                             enum devlink_sb_threshold_type *p_type)
+{
+       if (strcmp(typestr, "static") == 0) {
+               *p_type = DEVLINK_SB_THRESHOLD_TYPE_STATIC;
+       } else if (strcmp(typestr, "dynamic") == 0) {
+               *p_type = DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC;
+       } else {
+               pr_err("Unknown threshold type \"%s\"\n", typestr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
 static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                         uint32_t o_optional)
 {
@@ -562,6 +700,66 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                        if (err)
                                return err;
                        o_found |= DL_OPT_PORT_COUNT;
+               } else if (dl_argv_match(dl, "sb") &&
+                          (o_all & DL_OPT_SB)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint32_t(dl, &opts->sb_index);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_SB;
+               } else if (dl_argv_match(dl, "pool") &&
+                          (o_all & DL_OPT_SB_POOL)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint16_t(dl, &opts->sb_pool_index);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_SB_POOL;
+               } else if (dl_argv_match(dl, "size") &&
+                          (o_all & DL_OPT_SB_SIZE)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint32_t(dl, &opts->sb_pool_size);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_SB_SIZE;
+               } else if (dl_argv_match(dl, "type") &&
+                          (o_all & DL_OPT_SB_TYPE)) {
+                       const char *typestr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &typestr);
+                       if (err)
+                               return err;
+                       err = pool_type_get(typestr, &opts->sb_pool_type);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_SB_TYPE;
+               } else if (dl_argv_match(dl, "thtype") &&
+                          (o_all & DL_OPT_SB_THTYPE)) {
+                       const char *typestr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &typestr);
+                       if (err)
+                               return err;
+                       err = threshold_type_get(typestr,
+                                                &opts->sb_pool_thtype);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_SB_THTYPE;
+               } else if (dl_argv_match(dl, "th") &&
+                          (o_all & DL_OPT_SB_TH)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint32_t(dl, &opts->sb_threshold);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_SB_TH;
+               } else if (dl_argv_match(dl, "tc") &&
+                          (o_all & DL_OPT_SB_TC)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint16_t(dl, &opts->sb_tc_index);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_SB_TC;
                } else {
                        pr_err("Unknown option \"%s\"\n", dl_argv(dl));
                        return -EINVAL;
@@ -570,6 +768,11 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
 
        opts->present = o_found;
 
+       if ((o_optional & DL_OPT_SB) && !(o_found & DL_OPT_SB)) {
+               opts->sb_index = 0;
+               opts->present |= DL_OPT_SB;
+       }
+
        if ((o_required & DL_OPT_PORT_TYPE) && !(o_found & DL_OPT_PORT_TYPE)) {
                pr_err("Port type option expected.\n");
                return -EINVAL;
@@ -581,6 +784,35 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                return -EINVAL;
        }
 
+       if ((o_required & DL_OPT_SB_POOL) && !(o_found & DL_OPT_SB_POOL)) {
+               pr_err("Pool index option expected.\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_SB_SIZE) && !(o_found & DL_OPT_SB_SIZE)) {
+               pr_err("Pool size option expected.\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_SB_TYPE) && !(o_found & DL_OPT_SB_TYPE)) {
+               pr_err("Pool type option expected.\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_SB_THTYPE) && !(o_found & DL_OPT_SB_THTYPE)) {
+               pr_err("Pool threshold type option expected.\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_SB_TH) && !(o_found & DL_OPT_SB_TH)) {
+               pr_err("Threshold option expected.\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_SB_TC) && !(o_found & DL_OPT_SB_TC)) {
+               pr_err("TC index option expected.\n");
+               return -EINVAL;
+       }
        return 0;
 }
 
@@ -603,6 +835,27 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
        if (opts->present & DL_OPT_PORT_COUNT)
                mnl_attr_put_u32(nlh, DEVLINK_ATTR_PORT_SPLIT_COUNT,
                                 opts->port_count);
+       if (opts->present & DL_OPT_SB)
+               mnl_attr_put_u32(nlh, DEVLINK_ATTR_SB_INDEX,
+                                opts->sb_index);
+       if (opts->present & DL_OPT_SB_POOL)
+               mnl_attr_put_u16(nlh, DEVLINK_ATTR_SB_POOL_INDEX,
+                                opts->sb_pool_index);
+       if (opts->present & DL_OPT_SB_SIZE)
+               mnl_attr_put_u32(nlh, DEVLINK_ATTR_SB_POOL_SIZE,
+                                opts->sb_pool_size);
+       if (opts->present & DL_OPT_SB_TYPE)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_SB_POOL_TYPE,
+                               opts->sb_pool_type);
+       if (opts->present & DL_OPT_SB_THTYPE)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,
+                               opts->sb_pool_thtype);
+       if (opts->present & DL_OPT_SB_TH)
+               mnl_attr_put_u32(nlh, DEVLINK_ATTR_SB_THRESHOLD,
+                                opts->sb_threshold);
+       if (opts->present & DL_OPT_SB_TC)
+               mnl_attr_put_u16(nlh, DEVLINK_ATTR_SB_TC_INDEX,
+                                opts->sb_tc_index);
 }
 
 static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
@@ -617,6 +870,42 @@ static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
        return 0;
 }
 
+static bool dl_dump_filter(struct dl *dl, struct nlattr **tb)
+{
+       struct dl_opts *opts = &dl->opts;
+       struct nlattr *attr_bus_name = tb[DEVLINK_ATTR_BUS_NAME];
+       struct nlattr *attr_dev_name = tb[DEVLINK_ATTR_DEV_NAME];
+       struct nlattr *attr_port_index = tb[DEVLINK_ATTR_PORT_INDEX];
+       struct nlattr *attr_sb_index = tb[DEVLINK_ATTR_SB_INDEX];
+
+       if (opts->present & DL_OPT_HANDLE &&
+           attr_bus_name && attr_dev_name) {
+               const char *bus_name = mnl_attr_get_str(attr_bus_name);
+               const char *dev_name = mnl_attr_get_str(attr_dev_name);
+
+               if (strcmp(bus_name, opts->bus_name) != 0 ||
+                   strcmp(dev_name, opts->dev_name) != 0)
+                       return false;
+       }
+       if (opts->present & DL_OPT_HANDLEP &&
+           attr_bus_name && attr_dev_name && attr_port_index) {
+               const char *bus_name = mnl_attr_get_str(attr_bus_name);
+               const char *dev_name = mnl_attr_get_str(attr_dev_name);
+               uint32_t port_index = mnl_attr_get_u32(attr_port_index);
+
+               if (strcmp(bus_name, opts->bus_name) != 0 ||
+                   strcmp(dev_name, opts->dev_name) != 0 ||
+                   port_index != opts->port_index)
+                       return false;
+       }
+       if (opts->present & DL_OPT_SB && attr_sb_index) {
+               uint32_t sb_index = mnl_attr_get_u32(attr_sb_index);
+
+               if (sb_index != opts->sb_index)
+                       return false;
+       }
+       return true;
+}
 
 static void cmd_dev_help(void)
 {
@@ -648,6 +937,39 @@ static void pr_out_port_handle(struct nlattr **tb)
                             mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_INDEX]));
 }
 
+static void __pr_out_port_handle_nice(struct dl *dl, const char *bus_name,
+                                     const char *dev_name, uint32_t port_index)
+{
+       char *ifname;
+       int err;
+
+       if (dl->no_nice_names)
+               goto no_nice_names;
+
+       err = ifname_map_rev_lookup(dl, bus_name, dev_name,
+                                   port_index, &ifname);
+       if (err)
+               goto no_nice_names;
+       pr_out("%s", ifname);
+       return;
+
+no_nice_names:
+       __pr_out_port_handle(bus_name, dev_name, port_index);
+}
+
+static void pr_out_port_handle_nice(struct dl *dl, struct nlattr **tb)
+{
+       const char *bus_name;
+       const char *dev_name;
+       uint32_t port_index;
+
+       bus_name = mnl_attr_get_str(tb[DEVLINK_ATTR_BUS_NAME]);
+       dev_name = mnl_attr_get_str(tb[DEVLINK_ATTR_DEV_NAME]);
+       port_index = mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_INDEX]);
+
+       __pr_out_port_handle_nice(dl, bus_name, dev_name, port_index);
+}
+
 static void pr_out_dev(struct nlattr **tb)
 {
        pr_out_handle(tb);
@@ -850,103 +1172,807 @@ static int cmd_port(struct dl *dl)
        return -ENOENT;
 }
 
-static const char *cmd_name(uint8_t cmd)
+static void cmd_sb_help(void)
 {
-       switch (cmd) {
-       case DEVLINK_CMD_UNSPEC: return "unspec";
-       case DEVLINK_CMD_GET: return "get";
-       case DEVLINK_CMD_SET: return "set";
-       case DEVLINK_CMD_NEW: return "new";
-       case DEVLINK_CMD_DEL: return "del";
-       case DEVLINK_CMD_PORT_GET: return "get";
-       case DEVLINK_CMD_PORT_SET: return "set";
-       case DEVLINK_CMD_PORT_NEW: return "net";
-       case DEVLINK_CMD_PORT_DEL: return "del";
-       default: return "<unknown cmd>";
-       }
+       pr_out("Usage: devlink sb show [ DEV [ sb SB_INDEX ] ]\n");
+       pr_out("       devlink sb pool show [ DEV [ sb SB_INDEX ] pool POOL_INDEX ]\n");
+       pr_out("       devlink sb pool set DEV [ sb SB_INDEX ] pool POOL_INDEX\n");
+       pr_out("                           size POOL_SIZE thtype { static | dynamic }\n");
+       pr_out("       devlink sb port pool show [ DEV/PORT_INDEX [ sb SB_INDEX ]\n");
+       pr_out("                                   pool POOL_INDEX ]\n");
+       pr_out("       devlink sb port pool set DEV/PORT_INDEX [ sb SB_INDEX ]\n");
+       pr_out("                                pool POOL_INDEX th THRESHOLD\n");
+       pr_out("       devlink sb tc bind show [ DEV/PORT_INDEX [ sb SB_INDEX ] tc TC_INDEX\n");
+       pr_out("                                 type { ingress | egress } ]\n");
+       pr_out("       devlink sb tc bind set DEV/PORT_INDEX [ sb SB_INDEX ] tc TC_INDEX\n");
+       pr_out("                              type { ingress | egress } pool POOL_INDEX\n");
+       pr_out("                              th THRESHOLD\n");
+       pr_out("       devlink sb occupancy show { DEV | DEV/PORT_INDEX } [ sb SB_INDEX ]\n");
+       pr_out("       devlink sb occupancy snapshot DEV [ sb SB_INDEX ]\n");
+       pr_out("       devlink sb occupancy clearmax DEV [ sb SB_INDEX ]\n");
 }
 
-static const char *cmd_obj(uint8_t cmd)
+static void pr_out_sb(struct nlattr **tb)
 {
-       switch (cmd) {
-       case DEVLINK_CMD_UNSPEC: return "unspec";
-       case DEVLINK_CMD_GET:
-       case DEVLINK_CMD_SET:
-       case DEVLINK_CMD_NEW:
-       case DEVLINK_CMD_DEL:
-               return "dev";
-       case DEVLINK_CMD_PORT_GET:
-       case DEVLINK_CMD_PORT_SET:
-       case DEVLINK_CMD_PORT_NEW:
-       case DEVLINK_CMD_PORT_DEL:
-               return "port";
-       default: return "<unknown obj>";
-       }
+       pr_out_handle(tb);
+       pr_out(": sb %u size %u ing_pools %u eg_pools %u ing_tcs %u eg_tcs %u\n",
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]),
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_SIZE]),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_INGRESS_POOL_COUNT]),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_EGRESS_POOL_COUNT]),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_INGRESS_TC_COUNT]),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_EGRESS_TC_COUNT]));
 }
 
-static void pr_out_mon_header(uint8_t cmd)
+static int cmd_sb_show_cb(const struct nlmsghdr *nlh, void *data)
 {
-       pr_out("[%s,%s] ", cmd_obj(cmd), cmd_name(cmd));
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_SB_INDEX] || !tb[DEVLINK_ATTR_SB_SIZE] ||
+           !tb[DEVLINK_ATTR_SB_INGRESS_POOL_COUNT] ||
+           !tb[DEVLINK_ATTR_SB_EGRESS_POOL_COUNT] ||
+           !tb[DEVLINK_ATTR_SB_INGRESS_TC_COUNT] ||
+           !tb[DEVLINK_ATTR_SB_EGRESS_TC_COUNT])
+               return MNL_CB_ERROR;
+       pr_out_sb(tb);
+       return MNL_CB_OK;
 }
 
-static bool cmd_filter_check(struct dl *dl, uint8_t cmd)
+static int cmd_sb_show(struct dl *dl)
 {
-       const char *obj = cmd_obj(cmd);
-       unsigned int index = 0;
-       const char *cur_obj;
+       struct nlmsghdr *nlh;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       int err;
 
-       if (dl_no_arg(dl))
-               return true;
-       while ((cur_obj = dl_argv_index(dl, index++))) {
-               if (strcmp(cur_obj, obj) == 0 || strcmp(cur_obj, "all") == 0)
-                       return true;
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, DL_OPT_SB);
+               if (err)
+                       return err;
        }
-       return false;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_show_cb, NULL);
 }
 
-static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
+static const char *pool_type_name(uint8_t type)
 {
-       struct dl *dl = data;
-       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
-       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
-       uint8_t cmd = genl->cmd;
-
-       if (!cmd_filter_check(dl, cmd))
-               return MNL_CB_OK;
-
-       switch (cmd) {
-       case DEVLINK_CMD_GET: /* fall through */
-       case DEVLINK_CMD_SET: /* fall through */
-       case DEVLINK_CMD_NEW: /* fall through */
-       case DEVLINK_CMD_DEL:
-               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_dev(tb);
-               break;
-       case DEVLINK_CMD_PORT_GET: /* fall through */
-       case DEVLINK_CMD_PORT_SET: /* fall through */
-       case DEVLINK_CMD_PORT_NEW: /* fall through */
-       case DEVLINK_CMD_PORT_DEL:
-               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
-               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
-                   !tb[DEVLINK_ATTR_PORT_INDEX])
-                       return MNL_CB_ERROR;
-               pr_out_mon_header(genl->cmd);
-               pr_out_port(tb);
-               break;
+       switch (type) {
+       case DEVLINK_SB_POOL_TYPE_INGRESS: return "ingress";
+       case DEVLINK_SB_POOL_TYPE_EGRESS: return "egress";
+       default: return "<unknown type>";
        }
-       return MNL_CB_OK;
 }
 
-static int cmd_mon_show(struct dl *dl)
+static const char *threshold_type_name(uint8_t type)
 {
-       int err;
-       unsigned int index = 0;
-       const char *cur_obj;
+       switch (type) {
+       case DEVLINK_SB_THRESHOLD_TYPE_STATIC: return "static";
+       case DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC: return "dynamic";
+       default: return "<unknown type>";
+       }
+}
 
-       while ((cur_obj = dl_argv_index(dl, index++))) {
+static void pr_out_sb_pool(struct nlattr **tb)
+{
+       pr_out_handle(tb);
+       pr_out(": sb %u pool %u type %s size %u thtype %s\n",
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]),
+              pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE])),
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_POOL_SIZE]),
+              threshold_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE])));
+}
+
+static int cmd_sb_pool_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_SB_INDEX] || !tb[DEVLINK_ATTR_SB_POOL_INDEX] ||
+           !tb[DEVLINK_ATTR_SB_POOL_TYPE] || !tb[DEVLINK_ATTR_SB_POOL_SIZE] ||
+           !tb[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE])
+               return MNL_CB_ERROR;
+       pr_out_sb_pool(tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_sb_pool_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       int err;
+
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_POOL_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE | DL_OPT_SB_POOL,
+                                       DL_OPT_SB);
+               if (err)
+                       return err;
+       }
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_pool_show_cb, NULL);
+}
+
+static int cmd_sb_pool_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_POOL_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE | DL_OPT_SB_POOL |
+                               DL_OPT_SB_SIZE | DL_OPT_SB_THTYPE, DL_OPT_SB);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_sb_pool(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help")) {
+               cmd_sb_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_sb_pool_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_sb_pool_set(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static void pr_out_sb_port_pool(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_port_handle_nice(dl, tb);
+       pr_out(": sb %u pool %u threshold %u\n",
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]),
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_THRESHOLD]));
+}
+
+static int cmd_sb_port_pool_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct dl *dl = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_PORT_INDEX] || !tb[DEVLINK_ATTR_SB_INDEX] ||
+           !tb[DEVLINK_ATTR_SB_POOL_INDEX] || !tb[DEVLINK_ATTR_SB_THRESHOLD])
+               return MNL_CB_ERROR;
+       pr_out_sb_port_pool(dl, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_sb_port_pool_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       int err;
+
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_PORT_POOL_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl,
+                                       DL_OPT_HANDLEP | DL_OPT_SB_POOL,
+                                       DL_OPT_SB);
+               if (err)
+                       return err;
+       }
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_port_pool_show_cb, dl);
+}
+
+static int cmd_sb_port_pool_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_PORT_POOL_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_SB_POOL |
+                               DL_OPT_SB_TH, DL_OPT_SB);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_sb_port_pool(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help")) {
+               cmd_sb_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_sb_port_pool_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_sb_port_pool_set(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static int cmd_sb_port(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_sb_help();
+               return 0;
+       } else if (dl_argv_match(dl, "pool")) {
+               dl_arg_inc(dl);
+               return cmd_sb_port_pool(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static void pr_out_sb_tc_bind(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_port_handle_nice(dl, tb);
+       pr_out(": sb %u tc %u type %s pool %u threshold %u\n",
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_TC_INDEX]),
+              pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE])),
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]),
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_THRESHOLD]));
+}
+
+static int cmd_sb_tc_bind_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct dl *dl = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_PORT_INDEX] || !tb[DEVLINK_ATTR_SB_INDEX] ||
+           !tb[DEVLINK_ATTR_SB_TC_INDEX] || !tb[DEVLINK_ATTR_SB_POOL_TYPE] ||
+           !tb[DEVLINK_ATTR_SB_POOL_INDEX] || !tb[DEVLINK_ATTR_SB_THRESHOLD])
+               return MNL_CB_ERROR;
+       pr_out_sb_tc_bind(dl, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_sb_tc_bind_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       int err;
+
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_TC_POOL_BIND_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_SB_TC |
+                                       DL_OPT_SB_TYPE, DL_OPT_SB);
+               if (err)
+                       return err;
+       }
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_tc_bind_show_cb, dl);
+}
+
+static int cmd_sb_tc_bind_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_TC_POOL_BIND_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_SB_TC |
+                               DL_OPT_SB_TYPE | DL_OPT_SB_POOL | DL_OPT_SB_TH,
+                               DL_OPT_SB);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_sb_tc_bind(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help")) {
+               cmd_sb_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_sb_tc_bind_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_sb_tc_bind_set(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static int cmd_sb_tc(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_sb_help();
+               return 0;
+       } else if (dl_argv_match(dl, "bind")) {
+               dl_arg_inc(dl);
+               return cmd_sb_tc_bind(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+struct occ_item {
+       struct list_head list;
+       uint32_t index;
+       uint32_t cur;
+       uint32_t max;
+       uint32_t bound_pool_index;
+};
+
+struct occ_port {
+       struct list_head list;
+       char *bus_name;
+       char *dev_name;
+       uint32_t port_index;
+       uint32_t sb_index;
+       struct list_head pool_list;
+       struct list_head ing_tc_list;
+       struct list_head eg_tc_list;
+};
+
+struct occ_show {
+       struct dl *dl;
+       int err;
+       struct list_head port_list;
+};
+
+static struct occ_item *occ_item_alloc(void)
+{
+       return calloc(1, sizeof(struct occ_item));
+}
+
+static void occ_item_free(struct occ_item *occ_item)
+{
+       free(occ_item);
+}
+
+static struct occ_port *occ_port_alloc(uint32_t port_index)
+{
+       struct occ_port *occ_port;
+
+       occ_port = calloc(1, sizeof(*occ_port));
+       if (!occ_port)
+               return NULL;
+       occ_port->port_index = port_index;
+       INIT_LIST_HEAD(&occ_port->pool_list);
+       INIT_LIST_HEAD(&occ_port->ing_tc_list);
+       INIT_LIST_HEAD(&occ_port->eg_tc_list);
+       return occ_port;
+}
+
+static void occ_port_free(struct occ_port *occ_port)
+{
+       struct occ_item *occ_item, *tmp;
+
+       list_for_each_entry_safe(occ_item, tmp, &occ_port->pool_list, list)
+               occ_item_free(occ_item);
+       list_for_each_entry_safe(occ_item, tmp, &occ_port->ing_tc_list, list)
+               occ_item_free(occ_item);
+       list_for_each_entry_safe(occ_item, tmp, &occ_port->eg_tc_list, list)
+               occ_item_free(occ_item);
+}
+
+static struct occ_show *occ_show_alloc(struct dl *dl)
+{
+       struct occ_show *occ_show;
+
+       occ_show = calloc(1, sizeof(*occ_show));
+       if (!occ_show)
+               return NULL;
+       occ_show->dl = dl;
+       INIT_LIST_HEAD(&occ_show->port_list);
+       return occ_show;
+}
+
+static void occ_show_free(struct occ_show *occ_show)
+{
+       struct occ_port *occ_port, *tmp;
+
+       list_for_each_entry_safe(occ_port, tmp, &occ_show->port_list, list)
+               occ_port_free(occ_port);
+}
+
+static struct occ_port *occ_port_get(struct occ_show *occ_show,
+                                    struct nlattr **tb)
+{
+       struct occ_port *occ_port;
+       uint32_t port_index;
+
+       port_index = mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_INDEX]);
+
+       list_for_each_entry_reverse(occ_port, &occ_show->port_list, list) {
+               if (occ_port->port_index == port_index)
+                       return occ_port;
+       }
+       occ_port = occ_port_alloc(port_index);
+       if (!occ_port)
+               return NULL;
+       list_add_tail(&occ_port->list, &occ_show->port_list);
+       return occ_port;
+}
+
+static void pr_out_occ_show_item_list(const char *label, struct list_head *list,
+                                     bool bound_pool)
+{
+       struct occ_item *occ_item;
+       int i = 1;
+
+       pr_out_sp(7, "  %s:", label);
+       list_for_each_entry(occ_item, list, list) {
+               if ((i - 1) % 4 == 0 && i != 1)
+                       pr_out_sp(7, " ");
+               if (bound_pool)
+                       pr_out_sp(7, "%2u(%u):", occ_item->index,
+                                 occ_item->bound_pool_index);
+               else
+                       pr_out_sp(7, "%2u:", occ_item->index);
+               pr_out_sp(15, "%7u/%u", occ_item->cur, occ_item->max);
+               if (i++ % 4 == 0)
+                       pr_out("\n");
+       }
+       if ((i - 1) % 4 != 0)
+               pr_out("\n");
+}
+
+static void pr_out_occ_show_port(struct occ_port *occ_port)
+{
+       pr_out_occ_show_item_list("pool", &occ_port->pool_list, false);
+       pr_out_occ_show_item_list("itc", &occ_port->ing_tc_list, true);
+       pr_out_occ_show_item_list("etc", &occ_port->eg_tc_list, true);
+}
+
+static void pr_out_occ_show(struct occ_show *occ_show)
+{
+       struct dl *dl = occ_show->dl;
+       struct dl_opts *opts = &dl->opts;
+       struct occ_port *occ_port;
+
+       list_for_each_entry(occ_port, &occ_show->port_list, list) {
+               __pr_out_port_handle_nice(dl, opts->bus_name, opts->dev_name,
+                                         occ_port->port_index);
+               pr_out(":\n");
+               pr_out_occ_show_port(occ_port);
+       }
+}
+
+static void cmd_sb_occ_port_pool_process(struct occ_show *occ_show,
+                                        struct nlattr **tb)
+{
+       struct occ_port *occ_port;
+       struct occ_item *occ_item;
+
+       if (occ_show->err || !dl_dump_filter(occ_show->dl, tb))
+               return;
+
+       occ_port = occ_port_get(occ_show, tb);
+       if (!occ_port) {
+               occ_show->err = -ENOMEM;
+               return;
+       }
+
+       occ_item = occ_item_alloc();
+       if (!occ_item) {
+               occ_show->err = -ENOMEM;
+               return;
+       }
+       occ_item->index = mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]);
+       occ_item->cur = mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_OCC_CUR]);
+       occ_item->max = mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_OCC_MAX]);
+       list_add_tail(&occ_item->list, &occ_port->pool_list);
+}
+
+static int cmd_sb_occ_port_pool_process_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct occ_show *occ_show = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_PORT_INDEX] || !tb[DEVLINK_ATTR_SB_INDEX] ||
+           !tb[DEVLINK_ATTR_SB_POOL_INDEX] ||
+           !tb[DEVLINK_ATTR_SB_OCC_CUR] || !tb[DEVLINK_ATTR_SB_OCC_MAX])
+               return MNL_CB_ERROR;
+       cmd_sb_occ_port_pool_process(occ_show, tb);
+       return MNL_CB_OK;
+}
+
+static void cmd_sb_occ_tc_pool_process(struct occ_show *occ_show,
+                                      struct nlattr **tb)
+{
+       struct occ_port *occ_port;
+       struct occ_item *occ_item;
+       uint8_t pool_type;
+
+       if (occ_show->err || !dl_dump_filter(occ_show->dl, tb))
+               return;
+
+       occ_port = occ_port_get(occ_show, tb);
+       if (!occ_port) {
+               occ_show->err = -ENOMEM;
+               return;
+       }
+
+       occ_item = occ_item_alloc();
+       if (!occ_item) {
+               occ_show->err = -ENOMEM;
+               return;
+       }
+       occ_item->index = mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_TC_INDEX]);
+       occ_item->cur = mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_OCC_CUR]);
+       occ_item->max = mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_OCC_MAX]);
+       occ_item->bound_pool_index =
+                       mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]);
+       pool_type = mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE]);
+       if (pool_type == DEVLINK_SB_POOL_TYPE_INGRESS)
+               list_add_tail(&occ_item->list, &occ_port->ing_tc_list);
+       else if (pool_type == DEVLINK_SB_POOL_TYPE_EGRESS)
+               list_add_tail(&occ_item->list, &occ_port->eg_tc_list);
+       else
+               occ_item_free(occ_item);
+}
+
+static int cmd_sb_occ_tc_pool_process_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct occ_show *occ_show = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_PORT_INDEX] || !tb[DEVLINK_ATTR_SB_INDEX] ||
+           !tb[DEVLINK_ATTR_SB_TC_INDEX] || !tb[DEVLINK_ATTR_SB_POOL_TYPE] ||
+           !tb[DEVLINK_ATTR_SB_POOL_INDEX] ||
+           !tb[DEVLINK_ATTR_SB_OCC_CUR] || !tb[DEVLINK_ATTR_SB_OCC_MAX])
+               return MNL_CB_ERROR;
+       cmd_sb_occ_tc_pool_process(occ_show, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_sb_occ_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       struct occ_show *occ_show;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP;
+       int err;
+
+       err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_HANDLEP, DL_OPT_SB);
+       if (err)
+               return err;
+
+       occ_show = occ_show_alloc(dl);
+       if (!occ_show)
+               return -ENOMEM;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_PORT_POOL_GET, flags);
+
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh,
+                                 cmd_sb_occ_port_pool_process_cb, occ_show);
+       if (err)
+               goto out;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_TC_POOL_BIND_GET, flags);
+
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh,
+                                 cmd_sb_occ_tc_pool_process_cb, occ_show);
+       if (err)
+               goto out;
+
+       pr_out_occ_show(occ_show);
+
+out:
+       occ_show_free(occ_show);
+       return err;
+}
+
+static int cmd_sb_occ_snapshot(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_OCC_SNAPSHOT,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, DL_OPT_SB);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_sb_occ_clearmax(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_OCC_MAX_CLEAR,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, DL_OPT_SB);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_sb_occ(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_sb_help();
+               return 0;
+       } else if (dl_argv_match(dl, "show") ||
+                  dl_argv_match(dl, "list")) {
+               dl_arg_inc(dl);
+               return cmd_sb_occ_show(dl);
+       } else if (dl_argv_match(dl, "snapshot")) {
+               dl_arg_inc(dl);
+               return cmd_sb_occ_snapshot(dl);
+       } else if (dl_argv_match(dl, "clearmax")) {
+               dl_arg_inc(dl);
+               return cmd_sb_occ_clearmax(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static int cmd_sb(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help")) {
+               cmd_sb_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_sb_show(dl);
+       } else if (dl_argv_match(dl, "pool")) {
+               dl_arg_inc(dl);
+               return cmd_sb_pool(dl);
+       } else if (dl_argv_match(dl, "port")) {
+               dl_arg_inc(dl);
+               return cmd_sb_port(dl);
+       } else if (dl_argv_match(dl, "tc")) {
+               dl_arg_inc(dl);
+               return cmd_sb_tc(dl);
+       } else if (dl_argv_match(dl, "occupancy")) {
+               dl_arg_inc(dl);
+               return cmd_sb_occ(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static const char *cmd_name(uint8_t cmd)
+{
+       switch (cmd) {
+       case DEVLINK_CMD_UNSPEC: return "unspec";
+       case DEVLINK_CMD_GET: return "get";
+       case DEVLINK_CMD_SET: return "set";
+       case DEVLINK_CMD_NEW: return "new";
+       case DEVLINK_CMD_DEL: return "del";
+       case DEVLINK_CMD_PORT_GET: return "get";
+       case DEVLINK_CMD_PORT_SET: return "set";
+       case DEVLINK_CMD_PORT_NEW: return "net";
+       case DEVLINK_CMD_PORT_DEL: return "del";
+       default: return "<unknown cmd>";
+       }
+}
+
+static const char *cmd_obj(uint8_t cmd)
+{
+       switch (cmd) {
+       case DEVLINK_CMD_UNSPEC: return "unspec";
+       case DEVLINK_CMD_GET:
+       case DEVLINK_CMD_SET:
+       case DEVLINK_CMD_NEW:
+       case DEVLINK_CMD_DEL:
+               return "dev";
+       case DEVLINK_CMD_PORT_GET:
+       case DEVLINK_CMD_PORT_SET:
+       case DEVLINK_CMD_PORT_NEW:
+       case DEVLINK_CMD_PORT_DEL:
+               return "port";
+       default: return "<unknown obj>";
+       }
+}
+
+static void pr_out_mon_header(uint8_t cmd)
+{
+       pr_out("[%s,%s] ", cmd_obj(cmd), cmd_name(cmd));
+}
+
+static bool cmd_filter_check(struct dl *dl, uint8_t cmd)
+{
+       const char *obj = cmd_obj(cmd);
+       unsigned int index = 0;
+       const char *cur_obj;
+
+       if (dl_no_arg(dl))
+               return true;
+       while ((cur_obj = dl_argv_index(dl, index++))) {
+               if (strcmp(cur_obj, obj) == 0 || strcmp(cur_obj, "all") == 0)
+                       return true;
+       }
+       return false;
+}
+
+static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct dl *dl = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       uint8_t cmd = genl->cmd;
+
+       if (!cmd_filter_check(dl, cmd))
+               return MNL_CB_OK;
+
+       switch (cmd) {
+       case DEVLINK_CMD_GET: /* fall through */
+       case DEVLINK_CMD_SET: /* fall through */
+       case DEVLINK_CMD_NEW: /* fall through */
+       case DEVLINK_CMD_DEL:
+               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_dev(tb);
+               break;
+       case DEVLINK_CMD_PORT_GET: /* fall through */
+       case DEVLINK_CMD_PORT_SET: /* fall through */
+       case DEVLINK_CMD_PORT_NEW: /* fall through */
+       case DEVLINK_CMD_PORT_DEL:
+               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+                   !tb[DEVLINK_ATTR_PORT_INDEX])
+                       return MNL_CB_ERROR;
+               pr_out_mon_header(genl->cmd);
+               pr_out_port(tb);
+               break;
+       }
+       return MNL_CB_OK;
+}
+
+static int cmd_mon_show(struct dl *dl)
+{
+       int err;
+       unsigned int index = 0;
+       const char *cur_obj;
+
+       while ((cur_obj = dl_argv_index(dl, index++))) {
                if (strcmp(cur_obj, "all") != 0 &&
                    strcmp(cur_obj, "dev") != 0 &&
                    strcmp(cur_obj, "port") != 0) {
@@ -985,7 +2011,7 @@ static int cmd_mon(struct dl *dl)
 static void help(void)
 {
        pr_out("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
-              "where  OBJECT := { dev | port | monitor }\n"
+              "where  OBJECT := { dev | port | sb | monitor }\n"
               "       OPTIONS := { -V[ersion] | -n[no-nice-names] }\n");
 }
 
@@ -1000,6 +2026,9 @@ static int dl_cmd(struct dl *dl)
        } else if (dl_argv_match(dl, "port")) {
                dl_arg_inc(dl);
                return cmd_port(dl);
+       } else if (dl_argv_match(dl, "sb")) {
+               dl_arg_inc(dl);
+               return cmd_sb(dl);
        } else if (dl_argv_match(dl, "monitor")) {
                dl_arg_inc(dl);
                return cmd_mon(dl);
index 0f5d6f5494db85c51ac05e0c86a25230bfb08e4b..5e4d3739ab5a70228e43e184ede052507db1def2 100644 (file)
@@ -92,6 +92,7 @@ enum bpf_prog_type {
        BPF_PROG_TYPE_KPROBE,
        BPF_PROG_TYPE_SCHED_CLS,
        BPF_PROG_TYPE_SCHED_ACT,
+       BPF_PROG_TYPE_TRACEPOINT,
 };
 
 #define BPF_PSEUDO_MAP_FD      1
@@ -346,6 +347,10 @@ enum bpf_func_id {
 #define BPF_F_ZERO_CSUM_TX             (1ULL << 1)
 #define BPF_F_DONT_FRAGMENT            (1ULL << 2)
 
+/* BPF_FUNC_perf_event_output flags. */
+#define BPF_F_INDEX_MASK               0xffffffffULL
+#define BPF_F_CURRENT_CPU              BPF_F_INDEX_MASK
+
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */
@@ -365,6 +370,8 @@ struct __sk_buff {
        __u32 cb[5];
        __u32 hash;
        __u32 tc_classid;
+       __u32 data;
+       __u32 data_end;
 };
 
 struct bpf_tunnel_key {
index a96e1a0e54a6b3a07a3d153ee778c7699d5dfbfa..0e21d001f879b8e59fc3faa975c00b475a3c763f 100644 (file)
@@ -33,6 +33,30 @@ enum devlink_command {
        DEVLINK_CMD_PORT_SPLIT,
        DEVLINK_CMD_PORT_UNSPLIT,
 
+       DEVLINK_CMD_SB_GET,             /* can dump */
+       DEVLINK_CMD_SB_SET,
+       DEVLINK_CMD_SB_NEW,
+       DEVLINK_CMD_SB_DEL,
+
+       DEVLINK_CMD_SB_POOL_GET,        /* can dump */
+       DEVLINK_CMD_SB_POOL_SET,
+       DEVLINK_CMD_SB_POOL_NEW,
+       DEVLINK_CMD_SB_POOL_DEL,
+
+       DEVLINK_CMD_SB_PORT_POOL_GET,   /* can dump */
+       DEVLINK_CMD_SB_PORT_POOL_SET,
+       DEVLINK_CMD_SB_PORT_POOL_NEW,
+       DEVLINK_CMD_SB_PORT_POOL_DEL,
+
+       DEVLINK_CMD_SB_TC_POOL_BIND_GET,        /* can dump */
+       DEVLINK_CMD_SB_TC_POOL_BIND_SET,
+       DEVLINK_CMD_SB_TC_POOL_BIND_NEW,
+       DEVLINK_CMD_SB_TC_POOL_BIND_DEL,
+
+       /* Shared buffer occupancy monitoring commands */
+       DEVLINK_CMD_SB_OCC_SNAPSHOT,
+       DEVLINK_CMD_SB_OCC_MAX_CLEAR,
+
        /* add new commands above here */
 
        __DEVLINK_CMD_MAX,
@@ -46,6 +70,31 @@ enum devlink_port_type {
        DEVLINK_PORT_TYPE_IB,
 };
 
+enum devlink_sb_pool_type {
+       DEVLINK_SB_POOL_TYPE_INGRESS,
+       DEVLINK_SB_POOL_TYPE_EGRESS,
+};
+
+/* static threshold - limiting the maximum number of bytes.
+ * dynamic threshold - limiting the maximum number of bytes
+ *   based on the currently available free space in the shared buffer pool.
+ *   In this mode, the maximum quota is calculated based
+ *   on the following formula:
+ *     max_quota = alpha / (1 + alpha) * Free_Buffer
+ *   While Free_Buffer is the amount of none-occupied buffer associated to
+ *   the relevant pool.
+ *   The value range which can be passed is 0-20 and serves
+ *   for computation of alpha by following formula:
+ *     alpha = 2 ^ (passed_value - 10)
+ */
+
+enum devlink_sb_threshold_type {
+       DEVLINK_SB_THRESHOLD_TYPE_STATIC,
+       DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC,
+};
+
+#define DEVLINK_SB_THRESHOLD_TO_ALPHA_MAX 20
+
 enum devlink_attr {
        /* don't change the order or add anything between, this is ABI! */
        DEVLINK_ATTR_UNSPEC,
@@ -62,6 +111,20 @@ enum devlink_attr {
        DEVLINK_ATTR_PORT_IBDEV_NAME,           /* string */
        DEVLINK_ATTR_PORT_SPLIT_COUNT,          /* u32 */
        DEVLINK_ATTR_PORT_SPLIT_GROUP,          /* u32 */
+       DEVLINK_ATTR_SB_INDEX,                  /* u32 */
+       DEVLINK_ATTR_SB_SIZE,                   /* u32 */
+       DEVLINK_ATTR_SB_INGRESS_POOL_COUNT,     /* u16 */
+       DEVLINK_ATTR_SB_EGRESS_POOL_COUNT,      /* u16 */
+       DEVLINK_ATTR_SB_INGRESS_TC_COUNT,       /* u16 */
+       DEVLINK_ATTR_SB_EGRESS_TC_COUNT,        /* u16 */
+       DEVLINK_ATTR_SB_POOL_INDEX,             /* u16 */
+       DEVLINK_ATTR_SB_POOL_TYPE,              /* u8 */
+       DEVLINK_ATTR_SB_POOL_SIZE,              /* u32 */
+       DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE,    /* u8 */
+       DEVLINK_ATTR_SB_THRESHOLD,              /* u32 */
+       DEVLINK_ATTR_SB_TC_INDEX,               /* u16 */
+       DEVLINK_ATTR_SB_OCC_CUR,                /* u32 */
+       DEVLINK_ATTR_SB_OCC_MAX,                /* u32 */
 
        /* add new attributes above here, update the policy in devlink.c */
 
index 96161b8202b5d026ed39904f15a899659fc39adb..620c8a5ddc0003cb785c1dceb365586b336c763c 100644 (file)
@@ -49,6 +49,7 @@ enum {
        FRA_TABLE,      /* Extended table id */
        FRA_FWMASK,     /* mask for netfilter mark */
        FRA_OIFNAME,
+       FRA_PAD,
        __FRA_MAX
 };
 
index 6487317ea619c41d4ea662f1162417fa6c6e947f..52deccc2128eeb955b412aeef5bdb0ed8098d5f8 100644 (file)
@@ -10,6 +10,7 @@ enum {
        TCA_STATS_QUEUE,
        TCA_STATS_APP,
        TCA_STATS_RATE_EST64,
+       TCA_STATS_PAD,
        __TCA_STATS_MAX,
 };
 #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)
index 8de96b7a7dbf146281c556e76379e22c2297ed56..fc3dcfa463d03e412223c466d7fd124141243619 100644 (file)
@@ -134,6 +134,16 @@ struct bridge_vlan_info {
        __u16 vid;
 };
 
+struct bridge_vlan_xstats {
+       __u64 rx_bytes;
+       __u64 rx_packets;
+       __u64 tx_bytes;
+       __u64 tx_packets;
+       __u16 vid;
+       __u16 pad1;
+       __u32 pad2;
+};
+
 /* Bridge multicast database attributes
  * [MDBA_MDB] = {
  *     [MDBA_MDB_ENTRY] = {
@@ -233,4 +243,12 @@ enum {
 };
 #define MDBA_SET_ENTRY_MAX (__MDBA_SET_ENTRY_MAX - 1)
 
+/* Embedded inside LINK_XSTATS_TYPE_BRIDGE */
+enum {
+       BRIDGE_XSTATS_UNSPEC,
+       BRIDGE_XSTATS_VLAN,
+       __BRIDGE_XSTATS_MAX
+};
+#define BRIDGE_XSTATS_MAX (__BRIDGE_XSTATS_MAX - 1)
+
 #endif /* _LINUX_IF_BRIDGE_H */
index 8f3b0f40ee26f26d9b88c5b6af296d57303a4e25..c396f3179e2cce44c62e8963cc45f26237a894e7 100644 (file)
@@ -92,6 +92,7 @@
 #define ETH_P_TDLS     0x890D          /* TDLS */
 #define ETH_P_FIP      0x8914          /* FCoE Initialization Protocol */
 #define ETH_P_80221    0x8917          /* IEEE 802.21 Media Independent Handover Protocol */
+#define ETH_P_HSR      0x892F          /* IEC 62439-3 HSRv1    */
 #define ETH_P_LOOPBACK 0x9000          /* Ethernet loopback packet, per IEEE 802.3 */
 #define ETH_P_QINQ1    0x9100          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ2    0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
index 6a688e8c6fb4f0e071402d3adb852eac6c210c28..15bbeb818f678fab68095de9e2062bfd7b3e13a3 100644 (file)
@@ -155,6 +155,7 @@ enum {
        IFLA_PROTO_DOWN,
        IFLA_GSO_MAX_SEGS,
        IFLA_GSO_MAX_SIZE,
+       IFLA_PAD,
        __IFLA_MAX
 };
 
@@ -268,6 +269,8 @@ enum {
        IFLA_BR_NF_CALL_IP6TABLES,
        IFLA_BR_NF_CALL_ARPTABLES,
        IFLA_BR_VLAN_DEFAULT_PVID,
+       IFLA_BR_PAD,
+       IFLA_BR_VLAN_STATS_ENABLED,
        __IFLA_BR_MAX,
 };
 
@@ -310,6 +313,7 @@ enum {
        IFLA_BRPORT_HOLD_TIMER,
        IFLA_BRPORT_FLUSH,
        IFLA_BRPORT_MULTICAST_ROUTER,
+       IFLA_BRPORT_PAD,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -429,6 +433,7 @@ enum {
        IFLA_MACSEC_SCB,
        IFLA_MACSEC_REPLAY_PROTECT,
        IFLA_MACSEC_VALIDATION,
+       IFLA_MACSEC_PAD,
        __IFLA_MACSEC_MAX,
 };
 
@@ -486,6 +491,7 @@ enum {
        IFLA_VXLAN_REMCSUM_NOPARTIAL,
        IFLA_VXLAN_COLLECT_METADATA,
        IFLA_VXLAN_LABEL,
+       IFLA_VXLAN_GPE,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
@@ -513,6 +519,24 @@ enum {
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)
 
+/* PPP section */
+enum {
+       IFLA_PPP_UNSPEC,
+       IFLA_PPP_DEV_FD,
+       __IFLA_PPP_MAX
+};
+#define IFLA_PPP_MAX (__IFLA_PPP_MAX - 1)
+
+/* GTP section */
+enum {
+       IFLA_GTP_UNSPEC,
+       IFLA_GTP_FD0,
+       IFLA_GTP_FD1,
+       IFLA_GTP_PDP_HASHSIZE,
+       __IFLA_GTP_MAX,
+};
+#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
+
 /* Bonding section */
 
 enum {
@@ -662,6 +686,7 @@ enum {
        IFLA_VF_STATS_TX_BYTES,
        IFLA_VF_STATS_BROADCAST,
        IFLA_VF_STATS_MULTICAST,
+       IFLA_VF_STATS_PAD,
        __IFLA_VF_STATS_MAX,
 };
 
@@ -772,9 +797,46 @@ enum {
        IFLA_HSR_MULTICAST_SPEC,        /* Last byte of supervision addr */
        IFLA_HSR_SUPERVISION_ADDR,      /* Supervision frame multicast addr */
        IFLA_HSR_SEQ_NR,
+       IFLA_HSR_VERSION,               /* HSR version */
        __IFLA_HSR_MAX,
 };
 
 #define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
 
+/* STATS section */
+
+struct if_stats_msg {
+       __u8  family;
+       __u8  pad1;
+       __u16 pad2;
+       __u32 ifindex;
+       __u32 filter_mask;
+};
+
+/* A stats attribute can be netdev specific or a global stat.
+ * For netdev stats, lets use the prefix IFLA_STATS_LINK_*
+ */
+enum {
+       IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
+       IFLA_STATS_LINK_64,
+       IFLA_STATS_LINK_XSTATS,
+       __IFLA_STATS_MAX,
+};
+
+#define IFLA_STATS_MAX (__IFLA_STATS_MAX - 1)
+
+#define IFLA_STATS_FILTER_BIT(ATTR)    (1 << (ATTR - 1))
+
+/* These are embedded into IFLA_STATS_LINK_XSTATS:
+ * [IFLA_STATS_LINK_XSTATS]
+ * -> [LINK_XSTATS_TYPE_xxx]
+ *    -> [rtnl link type specific attributes]
+ */
+enum {
+       LINK_XSTATS_TYPE_UNSPEC,
+       LINK_XSTATS_TYPE_BRIDGE,
+       __LINK_XSTATS_TYPE_MAX
+};
+#define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
+
 #endif /* _LINUX_IF_LINK_H */
index 4f9e1deafc3da8b58c6e038ffd3221be4aa5f0c4..7e328d72c518fe5a62e10af6c55cbb9663fbbd61 100644 (file)
@@ -14,6 +14,8 @@ enum {
        ILA_ATTR_LOCATOR_MATCH,                 /* u64 */
        ILA_ATTR_IFINDEX,                       /* s32 */
        ILA_ATTR_DIR,                           /* u32 */
+       ILA_ATTR_PAD,
+       ILA_ATTR_CSUM_MODE,                     /* u8 */
 
        __ILA_ATTR_MAX,
 };
@@ -34,4 +36,10 @@ enum {
 #define ILA_DIR_IN     (1 << 0)
 #define ILA_DIR_OUT    (1 << 1)
 
+enum {
+       ILA_CSUM_ADJUST_TRANSPORT,
+       ILA_CSUM_NEUTRAL_MAP,
+       ILA_CSUM_NO_ACTION,
+};
+
 #endif /* _LINUX_ILA_H */
index 1db41168810619363849814c83785b27966a0277..07e486cb2f4cc61b093065d84c60a996088b700d 100644 (file)
@@ -113,9 +113,13 @@ enum {
        INET_DIAG_DCTCPINFO,
        INET_DIAG_PROTOCOL,  /* response attribute only */
        INET_DIAG_SKV6ONLY,
+       INET_DIAG_LOCALS,
+       INET_DIAG_PEERS,
+       INET_DIAG_PAD,
+       __INET_DIAG_MAX,
 };
 
-#define INET_DIAG_MAX INET_DIAG_SKV6ONLY
+#define INET_DIAG_MAX (__INET_DIAG_MAX - 1)
 
 /* INET_DIAG_MEM */
 
index 5b0e36d0f62b99a922da2796da56f3239a6d9c32..f00e4248b0e0b82790b4aaad7c59cb0558dbe186 100644 (file)
@@ -124,6 +124,7 @@ enum {
        L2TP_ATTR_IP6_DADDR,            /* struct in6_addr */
        L2TP_ATTR_UDP_ZERO_CSUM6_TX,    /* u8 */
        L2TP_ATTR_UDP_ZERO_CSUM6_RX,    /* u8 */
+       L2TP_ATTR_PAD,
        __L2TP_ATTR_MAX,
 };
 
@@ -140,6 +141,7 @@ enum {
        L2TP_ATTR_RX_SEQ_DISCARDS,      /* u64 */
        L2TP_ATTR_RX_OOS_PACKETS,       /* u64 */
        L2TP_ATTR_RX_ERRORS,            /* u64 */
+       L2TP_ATTR_STATS_PAD,
        __L2TP_ATTR_STATS_MAX,
 };
 
index 1d2f4f6ccda8c71a9df7ed50f26c69293e90620e..7cea3cbfa1289612f92a0f1ded578a848ecb8a52 100644 (file)
@@ -22,6 +22,7 @@ enum lwtunnel_ip_t {
        LWTUNNEL_IP_TTL,
        LWTUNNEL_IP_TOS,
        LWTUNNEL_IP_FLAGS,
+       LWTUNNEL_IP_PAD,
        __LWTUNNEL_IP_MAX,
 };
 
@@ -35,6 +36,7 @@ enum lwtunnel_ip6_t {
        LWTUNNEL_IP6_HOPLIMIT,
        LWTUNNEL_IP6_TC,
        LWTUNNEL_IP6_FLAGS,
+       LWTUNNEL_IP6_PAD,
        __LWTUNNEL_IP6_MAX,
 };
 
index 788655bfa0f3001d549e90c8fe5dd811600e3a98..bd99a8d80f36e527094f05ceabb55c21ea004ae7 100644 (file)
@@ -128,6 +128,7 @@ enum {
        NDTPA_LOCKTIME,                 /* u64, msecs */
        NDTPA_QUEUE_LENBYTES,           /* u32 */
        NDTPA_MCAST_REPROBES,           /* u32 */
+       NDTPA_PAD,
        __NDTPA_MAX
 };
 #define NDTPA_MAX (__NDTPA_MAX - 1)
@@ -160,6 +161,7 @@ enum {
        NDTA_PARMS,                     /* nested TLV NDTPA_* */
        NDTA_STATS,                     /* struct ndt_stats, read-only */
        NDTA_GC_INTERVAL,               /* u64, msecs */
+       NDTA_PAD,
        __NDTA_MAX
 };
 #define NDTA_MAX (__NDTA_MAX - 1)
index b69358b4890d42238a02a94597554e5ada46dbb2..036283214a44bf7e3915286e52f649557285853f 100644 (file)
@@ -12,6 +12,7 @@ enum {
        TCA_ACT_OPTIONS,
        TCA_ACT_INDEX,
        TCA_ACT_STATS,
+       TCA_ACT_PAD,
        __TCA_ACT_MAX
 };
 
@@ -119,6 +120,7 @@ enum {
        TCA_U32_PCNT,
        TCA_U32_MARK,
        TCA_U32_FLAGS,
+       TCA_U32_PAD,
        __TCA_U32_MAX
 };
 
index 8cb18b44968ea5fa49872a934093f28b128604a4..2382eed502783c23cf6f6dca8a4cca6157480d20 100644 (file)
@@ -179,6 +179,7 @@ enum {
        TCA_TBF_PRATE64,
        TCA_TBF_BURST,
        TCA_TBF_PBURST,
+       TCA_TBF_PAD,
        __TCA_TBF_MAX,
 };
 
@@ -368,6 +369,7 @@ enum {
        TCA_HTB_DIRECT_QLEN,
        TCA_HTB_RATE64,
        TCA_HTB_CEIL64,
+       TCA_HTB_PAD,
        __TCA_HTB_MAX,
 };
 
@@ -531,6 +533,7 @@ enum {
        TCA_NETEM_RATE,
        TCA_NETEM_ECN,
        TCA_NETEM_RATE64,
+       TCA_NETEM_PAD,
        __TCA_NETEM_MAX,
 };
 
@@ -715,6 +718,8 @@ enum {
        TCA_FQ_CODEL_FLOWS,
        TCA_FQ_CODEL_QUANTUM,
        TCA_FQ_CODEL_CE_THRESHOLD,
+       TCA_FQ_CODEL_DROP_BATCH_SIZE,
+       TCA_FQ_CODEL_MEMORY_LIMIT,
        __TCA_FQ_CODEL_MAX
 };
 
@@ -739,6 +744,8 @@ struct tc_fq_codel_qd_stats {
        __u32   new_flows_len;  /* count of flows in new list */
        __u32   old_flows_len;  /* count of flows in old list */
        __u32   ce_mark;        /* packets above ce_threshold */
+       __u32   memory_usage;   /* in bytes */
+       __u32   drop_overmemory;
 };
 
 struct tc_fq_codel_cl_stats {
index 6aaa2a3e3c0a35d59b33fd8aec0de23809070494..2d2e3e6c5b81373c9f086f6c35dd523742d519fb 100644 (file)
@@ -139,6 +139,11 @@ enum {
        RTM_GETNSID = 90,
 #define RTM_GETNSID RTM_GETNSID
 
+       RTM_NEWSTATS = 92,
+#define RTM_NEWSTATS RTM_NEWSTATS
+       RTM_GETSTATS = 94,
+#define RTM_GETSTATS RTM_GETSTATS
+
        __RTM_MAX,
 #define RTM_MAX                (((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -312,6 +317,7 @@ enum rtattr_type_t {
        RTA_ENCAP_TYPE,
        RTA_ENCAP,
        RTA_EXPIRES,
+       RTA_PAD,
        __RTA_MAX
 };
 
@@ -536,6 +542,7 @@ enum {
        TCA_FCNT,
        TCA_STATS2,
        TCA_STAB,
+       TCA_PAD,
        __TCA_MAX
 };
 
index dafcb891a5ea0fd9a2cd6f18262bbbdc325d6837..901231e64896382c879152040a5c7729df72d351 100644 (file)
@@ -20,6 +20,7 @@ enum {
        SK_MEMINFO_WMEM_QUEUED,
        SK_MEMINFO_OPTMEM,
        SK_MEMINFO_BACKLOG,
+       SK_MEMINFO_DROPS,
 
        SK_MEMINFO_VARS,
 };
index 07f17cc70bb3ee2f8ca7667221679b67f09c3cc6..063d9d465119b2519f87aa4e31961311acf026e0 100644 (file)
@@ -26,6 +26,7 @@ enum {
        TCA_ACT_BPF_OPS,
        TCA_ACT_BPF_FD,
        TCA_ACT_BPF_NAME,
+       TCA_ACT_BPF_PAD,
        __TCA_ACT_BPF_MAX,
 };
 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)
index 994b0971bce2102433b4675270dd77a69fbb5bb6..62a5e944c55485270820d36187adb6cb4d5c5b28 100644 (file)
@@ -15,6 +15,7 @@ enum {
        TCA_CONNMARK_UNSPEC,
        TCA_CONNMARK_PARMS,
        TCA_CONNMARK_TM,
+       TCA_CONNMARK_PAD,
        __TCA_CONNMARK_MAX
 };
 #define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)
index a047c49a31531e0df45d29943216689795746584..8ac8041ab5f134b74391f5470cef16f3f435ed1c 100644 (file)
@@ -10,6 +10,7 @@ enum {
        TCA_CSUM_UNSPEC,
        TCA_CSUM_PARMS,
        TCA_CSUM_TM,
+       TCA_CSUM_PAD,
        __TCA_CSUM_MAX
 };
 #define TCA_CSUM_MAX (__TCA_CSUM_MAX - 1)
index 17dddb40f74043e40ac09e36e15c925c5aa13df0..d2a3abb77aebdef99a9166e60b95a982f06a74f4 100644 (file)
@@ -12,6 +12,7 @@ enum {
        TCA_DEF_TM,
        TCA_DEF_PARMS,
        TCA_DEF_DATA,
+       TCA_DEF_PAD,
        __TCA_DEF_MAX
 };
 #define TCA_DEF_MAX (__TCA_DEF_MAX - 1)
index f7bf94eed510d47dec8355939b9fc41f5ee625f6..70b536a8f8b260746faecdb14ffa322f0db5ad1c 100644 (file)
@@ -25,6 +25,7 @@ enum {
        TCA_GACT_TM,
        TCA_GACT_PARMS,
        TCA_GACT_PROB,
+       TCA_GACT_PAD,
        __TCA_GACT_MAX
 };
 #define TCA_GACT_MAX (__TCA_GACT_MAX - 1)
index 130aaadf6fac9bf419c6ff13c7adae05c34f9b4c..7c6e155dd981d17a9fade88994eb82331a4309a8 100644 (file)
@@ -14,6 +14,7 @@ enum {
        TCA_IPT_CNT,
        TCA_IPT_TM,
        TCA_IPT_TARG,
+       TCA_IPT_PAD,
        __TCA_IPT_MAX
 };
 #define TCA_IPT_MAX (__TCA_IPT_MAX - 1)
index 7561750e8fd69b92e1e1a4929e25ec8709d74ce2..3d7a2b352a62c3dfeb0f077c6207a93d8834481d 100644 (file)
@@ -20,6 +20,7 @@ enum {
        TCA_MIRRED_UNSPEC,
        TCA_MIRRED_TM,
        TCA_MIRRED_PARMS,
+       TCA_MIRRED_PAD,
        __TCA_MIRRED_MAX
 };
 #define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)
index 6663aeba0b9a78fd1c76816c8540fdfa4d0ee747..923457c9ebf0caf761bc24c897ba8a20f38e8c22 100644 (file)
@@ -10,6 +10,7 @@ enum {
        TCA_NAT_UNSPEC,
        TCA_NAT_PARMS,
        TCA_NAT_TM,
+       TCA_NAT_PAD,
        __TCA_NAT_MAX
 };
 #define TCA_NAT_MAX (__TCA_NAT_MAX - 1)
index 716cfabcd5b2fa6064588b118b7721f29477bf30..6389959a5157cf1f43338a3742093f66b14b564e 100644 (file)
@@ -10,6 +10,7 @@ enum {
        TCA_PEDIT_UNSPEC,
        TCA_PEDIT_TM,
        TCA_PEDIT_PARMS,
+       TCA_PEDIT_PAD,
        __TCA_PEDIT_MAX
 };
 #define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)
index 7a2e910a5f0836e0ab92db331acef7780fb2029e..fecb5cc48c40667a5b75d7c06158d91443a11862 100644 (file)
@@ -39,6 +39,7 @@ enum {
        TCA_SKBEDIT_PRIORITY,
        TCA_SKBEDIT_QUEUE_MAPPING,
        TCA_SKBEDIT_MARK,
+       TCA_SKBEDIT_PAD,
        __TCA_SKBEDIT_MAX
 };
 #define TCA_SKBEDIT_MAX (__TCA_SKBEDIT_MAX - 1)
index f7b8d448b9603f9b1154472911f5a4b8ba663a54..31151ff6264f5ca966691c4ad0008c6b09cfe71a 100644 (file)
@@ -28,6 +28,7 @@ enum {
        TCA_VLAN_PARMS,
        TCA_VLAN_PUSH_VLAN_ID,
        TCA_VLAN_PUSH_VLAN_PROTOCOL,
+       TCA_VLAN_PAD,
        __TCA_VLAN_MAX,
 };
 #define TCA_VLAN_MAX (__TCA_VLAN_MAX - 1)
index 93533926035ca8d18e08f04eac3adacfcb266d8d..80ad90d0cfc23b0a67b4c6639eaf6df1d2abca25 100644 (file)
@@ -40,6 +40,7 @@ enum {
        TCP_METRICS_ATTR_FOPEN_COOKIE,          /* binary */
        TCP_METRICS_ATTR_SADDR_IPV4,            /* u32 */
        TCP_METRICS_ATTR_SADDR_IPV6,            /* binary */
+       TCP_METRICS_ATTR_PAD,
 
        __TCP_METRICS_ATTR_MAX,
 };
index b8f54510df076f3a87bd28f0bf1690b13e72e513..d09be24e053ffcde4ce8c15deb71e858c5833831 100644 (file)
@@ -302,6 +302,7 @@ enum xfrm_attr_type_t {
        XFRMA_SA_EXTRA_FLAGS,   /* __u32 */
        XFRMA_PROTO,            /* __u8 */
        XFRMA_ADDRESS_FILTER,   /* struct xfrm_address_filter */
+       XFRMA_PAD,
        __XFRMA_MAX
 
 #define XFRMA_MAX (__XFRMA_MAX - 1)
index e3bbea0031df69d57a07ccddcb695a82b665b59b..49a40befa5d587b69ce7d50aa2e20a3f1bcdbcfb 100644 (file)
@@ -31,7 +31,7 @@ static void print_explain(FILE *f)
        fprintf(f, "                 [ ageing SECONDS ] [ maxaddress NUMBER ]\n");
        fprintf(f, "                 [ [no]udpcsum ] [ [no]udp6zerocsumtx ] [ [no]udp6zerocsumrx ]\n");
        fprintf(f, "                 [ [no]remcsumtx ] [ [no]remcsumrx ]\n");
-       fprintf(f, "                 [ [no]external ] [ gbp ]\n");
+       fprintf(f, "                 [ [no]external ] [ gbp ] [ gpe ]\n");
        fprintf(f, "\n");
        fprintf(f, "Where: VNI   := 0-16777215\n");
        fprintf(f, "       ADDR  := { IP_ADDRESS | any }\n");
@@ -79,6 +79,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
        __u8 remcsumrx = 0;
        __u8 metadata = 0;
        __u8 gbp = 0;
+       __u8 gpe = 0;
        int dst_port_set = 0;
        struct ifla_vxlan_port_range range = { 0, 0 };
 
@@ -234,10 +235,13 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
                        remcsumrx = 0;
                } else if (!matches(*argv, "external")) {
                        metadata = 1;
+                       learning = 0;
                } else if (!matches(*argv, "noexternal")) {
                        metadata = 0;
                } else if (!matches(*argv, "gbp")) {
                        gbp = 1;
+               } else if (!matches(*argv, "gpe")) {
+                       gpe = 1;
                } else if (matches(*argv, "help") == 0) {
                        explain();
                        return -1;
@@ -266,7 +270,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
                return -1;
        }
 
-       if (!dst_port_set) {
+       if (!dst_port_set && gpe) {
+               dstport = 4790;
+       } else if (!dst_port_set) {
                fprintf(stderr, "vxlan: destination port not specified\n"
                        "Will use Linux kernel default (non-standard value)\n");
                fprintf(stderr,
@@ -323,6 +329,8 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 
        if (gbp)
                addattr_l(n, 1024, IFLA_VXLAN_GBP, NULL, 0);
+       if (gpe)
+               addattr_l(n, 1024, IFLA_VXLAN_GPE, NULL, 0);
 
 
        return 0;
@@ -489,6 +497,8 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
        if (tb[IFLA_VXLAN_GBP])
                fputs("gbp ", f);
+       if (tb[IFLA_VXLAN_GPE])
+               fputs("gpe ", f);
 }
 
 static void vxlan_print_help(struct link_util *lu, int argc, char **argv,
index 805511423ef2bfa0ad0e7115c27f7ab57ee81fc7..984fb2eb0d63af4bdf2854a4a90b315e285df343 100644 (file)
@@ -422,7 +422,11 @@ the following additional arguments are supported:
 ] [
 .BI maxaddress " NUMBER "
 ] [
+.RI "[no]external "
+] [
 .B gbp
+] [
+.B gpe
 ]
 
 .in +8
@@ -515,6 +519,12 @@ are entered into the VXLAN device forwarding database.
 .BI maxaddress " NUMBER"
 - specifies the maximum number of FDB entries.
 
+.sp
+.I [no]external
+- specifies whether an external control plane
+.RB "(e.g. " "ip route encap" )
+or the internal FDB should be used.
+
 .sp
 .B gbp
 - enables the Group Policy extension (VXLAN-GBP).
@@ -558,6 +568,13 @@ Example:
 
 .in -4
 
+.sp
+.B gpe
+- enables the Generic Protocol extension (VXLAN-GPE). Currently, this is
+only supported together with the
+.B external
+keyword.
+
 .in -8
 
 .TP
index 5cda728a2db5a4a91dfd864b44aad6abdfdc657d..23fff19d91993b85f7c64f0109dc4f85f9f6e6e7 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1905,6 +1905,10 @@ static void print_skmeminfo(struct rtattr *tb[], int attrtype)
                (SK_MEMINFO_BACKLOG + 1) * sizeof(__u32))
                printf(",bl%u", skmeminfo[SK_MEMINFO_BACKLOG]);
 
+       if (RTA_PAYLOAD(tb[attrtype]) >=
+               (SK_MEMINFO_DROPS + 1) * sizeof(__u32))
+               printf(",d%u", skmeminfo[SK_MEMINFO_DROPS]);
+
        printf(")");
 }
 
index 0c05dbd3350c10a027a7e0b7e49a19fc42ca4412..e2a1a7100c3086d178e30b30d887177c662ae70d 100644 (file)
@@ -18,7 +18,6 @@ static int clsact_parse_opt(struct qdisc_util *qu, int argc, char **argv,
                return -1;
        }
 
-       addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
        return 0;
 }
 
index c3c9b4031d548d7228976f4a454e4a01e43863ab..31699a81f3fdaa0c373b27f4fc0548b126880c78 100644 (file)
@@ -34,7 +34,6 @@ static int ingress_parse_opt(struct qdisc_util *qu, int argc, char **argv,
                }
        }
 
-       addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);
        return 0;
 }