]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - devlink/devlink.c
devlink: Add support for special format protocol headers
[mirror_iproute2.git] / devlink / devlink.c
index e2e04136cb3e62dfdf94d385360c32471469d0b5..b87de383aa3bb0fe8202282724007af892e9017b 100644 (file)
 #include "SNAPSHOT.h"
 #include "list.h"
 #include "mnlg.h"
+#include "json_writer.h"
+#include "utils.h"
+
+#define ESWITCH_MODE_LEGACY "legacy"
+#define ESWITCH_MODE_SWITCHDEV "switchdev"
+#define ESWITCH_INLINE_MODE_NONE "none"
+#define ESWITCH_INLINE_MODE_LINK "link"
+#define ESWITCH_INLINE_MODE_NETWORK "network"
+#define ESWITCH_INLINE_MODE_TRANSPORT "transport"
 
 #define pr_err(args...) fprintf(stderr, ##args)
-#define pr_out(args...) fprintf(stdout, ##args)
+#define pr_out(args...)                                                \
+       do {                                                    \
+               if (g_indent_newline) {                         \
+                       fprintf(stdout, "%s", g_indent_str);    \
+                       g_indent_newline = false;               \
+               }                                               \
+               fprintf(stdout, ##args);                        \
+       } while (0)
+
+#define pr_out_sp(num, args...)                                        \
+       do {                                                    \
+               int ret = fprintf(stdout, ##args);              \
+               if (ret < num)                                  \
+                       fprintf(stdout, "%*s", num - ret, "");  \
+       } while (0)
+
+static int g_indent_level;
+static bool g_indent_newline;
+#define INDENT_STR_STEP 2
+#define INDENT_STR_MAXLEN 32
+static char g_indent_str[INDENT_STR_MAXLEN + 1] = "";
+
+static void __pr_out_indent_inc(void)
+{
+       if (g_indent_level + INDENT_STR_STEP > INDENT_STR_MAXLEN)
+               return;
+       g_indent_level += INDENT_STR_STEP;
+       memset(g_indent_str, ' ', sizeof(g_indent_str));
+       g_indent_str[g_indent_level] = '\0';
+}
+
+static void __pr_out_indent_dec(void)
+{
+       if (g_indent_level - INDENT_STR_STEP < 0)
+               return;
+       g_indent_level -= INDENT_STR_STEP;
+       g_indent_str[g_indent_level] = '\0';
+}
+
+static void __pr_out_newline(void)
+{
+       pr_out("\n");
+       g_indent_newline = true;
+}
 
 static int _mnlg_socket_recv_run(struct mnlg_socket *nlg,
                                 mnl_cb_t data_cb, void *data)
@@ -109,11 +161,22 @@ static void ifname_map_free(struct ifname_map *ifname_map)
        free(ifname_map);
 }
 
-#define BIT(nr)                 (1UL << (nr))
 #define DL_OPT_HANDLE          BIT(0)
 #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)
+#define DL_OPT_ESWITCH_MODE    BIT(11)
+#define DL_OPT_ESWITCH_INLINE_MODE     BIT(12)
+#define DL_OPT_DPIPE_TABLE_NAME        BIT(13)
+#define DL_OPT_DPIPE_TABLE_COUNTERS    BIT(14)
+#define DL_OPT_ESWITCH_ENCAP_MODE      BIT(15)
 
 struct dl_opts {
        uint32_t present; /* flags of present items */
@@ -122,6 +185,18 @@ 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;
+       enum devlink_eswitch_mode eswitch_mode;
+       enum devlink_eswitch_inline_mode eswitch_inline_mode;
+       const char *dpipe_table_name;
+       bool dpipe_counters_enable;
+       bool eswitch_encap_mode;
 };
 
 struct dl {
@@ -131,6 +206,16 @@ struct dl {
        char **argv;
        bool no_nice_names;
        struct dl_opts opts;
+       json_writer_t *jw;
+       bool json_output;
+       bool pretty_output;
+       bool verbose;
+       struct {
+               bool present;
+               char *bus_name;
+               char *dev_name;
+               uint32_t port_index;
+       } arr_last;
 };
 
 static int dl_argc(struct dl *dl)
@@ -191,40 +276,78 @@ static bool dl_no_arg(struct dl *dl)
        return dl_argc(dl) == 0;
 }
 
+static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = {
+       [DEVLINK_ATTR_BUS_NAME] = MNL_TYPE_NUL_STRING,
+       [DEVLINK_ATTR_DEV_NAME] = MNL_TYPE_NUL_STRING,
+       [DEVLINK_ATTR_PORT_INDEX] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_PORT_TYPE] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_PORT_DESIRED_TYPE] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_PORT_NETDEV_IFINDEX] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_PORT_NETDEV_NAME] = MNL_TYPE_NUL_STRING,
+       [DEVLINK_ATTR_PORT_IBDEV_NAME] = MNL_TYPE_NUL_STRING,
+       [DEVLINK_ATTR_SB_INDEX] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_SB_SIZE] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_SB_INGRESS_POOL_COUNT] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_SB_EGRESS_POOL_COUNT] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_SB_INGRESS_TC_COUNT] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_SB_EGRESS_TC_COUNT] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_SB_POOL_INDEX] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_SB_POOL_TYPE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_SB_POOL_SIZE] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_SB_THRESHOLD] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_SB_TC_INDEX] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_SB_OCC_CUR] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_SB_OCC_MAX] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_ESWITCH_MODE] = MNL_TYPE_U16,
+       [DEVLINK_ATTR_ESWITCH_INLINE_MODE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_ESWITCH_ENCAP_MODE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_DPIPE_TABLES] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_TABLE] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_TABLE_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_DPIPE_TABLE_SIZE] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_DPIPE_TABLE_MATCHES] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_TABLE_ACTIONS] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED] =  MNL_TYPE_U8,
+       [DEVLINK_ATTR_DPIPE_ENTRIES] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_ENTRY] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_ENTRY_INDEX] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_ENTRY_COUNTER] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_DPIPE_MATCH] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_MATCH_VALUE] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_MATCH_TYPE] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_DPIPE_ACTION] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_ACTION_VALUE] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_ACTION_TYPE] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_DPIPE_VALUE_MAPPING] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_DPIPE_HEADERS] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_HEADER] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_HEADER_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_DPIPE_HEADER_ID] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_DPIPE_HEADER_FIELDS] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_HEADER_GLOBAL] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_DPIPE_HEADER_INDEX] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_DPIPE_FIELD] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_DPIPE_FIELD_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_DPIPE_FIELD_ID] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE] = MNL_TYPE_U32,
+};
+
 static int attr_cb(const struct nlattr *attr, void *data)
 {
        const struct nlattr **tb = data;
        int type;
 
-       type = mnl_attr_get_type(attr);
-
        if (mnl_attr_type_valid(attr, DEVLINK_ATTR_MAX) < 0)
                return MNL_CB_ERROR;
 
-       if (type == DEVLINK_ATTR_BUS_NAME &&
-           mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0)
-               return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_DEV_NAME &&
-           mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0)
-               return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_PORT_INDEX &&
-           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
-               return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_PORT_TYPE &&
-           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
-               return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_PORT_DESIRED_TYPE &&
-           mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
-               return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_PORT_NETDEV_IFINDEX &&
-           mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
-               return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_PORT_NETDEV_NAME &&
-           mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0)
-               return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_PORT_IBDEV_NAME &&
-           mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0)
+       type = mnl_attr_get_type(attr);
+       if (mnl_attr_validate(attr, devlink_policy[type]) < 0)
                return MNL_CB_ERROR;
+
        tb[type] = attr;
        return MNL_CB_OK;
 }
@@ -363,6 +486,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);
@@ -389,18 +526,26 @@ static int __dl_argv_handle_port(char *str,
                                 char **p_bus_name, char **p_dev_name,
                                 uint32_t *p_port_index)
 {
-       char *handlestr = handlestr;
-       char *portstr = portstr;
+       char *handlestr;
+       char *portstr;
        int err;
 
-       strslashrsplit(str, &handlestr, &portstr);
+       err = strslashrsplit(str, &handlestr, &portstr);
+       if (err) {
+               pr_err("Port identification \"%s\" is invalid\n", str);
+               return err;
+       }
        err = strtouint32_t(portstr, p_port_index);
        if (err) {
                pr_err("Port index \"%s\" is not a number or not within range\n",
                       portstr);
                return err;
        }
-       strslashrsplit(handlestr, p_bus_name, p_dev_name);
+       err = strslashrsplit(handlestr, p_bus_name, p_dev_name);
+       if (err) {
+               pr_err("Port identification \"%s\" is invalid\n", str);
+               return err;
+       }
        return 0;
 }
 
@@ -430,19 +575,18 @@ static int dl_argv_handle_port(struct dl *dl, char **p_bus_name,
                return -EINVAL;
        }
        slash_count = strslashcount(str);
-       if (slash_count != 2 && slash_count != 0) {
+       switch (slash_count) {
+       case 0:
+               return __dl_argv_handle_port_ifname(dl, str, p_bus_name,
+                                                   p_dev_name, p_port_index);
+       case 2:
+               return __dl_argv_handle_port(str, p_bus_name,
+                                            p_dev_name, p_port_index);
+       default:
                pr_err("Wrong port identification string format.\n");
                pr_err("Expected \"bus_name/dev_name/port_index\" or \"netdev_ifname\".\n");
                return -EINVAL;
        }
-       if (slash_count == 2) {
-               return __dl_argv_handle_port(str, p_bus_name,
-                                            p_dev_name, p_port_index);
-       } else if (slash_count == 0) {
-               return __dl_argv_handle_port_ifname(dl, str, p_bus_name,
-                                                   p_dev_name, p_port_index);
-       }
-       return 0;
 }
 
 static int dl_argv_handle_both(struct dl *dl, char **p_bus_name,
@@ -503,6 +647,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);
@@ -530,6 +692,92 @@ 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 eswitch_mode_get(const char *typestr,
+                           enum devlink_eswitch_mode *p_mode)
+{
+       if (strcmp(typestr, ESWITCH_MODE_LEGACY) == 0) {
+               *p_mode = DEVLINK_ESWITCH_MODE_LEGACY;
+       } else if (strcmp(typestr, ESWITCH_MODE_SWITCHDEV) == 0) {
+               *p_mode = DEVLINK_ESWITCH_MODE_SWITCHDEV;
+       } else {
+               pr_err("Unknown eswitch mode \"%s\"\n", typestr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int eswitch_inline_mode_get(const char *typestr,
+                                  enum devlink_eswitch_inline_mode *p_mode)
+{
+       if (strcmp(typestr, ESWITCH_INLINE_MODE_NONE) == 0) {
+               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_NONE;
+       } else if (strcmp(typestr, ESWITCH_INLINE_MODE_LINK) == 0) {
+               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_LINK;
+       } else if (strcmp(typestr, ESWITCH_INLINE_MODE_NETWORK) == 0) {
+               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_NETWORK;
+       } else if (strcmp(typestr, ESWITCH_INLINE_MODE_TRANSPORT) == 0) {
+               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT;
+       } else {
+               pr_err("Unknown eswitch inline mode \"%s\"\n", typestr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int dpipe_counters_enable_get(const char *typestr,
+                                    bool *counters_enable)
+{
+       if (strcmp(typestr, "enable") == 0) {
+               *counters_enable = 1;
+       } else if (strcmp(typestr, "disable") == 0) {
+               *counters_enable = 0;
+       } else {
+               pr_err("Unknown counter_state \"%s\"\n", typestr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int eswitch_encap_mode_get(const char *typestr, bool *p_mode)
+{
+       if (strcmp(typestr, "enable") == 0) {
+               *p_mode = true;
+       } else if (strcmp(typestr, "disable") == 0) {
+               *p_mode = false;
+       } else {
+               pr_err("Unknown eswitch encap mode \"%s\"\n", typestr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
 static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                         uint32_t o_optional)
 {
@@ -539,7 +787,7 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
        int err;
 
        if (o_required & DL_OPT_HANDLE && o_required & DL_OPT_HANDLEP) {
-               uint32_t handle_bit = handle_bit;
+               uint32_t handle_bit;
 
                err = dl_argv_handle_both(dl, &opts->bus_name, &opts->dev_name,
                                          &opts->port_index, &handle_bit);
@@ -579,6 +827,124 @@ 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 if (dl_argv_match(dl, "mode") &&
+                          (o_all & DL_OPT_ESWITCH_MODE)) {
+                       const char *typestr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &typestr);
+                       if (err)
+                               return err;
+                       err = eswitch_mode_get(typestr, &opts->eswitch_mode);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_ESWITCH_MODE;
+               } else if (dl_argv_match(dl, "inline-mode") &&
+                          (o_all & DL_OPT_ESWITCH_INLINE_MODE)) {
+                       const char *typestr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &typestr);
+                       if (err)
+                               return err;
+                       err = eswitch_inline_mode_get(
+                               typestr, &opts->eswitch_inline_mode);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_ESWITCH_INLINE_MODE;
+               } else if (dl_argv_match(dl, "name") &&
+                          (o_all & DL_OPT_DPIPE_TABLE_NAME)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->dpipe_table_name);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_DPIPE_TABLE_NAME;
+               } else if (dl_argv_match(dl, "counters") &&
+                          (o_all & DL_OPT_DPIPE_TABLE_COUNTERS)) {
+                       const char *typestr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &typestr);
+                       if (err)
+                               return err;
+                       err = dpipe_counters_enable_get(typestr,
+                                                       &opts->dpipe_counters_enable);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_DPIPE_TABLE_COUNTERS;
+               } else if (dl_argv_match(dl, "encap") &&
+                          (o_all & DL_OPT_ESWITCH_ENCAP_MODE)) {
+                       const char *typestr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &typestr);
+                       if (err)
+                               return err;
+                       err = eswitch_encap_mode_get(typestr,
+                                                    &opts->eswitch_encap_mode);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_ESWITCH_ENCAP_MODE;
                } else {
                        pr_err("Unknown option \"%s\"\n", dl_argv(dl));
                        return -EINVAL;
@@ -587,6 +953,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;
@@ -598,6 +969,66 @@ 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;
+       }
+
+       if ((o_required & DL_OPT_ESWITCH_MODE) &&
+           !(o_found & DL_OPT_ESWITCH_MODE)) {
+               pr_err("E-Switch mode option expected.\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_ESWITCH_INLINE_MODE) &&
+           !(o_found & DL_OPT_ESWITCH_INLINE_MODE)) {
+               pr_err("E-Switch inline-mode option expected.\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_DPIPE_TABLE_NAME) &&
+           !(o_found & DL_OPT_DPIPE_TABLE_NAME)) {
+               pr_err("Dpipe table name expected\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_DPIPE_TABLE_COUNTERS) &&
+           !(o_found & DL_OPT_DPIPE_TABLE_COUNTERS)) {
+               pr_err("Dpipe table counter state expected\n");
+               return -EINVAL;
+       }
+
+       if ((o_required & DL_OPT_ESWITCH_ENCAP_MODE) &&
+           !(o_found & DL_OPT_ESWITCH_ENCAP_MODE)) {
+               pr_err("E-Switch encapsulation option expected.\n");
+               return -EINVAL;
+       }
+
        return 0;
 }
 
@@ -620,6 +1051,42 @@ 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);
+       if (opts->present & DL_OPT_ESWITCH_MODE)
+               mnl_attr_put_u16(nlh, DEVLINK_ATTR_ESWITCH_MODE,
+                                opts->eswitch_mode);
+       if (opts->present & DL_OPT_ESWITCH_INLINE_MODE)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_ESWITCH_INLINE_MODE,
+                               opts->eswitch_inline_mode);
+       if (opts->present & DL_OPT_DPIPE_TABLE_NAME)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_DPIPE_TABLE_NAME,
+                                 opts->dpipe_table_name);
+       if (opts->present & DL_OPT_DPIPE_TABLE_COUNTERS)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED,
+                               opts->dpipe_counters_enable);
+       if (opts->present & DL_OPT_ESWITCH_ENCAP_MODE)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_ESWITCH_ENCAP_MODE,
+                               opts->eswitch_encap_mode);
 }
 
 static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
@@ -640,6 +1107,7 @@ static bool dl_dump_filter(struct dl *dl, struct nlattr **tb)
        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) {
@@ -661,108 +1129,459 @@ static bool dl_dump_filter(struct dl *dl, struct nlattr **tb)
                    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)
 {
-       pr_out("Usage: devlink dev show [ DEV ]\n");
+       pr_err("Usage: devlink dev show [ DEV ]\n");
+       pr_err("       devlink dev eswitch set DEV [ mode { legacy | switchdev } ]\n");
+       pr_err("                               [ inline-mode { none | link | network | transport } ]\n");
+       pr_err("                               [ encap { disable | enable } ]\n");
+       pr_err("       devlink dev eswitch show DEV\n");
 }
 
-static void __pr_out_handle(const char *bus_name, const char *dev_name)
+static bool cmp_arr_last_handle(struct dl *dl, const char *bus_name,
+                               const char *dev_name)
 {
-       pr_out("%s/%s", bus_name, dev_name);
+       if (!dl->arr_last.present)
+               return false;
+       return strcmp(dl->arr_last.bus_name, bus_name) == 0 &&
+              strcmp(dl->arr_last.dev_name, dev_name) == 0;
 }
 
-static void pr_out_handle(struct nlattr **tb)
+static void arr_last_handle_set(struct dl *dl, const char *bus_name,
+                               const char *dev_name)
 {
-       __pr_out_handle(mnl_attr_get_str(tb[DEVLINK_ATTR_BUS_NAME]),
-                       mnl_attr_get_str(tb[DEVLINK_ATTR_DEV_NAME]));
+       dl->arr_last.present = true;
+       free(dl->arr_last.dev_name);
+       free(dl->arr_last.bus_name);
+       dl->arr_last.bus_name = strdup(bus_name);
+       dl->arr_last.dev_name = strdup(dev_name);
 }
 
-static void __pr_out_port_handle(const char *bus_name, const char *dev_name,
-                                uint32_t port_index)
+static bool should_arr_last_handle_start(struct dl *dl, const char *bus_name,
+                                        const char *dev_name)
 {
-       __pr_out_handle(bus_name, dev_name);
-       pr_out("/%d", port_index);
+       return !cmp_arr_last_handle(dl, bus_name, dev_name);
 }
 
-static void pr_out_port_handle(struct nlattr **tb)
+static bool should_arr_last_handle_end(struct dl *dl, const char *bus_name,
+                                      const char *dev_name)
 {
-       __pr_out_port_handle(mnl_attr_get_str(tb[DEVLINK_ATTR_BUS_NAME]),
-                            mnl_attr_get_str(tb[DEVLINK_ATTR_DEV_NAME]),
-                            mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_INDEX]));
+       return dl->arr_last.present &&
+              !cmp_arr_last_handle(dl, bus_name, dev_name);
 }
 
-static void __pr_out_port_handle_nice(struct dl *dl, const char *bus_name,
-                                     const char *dev_name, uint32_t port_index)
+static void __pr_out_handle_start(struct dl *dl, struct nlattr **tb,
+                                 bool content, bool array)
 {
-       char *ifname;
-       int err;
+       const char *bus_name = mnl_attr_get_str(tb[DEVLINK_ATTR_BUS_NAME]);
+       const char *dev_name = mnl_attr_get_str(tb[DEVLINK_ATTR_DEV_NAME]);
+       char buf[32];
 
-       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;
+       sprintf(buf, "%s/%s", bus_name, dev_name);
 
-no_nice_names:
-       __pr_out_port_handle(bus_name, dev_name, port_index);
+       if (dl->json_output) {
+               if (array) {
+                       if (should_arr_last_handle_end(dl, bus_name, dev_name))
+                               jsonw_end_array(dl->jw);
+                       if (should_arr_last_handle_start(dl, bus_name,
+                                                        dev_name)) {
+                               jsonw_name(dl->jw, buf);
+                               jsonw_start_array(dl->jw);
+                               jsonw_start_object(dl->jw);
+                               arr_last_handle_set(dl, bus_name, dev_name);
+                       } else {
+                               jsonw_start_object(dl->jw);
+                       }
+               } else {
+                       jsonw_name(dl->jw, buf);
+                       jsonw_start_object(dl->jw);
+               }
+       } else {
+               if (array) {
+                       if (should_arr_last_handle_end(dl, bus_name, dev_name))
+                               __pr_out_indent_dec();
+                       if (should_arr_last_handle_start(dl, bus_name,
+                                                        dev_name)) {
+                               pr_out("%s%s", buf, content ? ":" : "");
+                               __pr_out_newline();
+                               __pr_out_indent_inc();
+                               arr_last_handle_set(dl, bus_name, dev_name);
+                       }
+               } else {
+                       pr_out("%s%s", buf, content ? ":" : "");
+               }
+       }
 }
 
-static void pr_out_port_handle_nice(struct dl *dl, struct nlattr **tb)
+static void pr_out_handle_start_arr(struct dl *dl, struct nlattr **tb)
 {
-       const char *bus_name;
-       const char *dev_name;
-       uint32_t port_index;
+       __pr_out_handle_start(dl, tb, true, true);
+}
 
-       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]);
+static void pr_out_handle_end(struct dl *dl)
+{
+       if (dl->json_output)
+               jsonw_end_object(dl->jw);
+       else
+               __pr_out_newline();
+}
 
-       __pr_out_port_handle_nice(dl, bus_name, dev_name, port_index);
+static void pr_out_handle(struct dl *dl, struct nlattr **tb)
+{
+       __pr_out_handle_start(dl, tb, false, false);
+       pr_out_handle_end(dl);
 }
 
-static void pr_out_dev(struct nlattr **tb)
+static bool cmp_arr_last_port_handle(struct dl *dl, const char *bus_name,
+                                    const char *dev_name, uint32_t port_index)
 {
-       pr_out_handle(tb);
-       pr_out("\n");
+       return cmp_arr_last_handle(dl, bus_name, dev_name) &&
+              dl->arr_last.port_index == port_index;
 }
 
-static int cmd_dev_show_cb(const struct nlmsghdr *nlh, void *data)
+static void arr_last_port_handle_set(struct dl *dl, const char *bus_name,
+                                    const char *dev_name, uint32_t port_index)
 {
-       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
-       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       arr_last_handle_set(dl, bus_name, dev_name);
+       dl->arr_last.port_index = port_index;
+}
 
-       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_dev(tb);
-       return MNL_CB_OK;
+static bool should_arr_last_port_handle_start(struct dl *dl,
+                                             const char *bus_name,
+                                             const char *dev_name,
+                                             uint32_t port_index)
+{
+       return !cmp_arr_last_port_handle(dl, bus_name, dev_name, port_index);
 }
 
-static int cmd_dev_show(struct dl *dl)
+static bool should_arr_last_port_handle_end(struct dl *dl,
+                                           const char *bus_name,
+                                           const char *dev_name,
+                                           uint32_t port_index)
 {
-       struct nlmsghdr *nlh;
-       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
-       int err;
+       return dl->arr_last.present &&
+              !cmp_arr_last_port_handle(dl, bus_name, dev_name, port_index);
+}
 
-       if (dl_argc(dl) == 0)
-               flags |= NLM_F_DUMP;
+static void __pr_out_port_handle_start(struct dl *dl, const char *bus_name,
+                                      const char *dev_name,
+                                      uint32_t port_index, bool try_nice,
+                                      bool array)
+{
+       static char buf[32];
+       char *ifname = NULL;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_GET, flags);
+       if (dl->no_nice_names || !try_nice ||
+           ifname_map_rev_lookup(dl, bus_name, dev_name,
+                                 port_index, &ifname) != 0)
+               sprintf(buf, "%s/%s/%d", bus_name, dev_name, port_index);
+       else
+               sprintf(buf, "%s", ifname);
 
-       if (dl_argc(dl) > 0) {
+       if (dl->json_output) {
+               if (array) {
+                       if (should_arr_last_port_handle_end(dl, bus_name,
+                                                           dev_name,
+                                                           port_index))
+                               jsonw_end_array(dl->jw);
+                       if (should_arr_last_port_handle_start(dl, bus_name,
+                                                             dev_name,
+                                                             port_index)) {
+                               jsonw_name(dl->jw, buf);
+                               jsonw_start_array(dl->jw);
+                               jsonw_start_object(dl->jw);
+                               arr_last_port_handle_set(dl, bus_name, dev_name,
+                                                        port_index);
+                       } else {
+                               jsonw_start_object(dl->jw);
+                       }
+               } else {
+                       jsonw_name(dl->jw, buf);
+                       jsonw_start_object(dl->jw);
+               }
+       } else {
+               pr_out("%s:", buf);
+       }
+}
+
+static void pr_out_port_handle_start(struct dl *dl, struct nlattr **tb, bool try_nice)
+{
+       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_start(dl, bus_name, dev_name, port_index, try_nice, false);
+}
+
+static void pr_out_port_handle_start_arr(struct dl *dl, struct nlattr **tb, bool try_nice)
+{
+       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_start(dl, bus_name, dev_name, port_index, try_nice, true);
+}
+
+static void pr_out_port_handle_end(struct dl *dl)
+{
+       if (dl->json_output)
+               jsonw_end_object(dl->jw);
+       else
+               pr_out("\n");
+}
+
+
+static void pr_out_str(struct dl *dl, const char *name, const char *val)
+{
+       if (dl->json_output) {
+               jsonw_string_field(dl->jw, name, val);
+       } else {
+               if (g_indent_newline)
+                       pr_out("%s %s", name, val);
+               else
+                       pr_out(" %s %s", name, val);
+       }
+}
+
+static void pr_out_uint(struct dl *dl, const char *name, unsigned int val)
+{
+       if (dl->json_output) {
+               jsonw_uint_field(dl->jw, name, val);
+       } else {
+               if (g_indent_newline)
+                       pr_out("%s %u", name, val);
+               else
+                       pr_out(" %s %u", name, val);
+       }
+}
+
+static void pr_out_dev(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_handle(dl, tb);
+}
+
+static void pr_out_section_start(struct dl *dl, const char *name)
+{
+       if (dl->json_output) {
+               jsonw_start_object(dl->jw);
+               jsonw_name(dl->jw, name);
+               jsonw_start_object(dl->jw);
+       }
+}
+
+static void pr_out_section_end(struct dl *dl)
+{
+       if (dl->json_output) {
+               if (dl->arr_last.present)
+                       jsonw_end_array(dl->jw);
+               jsonw_end_object(dl->jw);
+               jsonw_end_object(dl->jw);
+       }
+}
+
+static void pr_out_array_start(struct dl *dl, const char *name)
+{
+       if (dl->json_output) {
+               jsonw_name(dl->jw, name);
+               jsonw_start_array(dl->jw);
+       } else {
+               if (!g_indent_newline)
+                       __pr_out_newline();
+               pr_out("%s:", name);
+               __pr_out_newline();
+               __pr_out_indent_inc();
+       }
+}
+
+static void pr_out_array_end(struct dl *dl)
+{
+       if (dl->json_output)
+               jsonw_end_array(dl->jw);
+       else
+               __pr_out_indent_dec();
+}
+
+static void pr_out_entry_start(struct dl *dl)
+{
+       if (dl->json_output)
+               jsonw_start_object(dl->jw);
+}
+
+static void pr_out_entry_end(struct dl *dl)
+{
+       if (dl->json_output)
+               jsonw_end_object(dl->jw);
+       else
+               __pr_out_newline();
+}
+
+static const char *eswitch_mode_name(uint32_t mode)
+{
+       switch (mode) {
+       case DEVLINK_ESWITCH_MODE_LEGACY: return ESWITCH_MODE_LEGACY;
+       case DEVLINK_ESWITCH_MODE_SWITCHDEV: return ESWITCH_MODE_SWITCHDEV;
+       default: return "<unknown mode>";
+       }
+}
+
+static const char *eswitch_inline_mode_name(uint32_t mode)
+{
+       switch (mode) {
+       case DEVLINK_ESWITCH_INLINE_MODE_NONE:
+               return ESWITCH_INLINE_MODE_NONE;
+       case DEVLINK_ESWITCH_INLINE_MODE_LINK:
+               return ESWITCH_INLINE_MODE_LINK;
+       case DEVLINK_ESWITCH_INLINE_MODE_NETWORK:
+               return ESWITCH_INLINE_MODE_NETWORK;
+       case DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT:
+               return ESWITCH_INLINE_MODE_TRANSPORT;
+       default:
+               return "<unknown mode>";
+       }
+}
+
+static void pr_out_eswitch(struct dl *dl, struct nlattr **tb)
+{
+       __pr_out_handle_start(dl, tb, true, false);
+
+       if (tb[DEVLINK_ATTR_ESWITCH_MODE])
+               pr_out_str(dl, "mode",
+                          eswitch_mode_name(mnl_attr_get_u16(tb[DEVLINK_ATTR_ESWITCH_MODE])));
+
+       if (tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE])
+               pr_out_str(dl, "inline-mode",
+                          eswitch_inline_mode_name(mnl_attr_get_u8(
+                                  tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE])));
+
+       if (tb[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]) {
+               bool encap_mode = !!mnl_attr_get_u8(tb[DEVLINK_ATTR_ESWITCH_ENCAP_MODE]);
+
+               pr_out_str(dl, "encap", encap_mode ? "enable" : "disable");
+       }
+
+       pr_out_handle_end(dl);
+}
+
+static int cmd_dev_eswitch_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])
+               return MNL_CB_ERROR;
+       pr_out_eswitch(dl, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_dev_eswitch_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_GET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
+       if (err)
+               return err;
+
+       pr_out_section_start(dl, "dev");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_eswitch_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
+
+static int cmd_dev_eswitch_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE,
+                               DL_OPT_ESWITCH_MODE |
+                               DL_OPT_ESWITCH_INLINE_MODE |
+                               DL_OPT_ESWITCH_ENCAP_MODE);
+
+       if (err)
+               return err;
+
+       if (dl->opts.present == 1) {
+               pr_err("Need to set at least one option\n");
+               return -ENOENT;
+       }
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_dev_eswitch(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dev_help();
+               return 0;
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_dev_eswitch_set(dl);
+       } else if (dl_argv_match(dl, "show")) {
+               dl_arg_inc(dl);
+               return cmd_dev_eswitch_show(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static int cmd_dev_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])
+               return MNL_CB_ERROR;
+       pr_out_dev(dl, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_dev_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_GET, flags);
+
+       if (dl_argc(dl) > 0) {
                err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
                if (err)
                        return err;
        }
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_show_cb, NULL);
+       pr_out_section_start(dl, "dev");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
 }
 
 static int cmd_dev(struct dl *dl)
@@ -774,6 +1593,9 @@ static int cmd_dev(struct dl *dl)
                   dl_argv_match(dl, "list") || dl_no_arg(dl)) {
                dl_arg_inc(dl);
                return cmd_dev_show(dl);
+       } else if (dl_argv_match(dl, "eswitch")) {
+               dl_arg_inc(dl);
+               return cmd_dev_eswitch(dl);
        }
        pr_err("Command \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
@@ -781,10 +1603,10 @@ static int cmd_dev(struct dl *dl)
 
 static void cmd_port_help(void)
 {
-       pr_out("Usage: devlink port show [ DEV/PORT_INDEX ]\n");
-       pr_out("       devlink port set DEV/PORT_INDEX [ type { eth | ib | auto} ]\n");
-       pr_out("       devlink port split DEV/PORT_INDEX count COUNT\n");
-       pr_out("       devlink port unsplit DEV/PORT_INDEX\n");
+       pr_err("Usage: devlink port show [ DEV/PORT_INDEX ]\n");
+       pr_err("       devlink port set DEV/PORT_INDEX [ type { eth | ib | auto} ]\n");
+       pr_err("       devlink port split DEV/PORT_INDEX count COUNT\n");
+       pr_err("       devlink port unsplit DEV/PORT_INDEX\n");
 }
 
 static const char *port_type_name(uint32_t type)
@@ -798,264 +1620,2108 @@ static const char *port_type_name(uint32_t type)
        }
 }
 
-static void pr_out_port(struct nlattr **tb)
+static void pr_out_port(struct dl *dl, struct nlattr **tb)
 {
        struct nlattr *pt_attr = tb[DEVLINK_ATTR_PORT_TYPE];
        struct nlattr *dpt_attr = tb[DEVLINK_ATTR_PORT_DESIRED_TYPE];
 
-       pr_out_port_handle(tb);
-       pr_out(":");
+       pr_out_port_handle_start(dl, tb, false);
        if (pt_attr) {
                uint16_t port_type = mnl_attr_get_u16(pt_attr);
 
-               pr_out(" type %s", port_type_name(port_type));
+               pr_out_str(dl, "type", port_type_name(port_type));
                if (dpt_attr) {
                        uint16_t des_port_type = mnl_attr_get_u16(dpt_attr);
 
-                       if (port_type != des_port_type)
-                               pr_out("(%s)", port_type_name(des_port_type));
-               }
+                       if (port_type != des_port_type)
+                               pr_out_str(dl, "des_type",
+                                          port_type_name(des_port_type));
+               }
+       }
+       if (tb[DEVLINK_ATTR_PORT_NETDEV_NAME])
+               pr_out_str(dl, "netdev",
+                          mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_NETDEV_NAME]));
+       if (tb[DEVLINK_ATTR_PORT_IBDEV_NAME])
+               pr_out_str(dl, "ibdev",
+                          mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_IBDEV_NAME]));
+       if (tb[DEVLINK_ATTR_PORT_SPLIT_GROUP])
+               pr_out_uint(dl, "split_group",
+                           mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_SPLIT_GROUP]));
+       pr_out_port_handle_end(dl);
+}
+
+static int cmd_port_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])
+               return MNL_CB_ERROR;
+       pr_out_port(dl, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_port_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_PORT_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
+               if (err)
+                       return err;
+       }
+
+       pr_out_section_start(dl, "port");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_port_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
+
+static int cmd_port_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_TYPE, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_port_split(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SPLIT,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_COUNT, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_port_unsplit(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_UNSPLIT,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_port(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help")) {
+               cmd_port_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_port_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_port_set(dl);
+       } else if (dl_argv_match(dl, "split")) {
+               dl_arg_inc(dl);
+               return cmd_port_split(dl);
+       } else if (dl_argv_match(dl, "unsplit")) {
+               dl_arg_inc(dl);
+               return cmd_port_unsplit(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static void cmd_sb_help(void)
+{
+       pr_err("Usage: devlink sb show [ DEV [ sb SB_INDEX ] ]\n");
+       pr_err("       devlink sb pool show [ DEV [ sb SB_INDEX ] pool POOL_INDEX ]\n");
+       pr_err("       devlink sb pool set DEV [ sb SB_INDEX ] pool POOL_INDEX\n");
+       pr_err("                           size POOL_SIZE thtype { static | dynamic }\n");
+       pr_err("       devlink sb port pool show [ DEV/PORT_INDEX [ sb SB_INDEX ]\n");
+       pr_err("                                   pool POOL_INDEX ]\n");
+       pr_err("       devlink sb port pool set DEV/PORT_INDEX [ sb SB_INDEX ]\n");
+       pr_err("                                pool POOL_INDEX th THRESHOLD\n");
+       pr_err("       devlink sb tc bind show [ DEV/PORT_INDEX [ sb SB_INDEX ] tc TC_INDEX\n");
+       pr_err("                                 type { ingress | egress } ]\n");
+       pr_err("       devlink sb tc bind set DEV/PORT_INDEX [ sb SB_INDEX ] tc TC_INDEX\n");
+       pr_err("                              type { ingress | egress } pool POOL_INDEX\n");
+       pr_err("                              th THRESHOLD\n");
+       pr_err("       devlink sb occupancy show { DEV | DEV/PORT_INDEX } [ sb SB_INDEX ]\n");
+       pr_err("       devlink sb occupancy snapshot DEV [ sb SB_INDEX ]\n");
+       pr_err("       devlink sb occupancy clearmax DEV [ sb SB_INDEX ]\n");
+}
+
+static void pr_out_sb(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_handle_start_arr(dl, tb);
+       pr_out_uint(dl, "sb",
+                   mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]));
+       pr_out_uint(dl, "size",
+                   mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_SIZE]));
+       pr_out_uint(dl, "ing_pools",
+                   mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_INGRESS_POOL_COUNT]));
+       pr_out_uint(dl, "eg_pools",
+                   mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_EGRESS_POOL_COUNT]));
+       pr_out_uint(dl, "ing_tcs",
+                   mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_INGRESS_TC_COUNT]));
+       pr_out_uint(dl, "eg_tcs",
+                   mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_EGRESS_TC_COUNT]));
+       pr_out_handle_end(dl);
+}
+
+static int cmd_sb_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_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(dl, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_sb_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_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, DL_OPT_SB);
+               if (err)
+                       return err;
+       }
+
+       pr_out_section_start(dl, "sb");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
+
+static const char *pool_type_name(uint8_t type)
+{
+       switch (type) {
+       case DEVLINK_SB_POOL_TYPE_INGRESS: return "ingress";
+       case DEVLINK_SB_POOL_TYPE_EGRESS: return "egress";
+       default: return "<unknown type>";
+       }
+}
+
+static const char *threshold_type_name(uint8_t type)
+{
+       switch (type) {
+       case DEVLINK_SB_THRESHOLD_TYPE_STATIC: return "static";
+       case DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC: return "dynamic";
+       default: return "<unknown type>";
+       }
+}
+
+static void pr_out_sb_pool(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_handle_start_arr(dl, tb);
+       pr_out_uint(dl, "sb",
+                   mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]));
+       pr_out_uint(dl, "pool",
+                   mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]));
+       pr_out_str(dl, "type",
+                  pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE])));
+       pr_out_uint(dl, "size",
+                   mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_POOL_SIZE]));
+       pr_out_str(dl, "thtype",
+                  threshold_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE])));
+       pr_out_handle_end(dl);
+}
+
+static int cmd_sb_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_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(dl, 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;
+       }
+
+       pr_out_section_start(dl, "pool");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_pool_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
+
+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_start_arr(dl, tb, true);
+       pr_out_uint(dl, "sb",
+                   mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]));
+       pr_out_uint(dl, "pool",
+                   mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]));
+       pr_out_uint(dl, "threshold",
+                   mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_THRESHOLD]));
+       pr_out_port_handle_end(dl);
+}
+
+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;
+       }
+
+       pr_out_section_start(dl, "port_pool");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_port_pool_show_cb, dl);
+       pr_out_section_end(dl);
+       return 0;
+}
+
+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_start_arr(dl, tb, true);
+       pr_out_uint(dl, "sb",
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_INDEX]));
+       pr_out_uint(dl, "tc",
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_TC_INDEX]));
+       pr_out_str(dl, "type",
+              pool_type_name(mnl_attr_get_u8(tb[DEVLINK_ATTR_SB_POOL_TYPE])));
+       pr_out_uint(dl, "pool",
+              mnl_attr_get_u16(tb[DEVLINK_ATTR_SB_POOL_INDEX]));
+       pr_out_uint(dl, "threshold",
+              mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_THRESHOLD]));
+       pr_out_port_handle_end(dl);
+}
+
+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;
+       }
+
+       pr_out_section_start(dl, "tc_bind");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_tc_bind_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
+
+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_json_occ_show_item_list(struct dl *dl, const char *label,
+                                          struct list_head *list,
+                                          bool bound_pool)
+{
+       struct occ_item *occ_item;
+       char buf[32];
+
+       jsonw_name(dl->jw, label);
+       jsonw_start_object(dl->jw);
+       list_for_each_entry(occ_item, list, list) {
+               sprintf(buf, "%u", occ_item->index);
+               jsonw_name(dl->jw, buf);
+               jsonw_start_object(dl->jw);
+               if (bound_pool)
+                       jsonw_uint_field(dl->jw, "bound_pool",
+                                        occ_item->bound_pool_index);
+               jsonw_uint_field(dl->jw, "current", occ_item->cur);
+               jsonw_uint_field(dl->jw, "max", occ_item->max);
+               jsonw_end_object(dl->jw);
+       }
+       jsonw_end_object(dl->jw);
+}
+
+static void pr_out_occ_show_port(struct dl *dl, struct occ_port *occ_port)
+{
+       if (dl->json_output) {
+               pr_out_json_occ_show_item_list(dl, "pool",
+                                              &occ_port->pool_list, false);
+               pr_out_json_occ_show_item_list(dl, "itc",
+                                              &occ_port->ing_tc_list, true);
+               pr_out_json_occ_show_item_list(dl, "etc",
+                                              &occ_port->eg_tc_list, true);
+       } else {
+               pr_out("\n");
+               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_start(dl, opts->bus_name, opts->dev_name,
+                                          occ_port->port_index, true, false);
+               pr_out_occ_show_port(dl, occ_port);
+               pr_out_port_handle_end(dl);
+       }
+}
+
+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_section_start(dl, "occupancy");
+       pr_out_occ_show(occ_show);
+       pr_out_section_end(dl);
+
+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(dl, 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(dl, 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) {
+                       pr_err("Unknown object \"%s\"\n", cur_obj);
+                       return -EINVAL;
+               }
+       }
+       err = _mnlg_socket_group_add(dl->nlg, DEVLINK_GENL_MCGRP_CONFIG_NAME);
+       if (err)
+               return err;
+       err = _mnlg_socket_recv_run(dl->nlg, cmd_mon_show_cb, dl);
+       if (err)
+               return err;
+       return 0;
+}
+
+static void cmd_mon_help(void)
+{
+       pr_err("Usage: devlink monitor [ all | OBJECT-LIST ]\n"
+              "where  OBJECT-LIST := { dev | port }\n");
+}
+
+static int cmd_mon(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help")) {
+               cmd_mon_help();
+               return 0;
+       } else if (dl_no_arg(dl)) {
+               dl_arg_inc(dl);
+               return cmd_mon_show(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+struct dpipe_field {
+       char *name;
+       unsigned int id;
+       unsigned int bitwidth;
+       enum devlink_dpipe_field_mapping_type mapping_type;
+};
+
+struct dpipe_header {
+       struct list_head list;
+       char *name;
+       unsigned int id;
+       struct dpipe_field *fields;
+       unsigned int fields_count;
+};
+
+struct dpipe_ctx {
+       struct dl *dl;
+       int err;
+       struct list_head global_headers;
+       struct list_head local_headers;
+       bool print_headers;
+};
+
+static struct dpipe_header *dpipe_header_alloc(unsigned int fields_count)
+{
+       struct dpipe_header *header;
+
+       header = calloc(1, sizeof(struct dpipe_header));
+       if (!header)
+               return NULL;
+       header->fields = calloc(fields_count, sizeof(struct dpipe_field));
+       if (!header->fields)
+               goto err_fields_alloc;
+       header->fields_count = fields_count;
+       return header;
+
+err_fields_alloc:
+       free(header);
+       return NULL;
+}
+
+static void dpipe_header_free(struct dpipe_header *header)
+{
+       free(header->fields);
+       free(header);
+}
+
+static void dpipe_header_clear(struct dpipe_header *header)
+{
+       struct dpipe_field *field;
+       int i;
+
+       for (i = 0; i < header->fields_count; i++) {
+               field = &header->fields[i];
+               free(field->name);
+       }
+       free(header->name);
+}
+
+static void dpipe_header_add(struct dpipe_ctx *ctx,
+                            struct dpipe_header *header, bool global)
+{
+       if (global)
+               list_add(&header->list, &ctx->global_headers);
+       else
+               list_add(&header->list, &ctx->local_headers);
+}
+
+static void dpipe_header_del(struct dpipe_header *header)
+{
+       list_del(&header->list);
+}
+
+static struct dpipe_ctx *dpipe_ctx_alloc(struct dl *dl)
+{
+       struct dpipe_ctx *ctx;
+
+       ctx = calloc(1, sizeof(struct dpipe_ctx));
+       if (!ctx)
+               return NULL;
+       ctx->dl = dl;
+       INIT_LIST_HEAD(&ctx->global_headers);
+       INIT_LIST_HEAD(&ctx->local_headers);
+       return ctx;
+}
+
+static void dpipe_ctx_free(struct dpipe_ctx *ctx)
+{
+       free(ctx);
+}
+
+static void dpipe_ctx_clear(struct dpipe_ctx *ctx)
+{
+       struct dpipe_header *header, *tmp;
+
+       list_for_each_entry_safe(header, tmp, &ctx->global_headers,
+                                list) {
+               dpipe_header_del(header);
+               dpipe_header_clear(header);
+               dpipe_header_free(header);
+       }
+       list_for_each_entry_safe(header, tmp, &ctx->local_headers,
+                                list) {
+               dpipe_header_del(header);
+               dpipe_header_clear(header);
+               dpipe_header_free(header);
+       }
+}
+
+static const char *dpipe_header_id2s(struct dpipe_ctx *ctx,
+                                    uint32_t header_id, bool global)
+{
+       struct list_head *header_list;
+       struct dpipe_header *header;
+
+       if (global)
+               header_list = &ctx->global_headers;
+       else
+               header_list = &ctx->local_headers;
+       list_for_each_entry(header, header_list, list) {
+               if (header->id != header_id)
+                       continue;
+               return header->name;
+       }
+       return NULL;
+}
+
+static const char *dpipe_field_id2s(struct dpipe_ctx *ctx,
+                                   uint32_t header_id,
+                                   uint32_t field_id, bool global)
+{
+       struct list_head *header_list;
+       struct dpipe_header *header;
+
+       if (global)
+               header_list = &ctx->global_headers;
+       else
+               header_list = &ctx->local_headers;
+       list_for_each_entry(header, header_list, list) {
+               if (header->id != header_id)
+                       continue;
+               return header->fields[field_id].name;
+       }
+       return NULL;
+}
+
+static const char *
+dpipe_field_mapping_e2s(enum devlink_dpipe_field_mapping_type mapping_type)
+{
+       switch (mapping_type) {
+       case DEVLINK_DPIPE_FIELD_MAPPING_TYPE_NONE:
+               return NULL;
+       case DEVLINK_DPIPE_FIELD_MAPPING_TYPE_IFINDEX:
+               return "ifindex";
+       default:
+               return "<unknown>";
+       }
+}
+
+static const char *
+dpipe_mapping_get(struct dpipe_ctx *ctx, uint32_t header_id,
+                 uint32_t field_id, bool global)
+{
+       enum devlink_dpipe_field_mapping_type mapping_type;
+       struct list_head *header_list;
+       struct dpipe_header *header;
+
+       if (global)
+               header_list = &ctx->global_headers;
+       else
+               header_list = &ctx->local_headers;
+       list_for_each_entry(header, header_list, list) {
+               if (header->id != header_id)
+                       continue;
+               mapping_type = header->fields[field_id].mapping_type;
+               return dpipe_field_mapping_e2s(mapping_type);
+       }
+       return NULL;
+}
+
+static void pr_out_dpipe_fields(struct dpipe_ctx *ctx,
+                               struct dpipe_field *fields,
+                               unsigned int field_count)
+{
+       struct dpipe_field *field;
+       int i;
+
+       for (i = 0; i < field_count; i++) {
+               field = &fields[i];
+               pr_out_entry_start(ctx->dl);
+               pr_out_str(ctx->dl, "name", field->name);
+               if (ctx->dl->verbose)
+                       pr_out_uint(ctx->dl, "id", field->id);
+               pr_out_uint(ctx->dl, "bitwidth", field->bitwidth);
+               if (field->mapping_type)
+                       pr_out_str(ctx->dl, "mapping_type",
+                                  dpipe_field_mapping_e2s(field->mapping_type));
+               pr_out_entry_end(ctx->dl);
+       }
+}
+
+static void
+pr_out_dpipe_header(struct dpipe_ctx *ctx, struct nlattr **tb,
+                   struct dpipe_header *header, bool global)
+{
+       pr_out_handle_start_arr(ctx->dl, tb);
+       pr_out_str(ctx->dl, "name", header->name);
+       if (ctx->dl->verbose) {
+               pr_out_uint(ctx->dl, "id", header->id);
+               pr_out_str(ctx->dl, "global",
+                          global ? "true" : "false");
+       }
+       pr_out_array_start(ctx->dl, "field");
+       pr_out_dpipe_fields(ctx, header->fields,
+                           header->fields_count);
+       pr_out_array_end(ctx->dl);
+       pr_out_handle_end(ctx->dl);
+}
+
+static void pr_out_dpipe_headers(struct dpipe_ctx *ctx,
+                                struct nlattr **tb)
+{
+       struct dpipe_header *header;
+
+       list_for_each_entry(header, &ctx->local_headers, list)
+               pr_out_dpipe_header(ctx, tb, header, false);
+
+       list_for_each_entry(header, &ctx->global_headers, list)
+               pr_out_dpipe_header(ctx, tb, header, true);
+}
+
+static int dpipe_header_field_get(struct nlattr *nl, struct dpipe_field *field)
+{
+       struct nlattr *nla_field[DEVLINK_ATTR_MAX + 1] = {};
+       const char *name;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_field);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+       if (!nla_field[DEVLINK_ATTR_DPIPE_FIELD_ID] ||
+           !nla_field[DEVLINK_ATTR_DPIPE_FIELD_NAME] ||
+           !nla_field[DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH] ||
+           !nla_field[DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE])
+               return -EINVAL;
+
+       name = mnl_attr_get_str(nla_field[DEVLINK_ATTR_DPIPE_FIELD_NAME]);
+       field->id = mnl_attr_get_u32(nla_field[DEVLINK_ATTR_DPIPE_FIELD_ID]);
+       field->bitwidth = mnl_attr_get_u32(nla_field[DEVLINK_ATTR_DPIPE_FIELD_BITWIDTH]);
+       field->name = strdup(name);
+       if (!field->name)
+               return -ENOMEM;
+       field->mapping_type = mnl_attr_get_u32(nla_field[DEVLINK_ATTR_DPIPE_FIELD_MAPPING_TYPE]);
+       return 0;
+}
+
+static int dpipe_header_fields_get(struct nlattr *nla_fields,
+                                  struct dpipe_field *fields)
+{
+       struct nlattr *nla_field;
+       int count = 0;
+       int err;
+
+       mnl_attr_for_each_nested(nla_field, nla_fields) {
+               err = dpipe_header_field_get(nla_field, &fields[count]);
+               if (err)
+                       return err;
+               count++;
+       }
+       return 0;
+}
+
+static unsigned int dpipe_header_field_count_get(struct nlattr *nla_fields)
+{
+       struct nlattr *nla_field;
+       unsigned int count = 0;
+
+       mnl_attr_for_each_nested(nla_field, nla_fields)
+               count++;
+       return count;
+}
+
+static int dpipe_header_get(struct dpipe_ctx *ctx, struct nlattr *nl)
+{
+       struct nlattr *nla_header[DEVLINK_ATTR_MAX + 1] = {};
+       struct dpipe_header *header;
+       unsigned int fields_count;
+       const char *header_name;
+       bool global;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_header);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_header[DEVLINK_ATTR_DPIPE_HEADER_NAME] ||
+           !nla_header[DEVLINK_ATTR_DPIPE_HEADER_ID] ||
+           !nla_header[DEVLINK_ATTR_DPIPE_HEADER_FIELDS])
+               return -EINVAL;
+
+       fields_count = dpipe_header_field_count_get(nla_header[DEVLINK_ATTR_DPIPE_HEADER_FIELDS]);
+       header = dpipe_header_alloc(fields_count);
+       if (!header)
+               return -ENOMEM;
+
+       header_name = mnl_attr_get_str(nla_header[DEVLINK_ATTR_DPIPE_HEADER_NAME]);
+       header->name = strdup(header_name);
+       header->id = mnl_attr_get_u32(nla_header[DEVLINK_ATTR_DPIPE_HEADER_ID]);
+       header->fields_count = fields_count;
+       global = !!mnl_attr_get_u8(nla_header[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
+
+       err = dpipe_header_fields_get(nla_header[DEVLINK_ATTR_DPIPE_HEADER_FIELDS],
+                                     header->fields);
+       if (err)
+               goto err_field_get;
+       dpipe_header_add(ctx, header, global);
+       return 0;
+
+err_field_get:
+       dpipe_header_free(header);
+       return err;
+}
+
+static int dpipe_headers_get(struct dpipe_ctx *ctx, struct nlattr **tb)
+{
+       struct nlattr *nla_headers = tb[DEVLINK_ATTR_DPIPE_HEADERS];
+       struct nlattr *nla_header;
+       int err;
+
+       mnl_attr_for_each_nested(nla_header, nla_headers) {
+               err = dpipe_header_get(ctx, nla_header);
+               if (err)
+                       return err;
+       }
+       return 0;
+}
+
+static int cmd_dpipe_header_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct dpipe_ctx *ctx = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       int err;
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_DPIPE_HEADERS])
+               return MNL_CB_ERROR;
+       err = dpipe_headers_get(ctx, tb);
+       if (err) {
+               ctx->err = err;
+               return MNL_CB_ERROR;
+       }
+
+       if (ctx->print_headers)
+               pr_out_dpipe_headers(ctx, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_dpipe_headers_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       struct dpipe_ctx *ctx;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_HEADERS_GET, flags);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
+       if (err)
+               return err;
+
+       ctx = dpipe_ctx_alloc(dl);
+       if (!ctx)
+               return -ENOMEM;
+
+       ctx->print_headers = true;
+
+       pr_out_section_start(dl, "header");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb, ctx);
+       if (err)
+               pr_err("error get headers %s\n", strerror(ctx->err));
+       pr_out_section_end(dl);
+
+       dpipe_ctx_clear(ctx);
+       dpipe_ctx_free(ctx);
+       return err;
+}
+
+static void cmd_dpipe_header_help(void)
+{
+       pr_err("Usage: devlink dpipe headers show DEV\n");
+}
+
+static int cmd_dpipe_header(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dpipe_header_help();
+               return 0;
+       } else if (dl_argv_match(dl, "show")) {
+               dl_arg_inc(dl);
+               return cmd_dpipe_headers_show(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static const char
+*dpipe_action_type_e2s(enum devlink_dpipe_action_type action_type)
+{
+       switch (action_type) {
+       case DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY:
+               return "field_modify";
+       default:
+               return "<unknown>";
+       }
+}
+
+struct dpipe_op_info {
+       uint32_t header_id;
+       uint32_t field_id;
+       bool header_global;
+};
+
+struct dpipe_action {
+       struct dpipe_op_info info;
+       uint32_t type;
+};
+
+static void pr_out_dpipe_action(struct dpipe_action *action,
+                               struct dpipe_ctx *ctx)
+{
+       struct dpipe_op_info *op_info = &action->info;
+       const char *mapping;
+
+       pr_out_str(ctx->dl, "type",
+                  dpipe_action_type_e2s(action->type));
+       pr_out_str(ctx->dl, "header",
+                  dpipe_header_id2s(ctx, op_info->header_id,
+                                    op_info->header_global));
+       pr_out_str(ctx->dl, "field",
+                  dpipe_field_id2s(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global));
+       mapping = dpipe_mapping_get(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global);
+       if (mapping)
+               pr_out_str(ctx->dl, "mapping", mapping);
+}
+
+static int dpipe_action_parse(struct dpipe_action *action, struct nlattr *nl)
+{
+       struct nlattr *nla_action[DEVLINK_ATTR_MAX + 1] = {};
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_action);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE] ||
+           !nla_action[DEVLINK_ATTR_DPIPE_HEADER_INDEX] ||
+           !nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID] ||
+           !nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]) {
+               return -EINVAL;
+       }
+
+       action->type = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE]);
+       action->info.header_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID]);
+       action->info.field_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]);
+       action->info.header_global = !!mnl_attr_get_u8(nla_action[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
+
+       return 0;
+}
+
+static int dpipe_table_actions_show(struct dpipe_ctx *ctx,
+                                   struct nlattr *nla_actions)
+{
+       struct nlattr *nla_action;
+       struct dpipe_action action;
+
+       mnl_attr_for_each_nested(nla_action, nla_actions) {
+               pr_out_entry_start(ctx->dl);
+               if (dpipe_action_parse(&action, nla_action))
+                       goto err_action_parse;
+               pr_out_dpipe_action(&action, ctx);
+               pr_out_entry_end(ctx->dl);
+       }
+       return 0;
+
+err_action_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
+}
+
+static const char *
+dpipe_match_type_e2s(enum devlink_dpipe_match_type match_type)
+{
+       switch (match_type) {
+       case DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT:
+               return "field_exact";
+       default:
+               return "<unknown>";
+       }
+}
+
+struct dpipe_match {
+       struct dpipe_op_info info;
+       uint32_t type;
+};
+
+static void pr_out_dpipe_match(struct dpipe_match *match,
+                              struct dpipe_ctx *ctx)
+{
+       struct dpipe_op_info *op_info = &match->info;
+       const char *mapping;
+
+       pr_out_str(ctx->dl, "type",
+                  dpipe_match_type_e2s(match->type));
+       pr_out_str(ctx->dl, "header",
+                  dpipe_header_id2s(ctx, op_info->header_id,
+                                    op_info->header_global));
+       pr_out_str(ctx->dl, "field",
+                  dpipe_field_id2s(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global));
+       mapping = dpipe_mapping_get(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global);
+       if (mapping)
+               pr_out_str(ctx->dl, "mapping", mapping);
+}
+
+static int dpipe_match_parse(struct dpipe_match *match,
+                            struct nlattr *nl)
+
+{
+       struct nlattr *nla_match[DEVLINK_ATTR_MAX + 1] = {};
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_match);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE] ||
+           !nla_match[DEVLINK_ATTR_DPIPE_HEADER_INDEX] ||
+           !nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID] ||
+           !nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]) {
+               return -EINVAL;
+       }
+
+       match->type = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE]);
+       match->info.header_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID]);
+       match->info.field_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]);
+       match->info.header_global = !!mnl_attr_get_u8(nla_match[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
+
+       return 0;
+}
+
+static int dpipe_table_matches_show(struct dpipe_ctx *ctx,
+                                   struct nlattr *nla_matches)
+{
+       struct nlattr *nla_match;
+       struct dpipe_match match;
+
+       mnl_attr_for_each_nested(nla_match, nla_matches) {
+               pr_out_entry_start(ctx->dl);
+               if (dpipe_match_parse(&match, nla_match))
+                       goto err_match_parse;
+               pr_out_dpipe_match(&match, ctx);
+               pr_out_entry_end(ctx->dl);
+       }
+       return 0;
+
+err_match_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
+}
+
+static int dpipe_table_show(struct dpipe_ctx *ctx, struct nlattr *nl)
+{
+       struct nlattr *nla_table[DEVLINK_ATTR_MAX + 1] = {};
+       bool counters_enabled;
+       const char *name;
+       uint32_t size;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_table);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_table[DEVLINK_ATTR_DPIPE_TABLE_NAME] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_SIZE] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_ACTIONS] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_MATCHES] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED]) {
+               return -EINVAL;
+       }
+
+       name = mnl_attr_get_str(nla_table[DEVLINK_ATTR_DPIPE_TABLE_NAME]);
+       size = mnl_attr_get_u32(nla_table[DEVLINK_ATTR_DPIPE_TABLE_SIZE]);
+       counters_enabled = !!mnl_attr_get_u8(nla_table[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED]);
+
+       pr_out_str(ctx->dl, "name", name);
+       pr_out_uint(ctx->dl, "size", size);
+       pr_out_str(ctx->dl, "counters_enabled",
+                  counters_enabled ? "true" : "false");
+
+       pr_out_array_start(ctx->dl, "match");
+       if (dpipe_table_matches_show(ctx, nla_table[DEVLINK_ATTR_DPIPE_TABLE_MATCHES]))
+               goto err_matches_show;
+       pr_out_array_end(ctx->dl);
+
+       pr_out_array_start(ctx->dl, "action");
+       if (dpipe_table_actions_show(ctx, nla_table[DEVLINK_ATTR_DPIPE_TABLE_ACTIONS]))
+               goto err_actions_show;
+       pr_out_array_end(ctx->dl);
+
+       return 0;
+
+err_actions_show:
+err_matches_show:
+       pr_out_array_end(ctx->dl);
+       return -EINVAL;
+}
+
+static int dpipe_tables_show(struct dpipe_ctx *ctx, struct nlattr **tb)
+{
+       struct nlattr *nla_tables = tb[DEVLINK_ATTR_DPIPE_TABLES];
+       struct nlattr *nla_table;
+
+       mnl_attr_for_each_nested(nla_table, nla_tables) {
+               pr_out_handle_start_arr(ctx->dl, tb);
+               if (dpipe_table_show(ctx, nla_table))
+                       goto err_table_show;
+               pr_out_handle_end(ctx->dl);
        }
-       if (tb[DEVLINK_ATTR_PORT_NETDEV_NAME])
-               pr_out(" netdev %s",
-                      mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_NETDEV_NAME]));
-       if (tb[DEVLINK_ATTR_PORT_IBDEV_NAME])
-               pr_out(" ibdev %s",
-                      mnl_attr_get_str(tb[DEVLINK_ATTR_PORT_IBDEV_NAME]));
-       if (tb[DEVLINK_ATTR_PORT_SPLIT_GROUP])
-               pr_out(" split_group %u",
-                      mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_SPLIT_GROUP]));
-       pr_out("\n");
+       return 0;
+
+err_table_show:
+       pr_out_handle_end(ctx->dl);
+       return -EINVAL;
 }
 
-static int cmd_port_show_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_dpipe_table_show_cb(const struct nlmsghdr *nlh, void *data)
 {
+       struct dpipe_ctx *ctx = 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_DPIPE_TABLES])
+               return MNL_CB_ERROR;
+
+       if (dpipe_tables_show(ctx, tb))
                return MNL_CB_ERROR;
-       pr_out_port(tb);
        return MNL_CB_OK;
 }
 
-static int cmd_port_show(struct dl *dl)
+static int cmd_dpipe_table_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
-       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       struct dpipe_ctx *ctx;
+       uint16_t flags = NLM_F_REQUEST;
        int err;
 
-       if (dl_argc(dl) == 0)
-               flags |= NLM_F_DUMP;
+       ctx = dpipe_ctx_alloc(dl);
+       if (!ctx)
+               return -ENOMEM;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_GET, flags);
+       err = dl_argv_parse(dl, DL_OPT_HANDLE, DL_OPT_DPIPE_TABLE_NAME);
+       if (err)
+               goto out;
 
-       if (dl_argc(dl) > 0) {
-               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
-               if (err)
-                       return err;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_HEADERS_GET, flags);
+       dl_opts_put(nlh, dl);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb, ctx);
+       if (err) {
+               pr_err("error get headers %s\n", strerror(ctx->err));
+               goto out;
        }
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_port_show_cb, NULL);
+       flags = NLM_F_REQUEST | NLM_F_ACK;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_TABLE_GET, flags);
+       dl_opts_put(nlh, dl);
+
+       pr_out_section_start(dl, "table");
+       _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_table_show_cb, ctx);
+       pr_out_section_end(dl);
+out:
+       dpipe_ctx_clear(ctx);
+       dpipe_ctx_free(ctx);
+       return err;
 }
 
-static int cmd_port_set(struct dl *dl)
+static int cmd_dpipe_table_set(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SET,
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
                               NLM_F_REQUEST | NLM_F_ACK);
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_TYPE, 0);
+       err = dl_argv_parse_put(nlh, dl,
+                               DL_OPT_HANDLE | DL_OPT_DPIPE_TABLE_NAME |
+                               DL_OPT_DPIPE_TABLE_COUNTERS, 0);
        if (err)
                return err;
 
        return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
 }
 
-static int cmd_port_split(struct dl *dl)
+enum dpipe_value_type {
+       DPIPE_VALUE_TYPE_VALUE,
+       DPIPE_VALUE_TYPE_MASK,
+};
+
+static const char *
+dpipe_value_type_e2s(enum dpipe_value_type type)
 {
-       struct nlmsghdr *nlh;
-       int err;
+       switch (type) {
+       case DPIPE_VALUE_TYPE_VALUE:
+               return "value";
+       case DPIPE_VALUE_TYPE_MASK:
+               return "value_mask";
+       default:
+               return "<unknown>";
+       }
+}
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SPLIT,
-                              NLM_F_REQUEST | NLM_F_ACK);
+struct dpipe_field_printer {
+       unsigned int field_id;
+       void (*printer)(struct dpipe_ctx *, enum dpipe_value_type, void *);
+};
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_COUNT, 0);
-       if (err)
-               return err;
+struct dpipe_header_printer {
+       struct dpipe_field_printer *printers;
+       unsigned int printers_count;
+       unsigned int header_id;
+};
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+static struct dpipe_header_printer *dpipe_header_printers[] = {};
+
+static int dpipe_print_prot_header(struct dpipe_ctx *ctx,
+                                  struct dpipe_op_info *info,
+                                  enum dpipe_value_type type,
+                                  void *value)
+{
+       unsigned int header_printers_count = ARRAY_SIZE(dpipe_header_printers);
+       struct dpipe_header_printer *header_printer;
+       struct dpipe_field_printer *field_printer;
+       unsigned int field_printers_count;
+       int j;
+       int i;
+
+       for (i = 0; i < header_printers_count; i++) {
+               header_printer = dpipe_header_printers[i];
+               if (header_printer->header_id != info->header_id)
+                       continue;
+               field_printers_count = header_printer->printers_count;
+               for (j = 0; j < field_printers_count; j++) {
+                       field_printer = &header_printer->printers[j];
+                       if (field_printer->field_id != info->field_id)
+                               continue;
+                       field_printer->printer(ctx, type, value);
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
 }
 
-static int cmd_port_unsplit(struct dl *dl)
+static void __pr_out_entry_value(struct dpipe_ctx *ctx,
+                                void *value,
+                                unsigned int value_len,
+                                struct dpipe_op_info *info,
+                                enum dpipe_value_type type)
 {
-       struct nlmsghdr *nlh;
+       if (info->header_global &&
+           !dpipe_print_prot_header(ctx, info, type, value))
+               return;
+
+       if (value_len == sizeof(uint32_t)) {
+               uint32_t *value_32 = value;
+
+               pr_out_uint(ctx->dl, dpipe_value_type_e2s(type), *value_32);
+       }
+}
+
+static void pr_out_dpipe_entry_value(struct dpipe_ctx *ctx,
+                                    struct nlattr **nla_match_value,
+                                    struct dpipe_op_info *info)
+{
+       void *value, *value_mask;
+       uint32_t value_mapping;
+       uint16_t value_len;
+       bool mask, mapping;
+
+       mask = !!nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MASK];
+       mapping = !!nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MAPPING];
+
+       value_len = mnl_attr_get_payload_len(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
+       value = mnl_attr_get_payload(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
+
+       if (mapping) {
+               value_mapping = mnl_attr_get_u32(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MAPPING]);
+               pr_out_uint(ctx->dl, "mapping_value", value_mapping);
+       }
+
+       if (mask) {
+               value_mask = mnl_attr_get_payload(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
+               __pr_out_entry_value(ctx, value_mask, value_len, info,
+                                    DPIPE_VALUE_TYPE_MASK);
+       }
+
+       __pr_out_entry_value(ctx, value, value_len, info, DPIPE_VALUE_TYPE_VALUE);
+}
+
+static int dpipe_entry_match_value_show(struct dpipe_ctx *ctx,
+                                       struct nlattr *nl)
+{
+       struct nlattr *nla_match_value[DEVLINK_ATTR_MAX + 1] = {};
+       struct dpipe_match match;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_UNSPLIT,
-                              NLM_F_REQUEST | NLM_F_ACK);
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_match_value);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
-       if (err)
-               return err;
+       if (!nla_match_value[DEVLINK_ATTR_DPIPE_MATCH] ||
+           !nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]) {
+               return -EINVAL;
+       }
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+       pr_out_entry_start(ctx->dl);
+       if (dpipe_match_parse(&match,
+                             nla_match_value[DEVLINK_ATTR_DPIPE_MATCH]))
+               goto err_match_parse;
+       pr_out_dpipe_match(&match, ctx);
+       pr_out_dpipe_entry_value(ctx, nla_match_value, &match.info);
+       pr_out_entry_end(ctx->dl);
+
+       return 0;
+
+err_match_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
 }
 
-static int cmd_port(struct dl *dl)
+static int dpipe_entry_action_value_show(struct dpipe_ctx *ctx,
+                                        struct nlattr *nl)
 {
-       if (dl_argv_match(dl, "help")) {
-               cmd_port_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_port_show(dl);
-       } else if (dl_argv_match(dl, "set")) {
-               dl_arg_inc(dl);
-               return cmd_port_set(dl);
-       } else if (dl_argv_match(dl, "split")) {
-               dl_arg_inc(dl);
-               return cmd_port_split(dl);
-       } else if (dl_argv_match(dl, "unsplit")) {
-               dl_arg_inc(dl);
-               return cmd_port_unsplit(dl);
+       struct nlattr *nla_action_value[DEVLINK_ATTR_MAX + 1] = {};
+       struct dpipe_action action;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_action_value);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_action_value[DEVLINK_ATTR_DPIPE_ACTION] ||
+           !nla_action_value[DEVLINK_ATTR_DPIPE_VALUE]) {
+               return -EINVAL;
        }
-       pr_err("Command \"%s\" not found\n", dl_argv(dl));
-       return -ENOENT;
+
+       pr_out_entry_start(ctx->dl);
+       if (dpipe_action_parse(&action,
+                              nla_action_value[DEVLINK_ATTR_DPIPE_ACTION]))
+               goto err_action_parse;
+       pr_out_dpipe_action(&action, ctx);
+       pr_out_dpipe_entry_value(ctx, nla_action_value, &action.info);
+       pr_out_entry_end(ctx->dl);
+
+       return 0;
+
+err_action_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
 }
 
-static const char *cmd_name(uint8_t cmd)
+static int
+dpipe_tables_action_values_show(struct dpipe_ctx *ctx,
+                               struct nlattr *nla_action_values)
 {
-       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>";
+       struct nlattr *nla_action_value;
+
+       mnl_attr_for_each_nested(nla_action_value, nla_action_values) {
+               if (dpipe_entry_action_value_show(ctx, nla_action_value))
+                       return -EINVAL;
        }
+       return 0;
 }
 
-static const char *cmd_obj(uint8_t cmd)
+static int
+dpipe_tables_match_values_show(struct dpipe_ctx *ctx,
+                              struct nlattr *nla_match_values)
 {
-       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>";
+       struct nlattr *nla_match_value;
+
+       mnl_attr_for_each_nested(nla_match_value, nla_match_values) {
+               if (dpipe_entry_match_value_show(ctx, nla_match_value))
+                       return -EINVAL;
        }
+       return 0;
 }
 
-static void pr_out_mon_header(uint8_t cmd)
+static int dpipe_entry_show(struct dpipe_ctx *ctx, struct nlattr *nl)
 {
-       pr_out("[%s,%s] ", cmd_obj(cmd), cmd_name(cmd));
+       struct nlattr *nla_entry[DEVLINK_ATTR_MAX + 1] = {};
+       uint32_t entry_index;
+       uint64_t counter;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_entry);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_INDEX] ||
+           !nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES] ||
+           !nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES]) {
+               return -EINVAL;
+       }
+
+       entry_index = mnl_attr_get_u32(nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_INDEX]);
+       pr_out_uint(ctx->dl, "index", entry_index);
+
+       if (nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_COUNTER]) {
+               counter = mnl_attr_get_u64(nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_COUNTER]);
+               pr_out_uint(ctx->dl, "counter", counter);
+       }
+
+       pr_out_array_start(ctx->dl, "match_value");
+       if (dpipe_tables_match_values_show(ctx,
+                                          nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_MATCH_VALUES]))
+               goto err_match_values_show;
+       pr_out_array_end(ctx->dl);
+
+       pr_out_array_start(ctx->dl, "action_value");
+       if (dpipe_tables_action_values_show(ctx,
+                                           nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_ACTION_VALUES]))
+               goto err_action_values_show;
+       pr_out_array_end(ctx->dl);
+       return 0;
+
+err_action_values_show:
+err_match_values_show:
+       pr_out_array_end(ctx->dl);
+       return -EINVAL;
 }
 
-static bool cmd_filter_check(struct dl *dl, uint8_t cmd)
+static int dpipe_table_entries_show(struct dpipe_ctx *ctx, struct nlattr **tb)
 {
-       const char *obj = cmd_obj(cmd);
-       unsigned int index = 0;
-       const char *cur_obj;
+       struct nlattr *nla_entries = tb[DEVLINK_ATTR_DPIPE_ENTRIES];
+       struct nlattr *nla_entry;
 
-       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;
+       mnl_attr_for_each_nested(nla_entry, nla_entries) {
+               pr_out_handle_start_arr(ctx->dl, tb);
+               if (dpipe_entry_show(ctx, nla_entry))
+                       goto err_entry_show;
+               pr_out_handle_end(ctx->dl);
        }
-       return false;
+       return 0;
+
+err_entry_show:
+       pr_out_handle_end(ctx->dl);
+       return -EINVAL;
 }
 
-static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_dpipe_table_entry_dump_cb(const struct nlmsghdr *nlh, void *data)
 {
-       struct dl *dl = data;
+       struct dpipe_ctx *ctx = 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;
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_DPIPE_ENTRIES])
+               return MNL_CB_ERROR;
 
-       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;
-       }
+       if (dpipe_table_entries_show(ctx, tb))
+               return MNL_CB_ERROR;
        return MNL_CB_OK;
 }
 
-static int cmd_mon_show(struct dl *dl)
+static int cmd_dpipe_table_dump(struct dl *dl)
 {
+       struct nlmsghdr *nlh;
+       struct dpipe_ctx *ctx;
+       uint16_t flags = NLM_F_REQUEST;
        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) {
-                       pr_err("Unknown object \"%s\"\n", cur_obj);
-                       return -EINVAL;
-               }
-       }
-       err = _mnlg_socket_group_add(dl->nlg, DEVLINK_GENL_MCGRP_CONFIG_NAME);
-       if (err)
-               return err;
-       err = _mnlg_socket_recv_run(dl->nlg, cmd_mon_show_cb, dl);
+       ctx = dpipe_ctx_alloc(dl);
+       if (!ctx)
+               return -ENOMEM;
+
+       err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_DPIPE_TABLE_NAME, 0);
        if (err)
-               return err;
-       return 0;
+               goto out;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_HEADERS_GET, flags);
+       dl_opts_put(nlh, dl);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb, ctx);
+       if (err) {
+               pr_err("error get headers %s\n", strerror(ctx->err));
+               goto out;
+       }
+
+       flags = NLM_F_REQUEST | NLM_F_ACK;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_ENTRIES_GET, flags);
+       dl_opts_put(nlh, dl);
+
+       pr_out_section_start(dl, "table_entry");
+       _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_table_entry_dump_cb, ctx);
+       pr_out_section_end(dl);
+out:
+       dpipe_ctx_clear(ctx);
+       dpipe_ctx_free(ctx);
+       return err;
 }
 
-static void cmd_mon_help(void)
+static void cmd_dpipe_table_help(void)
 {
-       pr_out("Usage: devlink monitor [ all | OBJECT-LIST ]\n"
-              "where  OBJECT-LIST := { dev | port }\n");
+       pr_err("Usage: devlink dpipe table [ OBJECT-LIST ]\n"
+              "where  OBJECT-LIST := { show | set | dump }\n");
 }
 
-static int cmd_mon(struct dl *dl)
+static int cmd_dpipe_table(struct dl *dl)
 {
-       if (dl_argv_match(dl, "help")) {
-               cmd_mon_help();
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dpipe_table_help();
                return 0;
-       } else if (dl_no_arg(dl)) {
+       } else if (dl_argv_match(dl, "show")) {
                dl_arg_inc(dl);
-               return cmd_mon_show(dl);
+               return cmd_dpipe_table_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_dpipe_table_set(dl);
+       }  else if (dl_argv_match(dl, "dump")) {
+               dl_arg_inc(dl);
+               return cmd_dpipe_table_dump(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static void cmd_dpipe_help(void)
+{
+       pr_err("Usage: devlink dpipe [ OBJECT-LIST ]\n"
+              "where  OBJECT-LIST := { header | table }\n");
+}
+
+static int cmd_dpipe(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dpipe_help();
+               return 0;
+       } else if (dl_argv_match(dl, "header")) {
+               dl_arg_inc(dl);
+               return cmd_dpipe_header(dl);
+       } else if (dl_argv_match(dl, "table")) {
+               dl_arg_inc(dl);
+               return cmd_dpipe_table(dl);
        }
        pr_err("Command \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
@@ -1063,9 +3729,9 @@ 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"
-              "       OPTIONS := { -V[ersion] | -n[no-nice-names] }\n");
+       pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
+              "where  OBJECT := { dev | port | sb | monitor | dpipe }\n"
+              "       OPTIONS := { -V[ersion] | -n[no-nice-names] | -j[json] | -p[pretty] | -v[verbose] }\n");
 }
 
 static int dl_cmd(struct dl *dl)
@@ -1079,9 +3745,15 @@ 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);
+       } else if (dl_argv_match(dl, "dpipe")) {
+               dl_arg_inc(dl);
+               return cmd_dpipe(dl);
        }
        pr_err("Object \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
@@ -1105,8 +3777,18 @@ static int dl_init(struct dl *dl, int argc, char **argv)
                pr_err("Failed to create index map\n");
                goto err_ifname_map_create;
        }
+       if (dl->json_output) {
+               dl->jw = jsonw_new(stdout);
+               if (!dl->jw) {
+                       pr_err("Failed to create JSON writer\n");
+                       goto err_json_new;
+               }
+               jsonw_pretty(dl->jw, dl->pretty_output);
+       }
        return 0;
 
+err_json_new:
+       ifname_map_fini(dl);
 err_ifname_map_create:
        mnlg_socket_close(dl->nlg);
        return err;
@@ -1114,6 +3796,8 @@ err_ifname_map_create:
 
 static void dl_fini(struct dl *dl)
 {
+       if (dl->json_output)
+               jsonw_destroy(&dl->jw);
        ifname_map_fini(dl);
        mnlg_socket_close(dl->nlg);
 }
@@ -1138,6 +3822,9 @@ int main(int argc, char **argv)
        static const struct option long_options[] = {
                { "Version",            no_argument,            NULL, 'V' },
                { "no-nice-names",      no_argument,            NULL, 'n' },
+               { "json",               no_argument,            NULL, 'j' },
+               { "pretty",             no_argument,            NULL, 'p' },
+               { "verbose",            no_argument,            NULL, 'v' },
                { NULL, 0, NULL, 0 }
        };
        struct dl *dl;
@@ -1151,20 +3838,31 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       while ((opt = getopt_long(argc, argv, "Vn",
+       while ((opt = getopt_long(argc, argv, "Vnjpv",
                                  long_options, NULL)) >= 0) {
 
                switch (opt) {
                case 'V':
                        printf("devlink utility, iproute2-ss%s\n", SNAPSHOT);
-                       return EXIT_SUCCESS;
+                       ret = EXIT_SUCCESS;
+                       goto dl_free;
                case 'n':
                        dl->no_nice_names = true;
                        break;
+               case 'j':
+                       dl->json_output = true;
+                       break;
+               case 'p':
+                       dl->pretty_output = true;
+                       break;
+               case 'v':
+                       dl->verbose = true;
+                       break;
                default:
                        pr_err("Unknown option.\n");
                        help();
-                       return EXIT_FAILURE;
+                       ret = EXIT_FAILURE;
+                       goto dl_free;
                }
        }