]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - devlink/devlink.c
devlink: extend reload command to add support for network namespace change
[mirror_iproute2.git] / devlink / devlink.c
index 220b2bb2f3bd8a4bb08d8f3e6978a42a1b380088..a0cd6a47d26fa09f5c7995343b82fad0c472b0fd 100644 (file)
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <string.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <limits.h>
 #include <errno.h>
+#include <inttypes.h>
+#include <sys/sysinfo.h>
+#define _LINUX_SYSINFO_H /* avoid collision with musl header */
 #include <linux/genetlink.h>
 #include <linux/devlink.h>
 #include <libmnl/libmnl.h>
 #include <netinet/ether.h>
+#include <sys/types.h>
 
 #include "SNAPSHOT.h"
 #include "list.h"
 #include "mnlg.h"
 #include "json_writer.h"
 #include "utils.h"
+#include "namespace.h"
 
 #define ESWITCH_MODE_LEGACY "legacy"
 #define ESWITCH_MODE_SWITCHDEV "switchdev"
 #define ESWITCH_INLINE_MODE_NETWORK "network"
 #define ESWITCH_INLINE_MODE_TRANSPORT "transport"
 
-#define pr_err(args...) fprintf(stderr, ##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)
+#define PARAM_CMODE_RUNTIME_STR "runtime"
+#define PARAM_CMODE_DRIVERINIT_STR "driverinit"
+#define PARAM_CMODE_PERMANENT_STR "permanent"
+#define DL_ARGS_REQUIRED_MAX_ERR_LEN 80
 
+#define HEALTH_REPORTER_STATE_HEALTHY_STR "healthy"
+#define HEALTH_REPORTER_STATE_ERROR_STR "error"
+#define HEALTH_REPORTER_TIMESTAMP_FMT_LEN 80
+
+static int g_new_line_count;
 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 __attribute__((format(printf, 1, 2)))
+pr_err(const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+}
+
+static void __attribute__((format(printf, 1, 2)))
+pr_out(const char *fmt, ...)
+{
+       va_list ap;
+
+       if (g_indent_newline) {
+               printf("%s", g_indent_str);
+               g_indent_newline = false;
+       }
+       va_start(ap, fmt);
+       vprintf(fmt, ap);
+       va_end(ap);
+       g_new_line_count = 0;
+}
+
+static void __attribute__((format(printf, 2, 3)))
+pr_out_sp(unsigned int num, const char *fmt, ...)
+{
+       va_list ap;
+       int ret;
+
+       va_start(ap, fmt);
+       ret = vprintf(fmt, ap);
+       va_end(ap);
+
+       if (ret < num)
+               printf("%*s", num - ret, "");
+       g_new_line_count = 0;                   \
+}
+
+static void __attribute__((format(printf, 1, 2)))
+pr_out_tty(const char *fmt, ...)
+{
+       va_list ap;
+
+       if (!isatty(STDOUT_FILENO))
+               return;
+       va_start(ap, fmt);
+       vprintf(fmt, ap);
+       va_end(ap);
+}
+
 static void __pr_out_indent_inc(void)
 {
        if (g_indent_level + INDENT_STR_STEP > INDENT_STR_MAXLEN)
@@ -77,8 +129,11 @@ static void __pr_out_indent_dec(void)
 
 static void __pr_out_newline(void)
 {
-       pr_out("\n");
-       g_indent_newline = true;
+       if (g_new_line_count < 1) {
+               pr_out("\n");
+               g_indent_newline = true;
+       }
+       g_new_line_count++;
 }
 
 static int _mnlg_socket_recv_run(struct mnlg_socket *nlg,
@@ -94,9 +149,8 @@ static int _mnlg_socket_recv_run(struct mnlg_socket *nlg,
        return 0;
 }
 
-static int _mnlg_socket_sndrcv(struct mnlg_socket *nlg,
-                              const struct nlmsghdr *nlh,
-                              mnl_cb_t data_cb, void *data)
+static int _mnlg_socket_send(struct mnlg_socket *nlg,
+                            const struct nlmsghdr *nlh)
 {
        int err;
 
@@ -105,6 +159,18 @@ static int _mnlg_socket_sndrcv(struct mnlg_socket *nlg,
                pr_err("Failed to call mnlg_socket_send\n");
                return -errno;
        }
+       return 0;
+}
+
+static int _mnlg_socket_sndrcv(struct mnlg_socket *nlg,
+                              const struct nlmsghdr *nlh,
+                              mnl_cb_t data_cb, void *data)
+{
+       int err;
+
+       err = _mnlg_socket_send(nlg, nlh);
+       if (err)
+               return err;
        return _mnlg_socket_recv_run(nlg, data_cb, data);
 }
 
@@ -178,9 +244,27 @@ static void ifname_map_free(struct ifname_map *ifname_map)
 #define DL_OPT_DPIPE_TABLE_NAME        BIT(13)
 #define DL_OPT_DPIPE_TABLE_COUNTERS    BIT(14)
 #define DL_OPT_ESWITCH_ENCAP_MODE      BIT(15)
+#define DL_OPT_RESOURCE_PATH   BIT(16)
+#define DL_OPT_RESOURCE_SIZE   BIT(17)
+#define DL_OPT_PARAM_NAME      BIT(18)
+#define DL_OPT_PARAM_VALUE     BIT(19)
+#define DL_OPT_PARAM_CMODE     BIT(20)
+#define DL_OPT_HANDLE_REGION           BIT(21)
+#define DL_OPT_REGION_SNAPSHOT_ID      BIT(22)
+#define DL_OPT_REGION_ADDRESS          BIT(23)
+#define DL_OPT_REGION_LENGTH           BIT(24)
+#define DL_OPT_FLASH_FILE_NAME BIT(25)
+#define DL_OPT_FLASH_COMPONENT BIT(26)
+#define DL_OPT_HEALTH_REPORTER_NAME    BIT(27)
+#define DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD BIT(28)
+#define DL_OPT_HEALTH_REPORTER_AUTO_RECOVER    BIT(29)
+#define DL_OPT_TRAP_NAME               BIT(30)
+#define DL_OPT_TRAP_ACTION             BIT(31)
+#define DL_OPT_TRAP_GROUP_NAME         BIT(32)
+#define DL_OPT_NETNS   BIT(33)
 
 struct dl_opts {
-       uint32_t present; /* flags of present items */
+       uint64_t present; /* flags of present items */
        char *bus_name;
        char *dev_name;
        uint32_t port_index;
@@ -198,6 +282,27 @@ struct dl_opts {
        const char *dpipe_table_name;
        bool dpipe_counters_enable;
        bool eswitch_encap_mode;
+       const char *resource_path;
+       uint32_t resource_size;
+       uint32_t resource_id;
+       bool resource_id_valid;
+       const char *param_name;
+       const char *param_value;
+       enum devlink_param_cmode cmode;
+       char *region_name;
+       uint32_t region_snapshot_id;
+       uint64_t region_address;
+       uint64_t region_length;
+       const char *flash_file_name;
+       const char *flash_component;
+       const char *reporter_name;
+       uint64_t reporter_graceful_period;
+       bool reporter_auto_recover;
+       const char *trap_name;
+       const char *trap_group_name;
+       enum devlink_trap_action trap_action;
+       bool netns_is_pid;
+       uint32_t netns;
 };
 
 struct dl {
@@ -211,6 +316,7 @@ struct dl {
        bool json_output;
        bool pretty_output;
        bool verbose;
+       bool stats;
        struct {
                bool present;
                char *bus_name;
@@ -335,6 +441,54 @@ static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = {
        [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,
+       [DEVLINK_ATTR_PARAM] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_PARAM_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_PARAM_TYPE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_PARAM_VALUES_LIST] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_PARAM_VALUE] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_PARAM_VALUE_CMODE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_REGION_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_REGION_SIZE] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_REGION_SNAPSHOTS] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_REGION_SNAPSHOT] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_REGION_SNAPSHOT_ID] = MNL_TYPE_U32,
+       [DEVLINK_ATTR_REGION_CHUNKS] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_REGION_CHUNK] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_REGION_CHUNK_DATA] = MNL_TYPE_BINARY,
+       [DEVLINK_ATTR_REGION_CHUNK_ADDR] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_REGION_CHUNK_LEN] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_INFO_DRIVER_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_INFO_SERIAL_NUMBER] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_INFO_VERSION_FIXED] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_INFO_VERSION_RUNNING] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_INFO_VERSION_STORED] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_INFO_VERSION_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_INFO_VERSION_VALUE] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_HEALTH_REPORTER] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_HEALTH_REPORTER_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_HEALTH_REPORTER_STATE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_FLASH_UPDATE_COMPONENT] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_STATS] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_TRAP_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_TRAP_ACTION] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_TRAP_TYPE] = MNL_TYPE_U8,
+       [DEVLINK_ATTR_TRAP_GENERIC] = MNL_TYPE_FLAG,
+       [DEVLINK_ATTR_TRAP_METADATA] = MNL_TYPE_NESTED,
+       [DEVLINK_ATTR_TRAP_GROUP_NAME] = MNL_TYPE_STRING,
+       [DEVLINK_ATTR_RELOAD_FAILED] = MNL_TYPE_U8,
+};
+
+static const enum mnl_attr_data_type
+devlink_stats_policy[DEVLINK_ATTR_STATS_MAX + 1] = {
+       [DEVLINK_ATTR_STATS_RX_PACKETS] = MNL_TYPE_U64,
+       [DEVLINK_ATTR_STATS_RX_BYTES] = MNL_TYPE_U64,
 };
 
 static int attr_cb(const struct nlattr *attr, void *data)
@@ -353,6 +507,25 @@ static int attr_cb(const struct nlattr *attr, void *data)
        return MNL_CB_OK;
 }
 
+static int attr_stats_cb(const struct nlattr *attr, void *data)
+{
+       const struct nlattr **tb = data;
+       int type;
+
+       /* Allow the tool to work on top of newer kernels that might contain
+        * more attributes.
+        */
+       if (mnl_attr_type_valid(attr, DEVLINK_ATTR_STATS_MAX) < 0)
+               return MNL_CB_OK;
+
+       type = mnl_attr_get_type(attr);
+       if (mnl_attr_validate(attr, devlink_stats_policy[type]) < 0)
+               return MNL_CB_ERROR;
+
+       tb[type] = attr;
+       return MNL_CB_OK;
+}
+
 static int ifname_map_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
@@ -473,6 +646,20 @@ static int strslashrsplit(char *str, char **before, char **after)
        return 0;
 }
 
+static int strtouint64_t(const char *str, uint64_t *p_val)
+{
+       char *endptr;
+       unsigned long long int val;
+
+       val = strtoull(str, &endptr, 10);
+       if (endptr == str || *endptr != '\0')
+               return -EINVAL;
+       if (val > ULONG_MAX)
+               return -ERANGE;
+       *p_val = val;
+       return 0;
+}
+
 static int strtouint32_t(const char *str, uint32_t *p_val)
 {
        char *endptr;
@@ -501,6 +688,34 @@ static int strtouint16_t(const char *str, uint16_t *p_val)
        return 0;
 }
 
+static int strtouint8_t(const char *str, uint8_t *p_val)
+{
+       char *endptr;
+       unsigned long int val;
+
+       val = strtoul(str, &endptr, 10);
+       if (endptr == str || *endptr != '\0')
+               return -EINVAL;
+       if (val > UCHAR_MAX)
+               return -ERANGE;
+       *p_val = val;
+       return 0;
+}
+
+static int strtobool(const char *str, bool *p_val)
+{
+       bool val;
+
+       if (!strcmp(str, "true") || !strcmp(str, "1"))
+               val = true;
+       else if (!strcmp(str, "false") || !strcmp(str, "0"))
+               val = false;
+       else
+               return -EINVAL;
+       *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);
@@ -592,7 +807,7 @@ static int dl_argv_handle_port(struct dl *dl, char **p_bus_name,
 
 static int dl_argv_handle_both(struct dl *dl, char **p_bus_name,
                               char **p_dev_name, uint32_t *p_port_index,
-                              uint32_t *p_handle_bit)
+                              uint64_t *p_handle_bit)
 {
        char *str = dl_argv_next(dl);
        unsigned int slash_count;
@@ -630,6 +845,64 @@ static int dl_argv_handle_both(struct dl *dl, char **p_bus_name,
        return 0;
 }
 
+static int __dl_argv_handle_region(char *str, char **p_bus_name,
+                                  char **p_dev_name, char **p_region)
+{
+       char *handlestr;
+       int err;
+
+       err = strslashrsplit(str, &handlestr, p_region);
+       if (err) {
+               pr_err("Region identification \"%s\" is invalid\n", str);
+               return err;
+       }
+       err = strslashrsplit(handlestr, p_bus_name, p_dev_name);
+       if (err) {
+               pr_err("Region identification \"%s\" is invalid\n", str);
+               return err;
+       }
+       return 0;
+}
+
+static int dl_argv_handle_region(struct dl *dl, char **p_bus_name,
+                                       char **p_dev_name, char **p_region)
+{
+       char *str = dl_argv_next(dl);
+       unsigned int slash_count;
+
+       if (!str) {
+               pr_err("Expected \"bus_name/dev_name/region\" identification.\n");
+               return -EINVAL;
+       }
+
+       slash_count = strslashcount(str);
+       if (slash_count != 2) {
+               pr_err("Wrong region identification string format.\n");
+               pr_err("Expected \"bus_name/dev_name/region\" identification.\n"".\n");
+               return -EINVAL;
+       }
+
+       return __dl_argv_handle_region(str, p_bus_name, p_dev_name, p_region);
+}
+
+static int dl_argv_uint64_t(struct dl *dl, uint64_t *p_val)
+{
+       char *str = dl_argv_next(dl);
+       int err;
+
+       if (!str) {
+               pr_err("Unsigned number argument expected\n");
+               return -EINVAL;
+       }
+
+       err = strtouint64_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_uint32_t(struct dl *dl, uint32_t *p_val)
 {
        char *str = dl_argv_next(dl);
@@ -666,6 +939,24 @@ static int dl_argv_uint16_t(struct dl *dl, uint16_t *p_val)
        return 0;
 }
 
+static int dl_argv_bool(struct dl *dl, bool *p_val)
+{
+       char *str = dl_argv_next(dl);
+       int err;
+
+       if (!str) {
+               pr_err("Boolean argument expected\n");
+               return -EINVAL;
+       }
+
+       err = strtobool(str, p_val);
+       if (err) {
+               pr_err("\"%s\" is not a valid boolean value\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);
@@ -779,16 +1070,92 @@ static int eswitch_encap_mode_get(const char *typestr, bool *p_mode)
        return 0;
 }
 
-static int dl_argv_parse(struct dl *dl, uint32_t o_required,
-                        uint32_t o_optional)
+static int param_cmode_get(const char *cmodestr,
+                          enum devlink_param_cmode *cmode)
+{
+       if (strcmp(cmodestr, PARAM_CMODE_RUNTIME_STR) == 0) {
+               *cmode = DEVLINK_PARAM_CMODE_RUNTIME;
+       } else if (strcmp(cmodestr, PARAM_CMODE_DRIVERINIT_STR) == 0) {
+               *cmode = DEVLINK_PARAM_CMODE_DRIVERINIT;
+       } else if (strcmp(cmodestr, PARAM_CMODE_PERMANENT_STR) == 0) {
+               *cmode = DEVLINK_PARAM_CMODE_PERMANENT;
+       } else {
+               pr_err("Unknown configuration mode \"%s\"\n", cmodestr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+static int trap_action_get(const char *actionstr,
+                          enum devlink_trap_action *p_action)
+{
+       if (strcmp(actionstr, "drop") == 0) {
+               *p_action = DEVLINK_TRAP_ACTION_DROP;
+       } else if (strcmp(actionstr, "trap") == 0) {
+               *p_action = DEVLINK_TRAP_ACTION_TRAP;
+       } else {
+               pr_err("Unknown trap action \"%s\"\n", actionstr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+struct dl_args_metadata {
+       uint64_t o_flag;
+       char err_msg[DL_ARGS_REQUIRED_MAX_ERR_LEN];
+};
+
+static const struct dl_args_metadata dl_args_required[] = {
+       {DL_OPT_PORT_TYPE,            "Port type not set."},
+       {DL_OPT_PORT_COUNT,           "Port split count option expected."},
+       {DL_OPT_SB_POOL,              "Pool index option expected."},
+       {DL_OPT_SB_SIZE,              "Pool size option expected."},
+       {DL_OPT_SB_TYPE,              "Pool type option expected."},
+       {DL_OPT_SB_THTYPE,            "Pool threshold type option expected."},
+       {DL_OPT_SB_TH,                "Threshold option expected."},
+       {DL_OPT_SB_TC,                "TC index option expected."},
+       {DL_OPT_ESWITCH_MODE,         "E-Switch mode option expected."},
+       {DL_OPT_ESWITCH_INLINE_MODE,  "E-Switch inline-mode option expected."},
+       {DL_OPT_DPIPE_TABLE_NAME,     "Dpipe table name expected."},
+       {DL_OPT_DPIPE_TABLE_COUNTERS, "Dpipe table counter state expected."},
+       {DL_OPT_ESWITCH_ENCAP_MODE,   "E-Switch encapsulation option expected."},
+       {DL_OPT_PARAM_NAME,           "Parameter name expected."},
+       {DL_OPT_PARAM_VALUE,          "Value to set expected."},
+       {DL_OPT_PARAM_CMODE,          "Configuration mode expected."},
+       {DL_OPT_REGION_SNAPSHOT_ID,   "Region snapshot id expected."},
+       {DL_OPT_REGION_ADDRESS,       "Region address value expected."},
+       {DL_OPT_REGION_LENGTH,        "Region length value expected."},
+       {DL_OPT_HEALTH_REPORTER_NAME, "Reporter's name is expected."},
+       {DL_OPT_TRAP_NAME,            "Trap's name is expected."},
+       {DL_OPT_TRAP_GROUP_NAME,      "Trap group's name is expected."},
+};
+
+static int dl_args_finding_required_validate(uint64_t o_required,
+                                            uint64_t o_found)
+{
+       uint64_t o_flag;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(dl_args_required); i++) {
+               o_flag = dl_args_required[i].o_flag;
+               if ((o_required & o_flag) && !(o_found & o_flag)) {
+                       pr_err("%s\n", dl_args_required[i].err_msg);
+                       return -EINVAL;
+               }
+       }
+       return 0;
+}
+
+static int dl_argv_parse(struct dl *dl, uint64_t o_required,
+                        uint64_t o_optional)
 {
        struct dl_opts *opts = &dl->opts;
-       uint32_t o_all = o_required | o_optional;
-       uint32_t o_found = 0;
+       uint64_t o_all = o_required | o_optional;
+       uint64_t o_found = 0;
        int err;
 
        if (o_required & DL_OPT_HANDLE && o_required & DL_OPT_HANDLEP) {
-               uint32_t handle_bit;
+               uint64_t handle_bit;
 
                err = dl_argv_handle_both(dl, &opts->bus_name, &opts->dev_name,
                                          &opts->port_index, &handle_bit);
@@ -806,6 +1173,13 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                if (err)
                        return err;
                o_found |= DL_OPT_HANDLEP;
+       } else if (o_required & DL_OPT_HANDLE_REGION) {
+               err = dl_argv_handle_region(dl, &opts->bus_name,
+                                           &opts->dev_name,
+                                           &opts->region_name);
+               if (err)
+                       return err;
+               o_found |= DL_OPT_HANDLE_REGION;
        }
 
        while (dl_argc(dl)) {
@@ -946,6 +1320,145 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                        if (err)
                                return err;
                        o_found |= DL_OPT_ESWITCH_ENCAP_MODE;
+               } else if (dl_argv_match(dl, "path") &&
+                          (o_all & DL_OPT_RESOURCE_PATH)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->resource_path);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_RESOURCE_PATH;
+               } else if (dl_argv_match(dl, "size") &&
+                          (o_all & DL_OPT_RESOURCE_SIZE)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint32_t(dl, &opts->resource_size);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_RESOURCE_SIZE;
+               } else if (dl_argv_match(dl, "name") &&
+                          (o_all & DL_OPT_PARAM_NAME)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->param_name);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_PARAM_NAME;
+               } else if (dl_argv_match(dl, "value") &&
+                          (o_all & DL_OPT_PARAM_VALUE)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->param_value);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_PARAM_VALUE;
+               } else if (dl_argv_match(dl, "cmode") &&
+                          (o_all & DL_OPT_PARAM_CMODE)) {
+                       const char *cmodestr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &cmodestr);
+                       if (err)
+                               return err;
+                       err = param_cmode_get(cmodestr, &opts->cmode);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_PARAM_CMODE;
+               } else if (dl_argv_match(dl, "snapshot") &&
+                          (o_all & DL_OPT_REGION_SNAPSHOT_ID)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint32_t(dl, &opts->region_snapshot_id);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_REGION_SNAPSHOT_ID;
+               } else if (dl_argv_match(dl, "address") &&
+                          (o_all & DL_OPT_REGION_ADDRESS)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint64_t(dl, &opts->region_address);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_REGION_ADDRESS;
+               } else if (dl_argv_match(dl, "length") &&
+                          (o_all & DL_OPT_REGION_LENGTH)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint64_t(dl, &opts->region_length);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_REGION_LENGTH;
+               } else if (dl_argv_match(dl, "file") &&
+                          (o_all & DL_OPT_FLASH_FILE_NAME)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->flash_file_name);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_FLASH_FILE_NAME;
+               } else if (dl_argv_match(dl, "component") &&
+                          (o_all & DL_OPT_FLASH_COMPONENT)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->flash_component);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_FLASH_COMPONENT;
+               } else if (dl_argv_match(dl, "reporter") &&
+                          (o_all & DL_OPT_HEALTH_REPORTER_NAME)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->reporter_name);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_HEALTH_REPORTER_NAME;
+               } else if (dl_argv_match(dl, "grace_period") &&
+                          (o_all & DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_uint64_t(dl,
+                                              &opts->reporter_graceful_period);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD;
+               } else if (dl_argv_match(dl, "auto_recover") &&
+                       (o_all & DL_OPT_HEALTH_REPORTER_AUTO_RECOVER)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_bool(dl, &opts->reporter_auto_recover);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_HEALTH_REPORTER_AUTO_RECOVER;
+               } else if (dl_argv_match(dl, "trap") &&
+                          (o_all & DL_OPT_TRAP_NAME)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->trap_name);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_TRAP_NAME;
+               } else if (dl_argv_match(dl, "group") &&
+                          (o_all & DL_OPT_TRAP_GROUP_NAME)) {
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &opts->trap_group_name);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_TRAP_GROUP_NAME;
+               } else if (dl_argv_match(dl, "action") &&
+                          (o_all & DL_OPT_TRAP_ACTION)) {
+                       const char *actionstr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &actionstr);
+                       if (err)
+                               return err;
+                       err = trap_action_get(actionstr, &opts->trap_action);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_TRAP_ACTION;
+               } else if (dl_argv_match(dl, "netns") &&
+                       (o_all & DL_OPT_NETNS)) {
+                       const char *netns_str;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &netns_str);
+                       if (err)
+                               return err;
+                       opts->netns = netns_get_fd(netns_str);
+                       if (opts->netns < 0) {
+                               err = dl_argv_uint32_t(dl, &opts->netns);
+                               if (err)
+                                       return err;
+                               opts->netns_is_pid = true;
+                       }
+                       o_found |= DL_OPT_NETNS;
                } else {
                        pr_err("Unknown option \"%s\"\n", dl_argv(dl));
                        return -EINVAL;
@@ -959,92 +1472,26 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                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;
-       }
-
-       if ((o_required & DL_OPT_PORT_COUNT) &&
-           !(o_found & DL_OPT_PORT_COUNT)) {
-               pr_err("Port split count option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_SB_POOL) && !(o_found & DL_OPT_SB_POOL)) {
-               pr_err("Pool index option expected.\n");
-               return -EINVAL;
-       }
+       return dl_args_finding_required_validate(o_required, o_found);
+}
 
-       if ((o_required & DL_OPT_SB_SIZE) && !(o_found & DL_OPT_SB_SIZE)) {
-               pr_err("Pool size option expected.\n");
-               return -EINVAL;
-       }
+static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
+{
+       struct dl_opts *opts = &dl->opts;
 
-       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;
-}
-
-static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
-{
-       struct dl_opts *opts = &dl->opts;
-
-       if (opts->present & DL_OPT_HANDLE) {
-               mnl_attr_put_strz(nlh, DEVLINK_ATTR_BUS_NAME, opts->bus_name);
-               mnl_attr_put_strz(nlh, DEVLINK_ATTR_DEV_NAME, opts->dev_name);
-       } else if (opts->present & DL_OPT_HANDLEP) {
-               mnl_attr_put_strz(nlh, DEVLINK_ATTR_BUS_NAME, opts->bus_name);
-               mnl_attr_put_strz(nlh, DEVLINK_ATTR_DEV_NAME, opts->dev_name);
-               mnl_attr_put_u32(nlh, DEVLINK_ATTR_PORT_INDEX,
-                                opts->port_index);
+       if (opts->present & DL_OPT_HANDLE) {
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_BUS_NAME, opts->bus_name);
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_DEV_NAME, opts->dev_name);
+       } else if (opts->present & DL_OPT_HANDLEP) {
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_BUS_NAME, opts->bus_name);
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_DEV_NAME, opts->dev_name);
+               mnl_attr_put_u32(nlh, DEVLINK_ATTR_PORT_INDEX,
+                                opts->port_index);
+       } else if (opts->present & DL_OPT_HANDLE_REGION) {
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_BUS_NAME, opts->bus_name);
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_DEV_NAME, opts->dev_name);
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_REGION_NAME,
+                                 opts->region_name);
        }
        if (opts->present & DL_OPT_PORT_TYPE)
                mnl_attr_put_u16(nlh, DEVLINK_ATTR_PORT_TYPE,
@@ -1088,10 +1535,61 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
        if (opts->present & DL_OPT_ESWITCH_ENCAP_MODE)
                mnl_attr_put_u8(nlh, DEVLINK_ATTR_ESWITCH_ENCAP_MODE,
                                opts->eswitch_encap_mode);
+       if ((opts->present & DL_OPT_RESOURCE_PATH) && opts->resource_id_valid)
+               mnl_attr_put_u64(nlh, DEVLINK_ATTR_RESOURCE_ID,
+                                opts->resource_id);
+       if (opts->present & DL_OPT_RESOURCE_SIZE)
+               mnl_attr_put_u64(nlh, DEVLINK_ATTR_RESOURCE_SIZE,
+                                opts->resource_size);
+       if (opts->present & DL_OPT_PARAM_NAME)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_PARAM_NAME,
+                                 opts->param_name);
+       if (opts->present & DL_OPT_PARAM_CMODE)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_VALUE_CMODE,
+                               opts->cmode);
+       if (opts->present & DL_OPT_REGION_SNAPSHOT_ID)
+               mnl_attr_put_u32(nlh, DEVLINK_ATTR_REGION_SNAPSHOT_ID,
+                                opts->region_snapshot_id);
+       if (opts->present & DL_OPT_REGION_ADDRESS)
+               mnl_attr_put_u64(nlh, DEVLINK_ATTR_REGION_CHUNK_ADDR,
+                                opts->region_address);
+       if (opts->present & DL_OPT_REGION_LENGTH)
+               mnl_attr_put_u64(nlh, DEVLINK_ATTR_REGION_CHUNK_LEN,
+                                opts->region_length);
+       if (opts->present & DL_OPT_FLASH_FILE_NAME)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME,
+                                 opts->flash_file_name);
+       if (opts->present & DL_OPT_FLASH_COMPONENT)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_FLASH_UPDATE_COMPONENT,
+                                 opts->flash_component);
+       if (opts->present & DL_OPT_HEALTH_REPORTER_NAME)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_HEALTH_REPORTER_NAME,
+                                 opts->reporter_name);
+       if (opts->present & DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD)
+               mnl_attr_put_u64(nlh,
+                                DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD,
+                                opts->reporter_graceful_period);
+       if (opts->present & DL_OPT_HEALTH_REPORTER_AUTO_RECOVER)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER,
+                               opts->reporter_auto_recover);
+       if (opts->present & DL_OPT_TRAP_NAME)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_TRAP_NAME,
+                                 opts->trap_name);
+       if (opts->present & DL_OPT_TRAP_GROUP_NAME)
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_TRAP_GROUP_NAME,
+                                 opts->trap_group_name);
+       if (opts->present & DL_OPT_TRAP_ACTION)
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_TRAP_ACTION,
+                               opts->trap_action);
+       if (opts->present & DL_OPT_NETNS)
+               mnl_attr_put_u32(nlh,
+                                opts->netns_is_pid ? DEVLINK_ATTR_NETNS_PID :
+                                                     DEVLINK_ATTR_NETNS_FD,
+                                opts->netns);
 }
 
 static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
-                            uint32_t o_required, uint32_t o_optional)
+                            uint64_t o_required, uint64_t o_optional)
 {
        int err;
 
@@ -1146,6 +1644,11 @@ static void cmd_dev_help(void)
        pr_err("                               [ inline-mode { none | link | network | transport } ]\n");
        pr_err("                               [ encap { disable | enable } ]\n");
        pr_err("       devlink dev eswitch show DEV\n");
+       pr_err("       devlink dev param set DEV name PARAMETER value VALUE cmode { permanent | driverinit | runtime }\n");
+       pr_err("       devlink dev param show [DEV name PARAMETER]\n");
+       pr_err("       devlink dev reload DEV [ netns { PID | NAME | ID } ]\n");
+       pr_err("       devlink dev info [ DEV ]\n");
+       pr_err("       devlink dev flash DEV file PATH [ component NAME ]\n");
 }
 
 static bool cmp_arr_last_handle(struct dl *dl, const char *bus_name,
@@ -1185,7 +1688,7 @@ static void __pr_out_handle_start(struct dl *dl, struct nlattr **tb,
 {
        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];
+       char buf[64];
 
        sprintf(buf, "%s/%s", bus_name, dev_name);
 
@@ -1278,7 +1781,7 @@ static void __pr_out_port_handle_start(struct dl *dl, const char *bus_name,
                                       uint32_t port_index, bool try_nice,
                                       bool array)
 {
-       static char buf[32];
+       static char buf[64];
        char *ifname = NULL;
 
        if (dl->no_nice_names || !try_nice ||
@@ -1359,6 +1862,14 @@ static void pr_out_str(struct dl *dl, const char *name, const char *val)
        }
 }
 
+static void pr_out_bool(struct dl *dl, const char *name, bool val)
+{
+       if (dl->json_output)
+               jsonw_bool_field(dl->jw, name, val);
+       else
+               pr_out_str(dl, name, val ? "true" : "false");
+}
+
 static void pr_out_uint(struct dl *dl, const char *name, unsigned int val)
 {
        if (dl->json_output) {
@@ -1371,9 +1882,124 @@ static void pr_out_uint(struct dl *dl, const char *name, unsigned int val)
        }
 }
 
-static void pr_out_dev(struct dl *dl, struct nlattr **tb)
+static void pr_out_u64(struct dl *dl, const char *name, uint64_t val)
+{
+       if (val == (uint64_t) -1)
+               return pr_out_str(dl, name, "unlimited");
+
+       if (dl->json_output) {
+               jsonw_u64_field(dl->jw, name, val);
+       } else {
+               if (g_indent_newline)
+                       pr_out("%s %"PRIu64, name, val);
+               else
+                       pr_out(" %s %"PRIu64, name, val);
+       }
+}
+
+static void pr_out_bool_value(struct dl *dl, bool value)
+{
+       if (dl->json_output)
+               jsonw_bool(dl->jw, value);
+       else
+               pr_out(" %s", value ? "true" : "false");
+}
+
+static void pr_out_uint_value(struct dl *dl, unsigned int value)
+{
+       if (dl->json_output)
+               jsonw_uint(dl->jw, value);
+       else
+               pr_out(" %u", value);
+}
+
+static void pr_out_uint64_value(struct dl *dl, uint64_t value)
+{
+       if (dl->json_output)
+               jsonw_u64(dl->jw, value);
+       else
+               pr_out(" %"PRIu64, value);
+}
+
+static bool is_binary_eol(int i)
+{
+       return !(i%16);
+}
+
+static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
+{
+       int i = 0;
+
+       while (i < len) {
+               if (dl->json_output)
+                       jsonw_printf(dl->jw, "%d", data[i]);
+               else
+                       pr_out("%02x ", data[i]);
+               i++;
+               if (!dl->json_output && is_binary_eol(i))
+                       __pr_out_newline();
+       }
+       if (!dl->json_output && !is_binary_eol(i))
+               __pr_out_newline();
+}
+
+static void pr_out_str_value(struct dl *dl, const char *value)
+{
+       if (dl->json_output)
+               jsonw_string(dl->jw, value);
+       else
+               pr_out(" %s", value);
+}
+
+static void pr_out_name(struct dl *dl, const char *name)
+{
+       if (dl->json_output)
+               jsonw_name(dl->jw, name);
+       else
+               pr_out(" %s:", name);
+}
+
+static void pr_out_region_chunk_start(struct dl *dl, uint64_t addr)
+{
+       if (dl->json_output) {
+               jsonw_name(dl->jw, "address");
+               jsonw_uint(dl->jw, addr);
+               jsonw_name(dl->jw, "data");
+               jsonw_start_array(dl->jw);
+       }
+}
+
+static void pr_out_region_chunk_end(struct dl *dl)
+{
+       if (dl->json_output)
+               jsonw_end_array(dl->jw);
+}
+
+static void pr_out_region_chunk(struct dl *dl, uint8_t *data, uint32_t len,
+                               uint64_t addr)
 {
-       pr_out_handle(dl, tb);
+       static uint64_t align_val;
+       uint32_t i = 0;
+
+       pr_out_region_chunk_start(dl, addr);
+       while (i < len) {
+               if (!dl->json_output)
+                       if (!(align_val % 16))
+                               pr_out("%s%016"PRIx64" ",
+                                      align_val ? "\n" : "",
+                                      addr);
+
+               align_val++;
+
+               if (dl->json_output)
+                       jsonw_printf(dl->jw, "%d", data[i]);
+               else
+                       pr_out("%02x ", data[i]);
+
+               addr++;
+               i++;
+       }
+       pr_out_region_chunk_end(dl);
 }
 
 static void pr_out_section_start(struct dl *dl, const char *name)
@@ -1401,20 +2027,46 @@ static void pr_out_array_start(struct dl *dl, const char *name)
                jsonw_name(dl->jw, name);
                jsonw_start_array(dl->jw);
        } else {
-               if (!g_indent_newline)
-                       __pr_out_newline();
-               pr_out("%s:", name);
+               __pr_out_indent_inc();
                __pr_out_newline();
+               pr_out("%s:", name);
                __pr_out_indent_inc();
+               __pr_out_newline();
        }
 }
 
 static void pr_out_array_end(struct dl *dl)
 {
-       if (dl->json_output)
+       if (dl->json_output) {
                jsonw_end_array(dl->jw);
-       else
+       } else {
+               __pr_out_indent_dec();
+               __pr_out_indent_dec();
+       }
+}
+
+static void pr_out_object_start(struct dl *dl, const char *name)
+{
+       if (dl->json_output) {
+               jsonw_name(dl->jw, name);
+               jsonw_start_object(dl->jw);
+       } else {
+               __pr_out_indent_inc();
+               __pr_out_newline();
+               pr_out("%s:", name);
+               __pr_out_indent_inc();
+               __pr_out_newline();
+       }
+}
+
+static void pr_out_object_end(struct dl *dl)
+{
+       if (dl->json_output) {
+               jsonw_end_object(dl->jw);
+       } else {
+               __pr_out_indent_dec();
                __pr_out_indent_dec();
+       }
 }
 
 static void pr_out_entry_start(struct dl *dl)
@@ -1431,6 +2083,43 @@ static void pr_out_entry_end(struct dl *dl)
                __pr_out_newline();
 }
 
+static void pr_out_stats(struct dl *dl, struct nlattr *nla_stats)
+{
+       struct nlattr *tb[DEVLINK_ATTR_STATS_MAX + 1] = {};
+       int err;
+
+       if (!dl->stats)
+               return;
+
+       err = mnl_attr_parse_nested(nla_stats, attr_stats_cb, tb);
+       if (err != MNL_CB_OK)
+               return;
+
+       pr_out_object_start(dl, "stats");
+       pr_out_object_start(dl, "rx");
+       if (tb[DEVLINK_ATTR_STATS_RX_BYTES])
+               pr_out_u64(dl, "bytes",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_STATS_RX_BYTES]));
+       if (tb[DEVLINK_ATTR_STATS_RX_PACKETS])
+               pr_out_u64(dl, "packets",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_STATS_RX_PACKETS]));
+       pr_out_object_end(dl);
+       pr_out_object_end(dl);
+}
+
+static const char *param_cmode_name(uint8_t cmode)
+{
+       switch (cmode) {
+       case DEVLINK_PARAM_CMODE_RUNTIME:
+               return PARAM_CMODE_RUNTIME_STR;
+       case DEVLINK_PARAM_CMODE_DRIVERINIT:
+               return PARAM_CMODE_DRIVERINIT_STR;
+       case DEVLINK_PARAM_CMODE_PERMANENT:
+               return PARAM_CMODE_PERMANENT_STR;
+       default: return "<unknown type>";
+       }
+}
+
 static const char *eswitch_mode_name(uint32_t mode)
 {
        switch (mode) {
@@ -1549,270 +2238,491 @@ static int cmd_dev_eswitch(struct dl *dl)
        return -ENOENT;
 }
 
-static int cmd_dev_show_cb(const struct nlmsghdr *nlh, void *data)
+struct param_val_conv {
+       const char *name;
+       const char *vstr;
+       uint32_t vuint;
+};
+
+static bool param_val_conv_exists(const struct param_val_conv *param_val_conv,
+                                 uint32_t len, const char *name)
 {
-       struct dl *dl = data;
-       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
-       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       uint32_t i;
 
-       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;
+       for (i = 0; i < len; i++)
+               if (!strcmp(param_val_conv[i].name, name))
+                       return true;
+
+       return false;
 }
 
-static int cmd_dev_show(struct dl *dl)
+static int
+param_val_conv_uint_get(const struct param_val_conv *param_val_conv,
+                       uint32_t len, const char *name, const char *vstr,
+                       uint32_t *vuint)
 {
-       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);
+       uint32_t i;
 
-       if (dl_argc(dl) > 0) {
-               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
-               if (err)
-                       return err;
-       }
+       for (i = 0; i < len; i++)
+               if (!strcmp(param_val_conv[i].name, name) &&
+                   !strcmp(param_val_conv[i].vstr, vstr)) {
+                       *vuint = param_val_conv[i].vuint;
+                       return 0;
+               }
 
-       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;
+       return -ENOENT;
 }
 
-static int cmd_dev(struct dl *dl)
+static int
+param_val_conv_str_get(const struct param_val_conv *param_val_conv,
+                      uint32_t len, const char *name, uint32_t vuint,
+                      const char **vstr)
 {
-       if (dl_argv_match(dl, "help")) {
-               cmd_dev_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_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));
+       uint32_t i;
+
+       for (i = 0; i < len; i++)
+               if (!strcmp(param_val_conv[i].name, name) &&
+                   param_val_conv[i].vuint == vuint) {
+                       *vstr = param_val_conv[i].vstr;
+                       return 0;
+               }
+
        return -ENOENT;
 }
 
-static void cmd_port_help(void)
-{
-       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 struct param_val_conv param_val_conv[] = {
+       {
+               .name = "fw_load_policy",
+               .vstr = "driver",
+               .vuint = DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER,
+       },
+       {
+               .name = "fw_load_policy",
+               .vstr = "flash",
+               .vuint = DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH,
+       },
+       {
+               .name = "reset_dev_on_drv_probe",
+               .vstr = "unknown",
+               .vuint = DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_UNKNOWN,
+       },
+       {
+               .name = "fw_load_policy",
+               .vstr = "unknown",
+               .vuint = DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN,
+       },
+       {
+               .name = "reset_dev_on_drv_probe",
+               .vstr = "always",
+               .vuint = DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_ALWAYS,
+       },
+       {
+               .name = "reset_dev_on_drv_probe",
+               .vstr = "never",
+               .vuint = DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_NEVER,
+       },
+       {
+               .name = "reset_dev_on_drv_probe",
+               .vstr = "disk",
+               .vuint = DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_DISK,
+       },
+};
 
-static const char *port_type_name(uint32_t type)
-{
-       switch (type) {
-       case DEVLINK_PORT_TYPE_NOTSET: return "notset";
-       case DEVLINK_PORT_TYPE_AUTO: return "auto";
-       case DEVLINK_PORT_TYPE_ETH: return "eth";
-       case DEVLINK_PORT_TYPE_IB: return "ib";
-       default: return "<unknown type>";
-       }
-}
+#define PARAM_VAL_CONV_LEN ARRAY_SIZE(param_val_conv)
 
-static void pr_out_port(struct dl *dl, struct nlattr **tb)
+static void pr_out_param_value(struct dl *dl, const char *nla_name,
+                              int nla_type, struct nlattr *nl)
 {
-       struct nlattr *pt_attr = tb[DEVLINK_ATTR_PORT_TYPE];
-       struct nlattr *dpt_attr = tb[DEVLINK_ATTR_PORT_DESIRED_TYPE];
+       struct nlattr *nla_value[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *val_attr;
+       const char *vstr;
+       bool conv_exists;
+       int err;
 
-       pr_out_port_handle_start(dl, tb, false);
-       if (pt_attr) {
-               uint16_t port_type = mnl_attr_get_u16(pt_attr);
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_value);
+       if (err != MNL_CB_OK)
+               return;
 
-               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 (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] ||
+           (nla_type != MNL_TYPE_FLAG &&
+            !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]))
+               return;
 
-                       if (port_type != des_port_type)
-                               pr_out_str(dl, "des_type",
-                                          port_type_name(des_port_type));
+       pr_out_str(dl, "cmode",
+                  param_cmode_name(mnl_attr_get_u8(nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE])));
+       val_attr = nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA];
+
+       conv_exists = param_val_conv_exists(param_val_conv, PARAM_VAL_CONV_LEN,
+                                           nla_name);
+
+       switch (nla_type) {
+       case MNL_TYPE_U8:
+               if (conv_exists) {
+                       err = param_val_conv_str_get(param_val_conv,
+                                                    PARAM_VAL_CONV_LEN,
+                                                    nla_name,
+                                                    mnl_attr_get_u8(val_attr),
+                                                    &vstr);
+                       if (err)
+                               return;
+                       pr_out_str(dl, "value", vstr);
+               } else {
+                       pr_out_uint(dl, "value", mnl_attr_get_u8(val_attr));
+               }
+               break;
+       case MNL_TYPE_U16:
+               if (conv_exists) {
+                       err = param_val_conv_str_get(param_val_conv,
+                                                    PARAM_VAL_CONV_LEN,
+                                                    nla_name,
+                                                    mnl_attr_get_u16(val_attr),
+                                                    &vstr);
+                       if (err)
+                               return;
+                       pr_out_str(dl, "value", vstr);
+               } else {
+                       pr_out_uint(dl, "value", mnl_attr_get_u16(val_attr));
+               }
+               break;
+       case MNL_TYPE_U32:
+               if (conv_exists) {
+                       err = param_val_conv_str_get(param_val_conv,
+                                                    PARAM_VAL_CONV_LEN,
+                                                    nla_name,
+                                                    mnl_attr_get_u32(val_attr),
+                                                    &vstr);
+                       if (err)
+                               return;
+                       pr_out_str(dl, "value", vstr);
+               } else {
+                       pr_out_uint(dl, "value", mnl_attr_get_u32(val_attr));
                }
+               break;
+       case MNL_TYPE_STRING:
+               pr_out_str(dl, "value", mnl_attr_get_str(val_attr));
+               break;
+       case MNL_TYPE_FLAG:
+               pr_out_bool(dl, "value", val_attr ? true : false);
+               break;
        }
-       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)
+static void pr_out_param(struct dl *dl, struct nlattr **tb, bool array)
+{
+       struct nlattr *nla_param[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *param_value_attr;
+       const char *nla_name;
+       int nla_type;
+       int err;
+
+       err = mnl_attr_parse_nested(tb[DEVLINK_ATTR_PARAM], attr_cb, nla_param);
+       if (err != MNL_CB_OK)
+               return;
+       if (!nla_param[DEVLINK_ATTR_PARAM_NAME] ||
+           !nla_param[DEVLINK_ATTR_PARAM_TYPE] ||
+           !nla_param[DEVLINK_ATTR_PARAM_VALUES_LIST])
+               return;
+
+       if (array)
+               pr_out_handle_start_arr(dl, tb);
+       else
+               __pr_out_handle_start(dl, tb, true, false);
+
+       nla_type = mnl_attr_get_u8(nla_param[DEVLINK_ATTR_PARAM_TYPE]);
+
+       nla_name = mnl_attr_get_str(nla_param[DEVLINK_ATTR_PARAM_NAME]);
+       pr_out_str(dl, "name", nla_name);
+
+       if (!nla_param[DEVLINK_ATTR_PARAM_GENERIC])
+               pr_out_str(dl, "type", "driver-specific");
+       else
+               pr_out_str(dl, "type", "generic");
+
+       pr_out_array_start(dl, "values");
+       mnl_attr_for_each_nested(param_value_attr,
+                                nla_param[DEVLINK_ATTR_PARAM_VALUES_LIST]) {
+               pr_out_entry_start(dl);
+               pr_out_param_value(dl, nla_name, nla_type, param_value_attr);
+               pr_out_entry_end(dl);
+       }
+       pr_out_array_end(dl);
+       pr_out_handle_end(dl);
+}
+
+static int cmd_dev_param_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);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
 
        mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
        if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
-           !tb[DEVLINK_ATTR_PORT_INDEX])
+           !tb[DEVLINK_ATTR_PARAM])
                return MNL_CB_ERROR;
-       pr_out_port(dl, tb);
+       pr_out_param(dl, tb, true);
        return MNL_CB_OK;
 }
 
-static int cmd_port_show(struct dl *dl)
+struct param_ctx {
+       struct dl *dl;
+       int nla_type;
+       union {
+               uint8_t vu8;
+               uint16_t vu16;
+               uint32_t vu32;
+               const char *vstr;
+               bool vbool;
+       } value;
+};
+
+static int cmd_dev_param_set_cb(const struct nlmsghdr *nlh, void *data)
 {
-       struct nlmsghdr *nlh;
-       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *nla_param[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *param_value_attr;
+       enum devlink_param_cmode cmode;
+       struct param_ctx *ctx = data;
+       struct dl *dl = ctx->dl;
+       int nla_type;
        int err;
 
-       if (dl_argc(dl) == 0)
-               flags |= NLM_F_DUMP;
-
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_GET, flags);
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_PARAM])
+               return MNL_CB_ERROR;
 
-       if (dl_argc(dl) > 0) {
-               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
-               if (err)
-                       return err;
-       }
+       err = mnl_attr_parse_nested(tb[DEVLINK_ATTR_PARAM], attr_cb, nla_param);
+       if (err != MNL_CB_OK)
+               return MNL_CB_ERROR;
 
-       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;
-}
+       if (!nla_param[DEVLINK_ATTR_PARAM_TYPE] ||
+           !nla_param[DEVLINK_ATTR_PARAM_VALUES_LIST])
+               return MNL_CB_ERROR;
 
-static int cmd_port_set(struct dl *dl)
-{
-       struct nlmsghdr *nlh;
-       int err;
+       nla_type = mnl_attr_get_u8(nla_param[DEVLINK_ATTR_PARAM_TYPE]);
+       mnl_attr_for_each_nested(param_value_attr,
+                                nla_param[DEVLINK_ATTR_PARAM_VALUES_LIST]) {
+               struct nlattr *nla_value[DEVLINK_ATTR_MAX + 1] = {};
+               struct nlattr *val_attr;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SET,
-                              NLM_F_REQUEST | NLM_F_ACK);
+               err = mnl_attr_parse_nested(param_value_attr,
+                                           attr_cb, nla_value);
+               if (err != MNL_CB_OK)
+                       return MNL_CB_ERROR;
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_TYPE, 0);
-       if (err)
-               return err;
+               if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] ||
+                   (nla_type != MNL_TYPE_FLAG &&
+                    !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]))
+                       return MNL_CB_ERROR;
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+               cmode = mnl_attr_get_u8(nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE]);
+               if (cmode == dl->opts.cmode) {
+                       val_attr = nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA];
+                       switch (nla_type) {
+                       case MNL_TYPE_U8:
+                               ctx->value.vu8 = mnl_attr_get_u8(val_attr);
+                               break;
+                       case MNL_TYPE_U16:
+                               ctx->value.vu16 = mnl_attr_get_u16(val_attr);
+                               break;
+                       case MNL_TYPE_U32:
+                               ctx->value.vu32 = mnl_attr_get_u32(val_attr);
+                               break;
+                       case MNL_TYPE_STRING:
+                               ctx->value.vstr = mnl_attr_get_str(val_attr);
+                               break;
+                       case MNL_TYPE_FLAG:
+                               ctx->value.vbool = val_attr ? true : false;
+                               break;
+                       }
+                       break;
+               }
+       }
+       ctx->nla_type = nla_type;
+       return MNL_CB_OK;
 }
 
-static int cmd_port_split(struct dl *dl)
+static int cmd_dev_param_set(struct dl *dl)
 {
+       struct param_ctx ctx = {};
        struct nlmsghdr *nlh;
+       bool conv_exists;
+       uint32_t val_u32;
+       uint16_t val_u16;
+       uint8_t val_u8;
+       bool val_bool;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SPLIT,
+       err = dl_argv_parse(dl, DL_OPT_HANDLE |
+                           DL_OPT_PARAM_NAME |
+                           DL_OPT_PARAM_VALUE |
+                           DL_OPT_PARAM_CMODE, 0);
+       if (err)
+               return err;
+
+       /* Get value type */
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PARAM_GET,
                               NLM_F_REQUEST | NLM_F_ACK);
+       dl_opts_put(nlh, dl);
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_COUNT, 0);
+       ctx.dl = dl;
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_param_set_cb, &ctx);
        if (err)
                return err;
 
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PARAM_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+       dl_opts_put(nlh, dl);
+
+       conv_exists = param_val_conv_exists(param_val_conv, PARAM_VAL_CONV_LEN,
+                                           dl->opts.param_name);
+
+       mnl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_TYPE, ctx.nla_type);
+       switch (ctx.nla_type) {
+       case MNL_TYPE_U8:
+               if (conv_exists) {
+                       err = param_val_conv_uint_get(param_val_conv,
+                                                     PARAM_VAL_CONV_LEN,
+                                                     dl->opts.param_name,
+                                                     dl->opts.param_value,
+                                                     &val_u32);
+                       val_u8 = val_u32;
+               } else {
+                       err = strtouint8_t(dl->opts.param_value, &val_u8);
+               }
+               if (err)
+                       goto err_param_value_parse;
+               if (val_u8 == ctx.value.vu8)
+                       return 0;
+               mnl_attr_put_u8(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u8);
+               break;
+       case MNL_TYPE_U16:
+               if (conv_exists) {
+                       err = param_val_conv_uint_get(param_val_conv,
+                                                     PARAM_VAL_CONV_LEN,
+                                                     dl->opts.param_name,
+                                                     dl->opts.param_value,
+                                                     &val_u32);
+                       val_u16 = val_u32;
+               } else {
+                       err = strtouint16_t(dl->opts.param_value, &val_u16);
+               }
+               if (err)
+                       goto err_param_value_parse;
+               if (val_u16 == ctx.value.vu16)
+                       return 0;
+               mnl_attr_put_u16(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u16);
+               break;
+       case MNL_TYPE_U32:
+               if (conv_exists)
+                       err = param_val_conv_uint_get(param_val_conv,
+                                                     PARAM_VAL_CONV_LEN,
+                                                     dl->opts.param_name,
+                                                     dl->opts.param_value,
+                                                     &val_u32);
+               else
+                       err = strtouint32_t(dl->opts.param_value, &val_u32);
+               if (err)
+                       goto err_param_value_parse;
+               if (val_u32 == ctx.value.vu32)
+                       return 0;
+               mnl_attr_put_u32(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA, val_u32);
+               break;
+       case MNL_TYPE_FLAG:
+               err = strtobool(dl->opts.param_value, &val_bool);
+               if (err)
+                       goto err_param_value_parse;
+               if (val_bool == ctx.value.vbool)
+                       return 0;
+               if (val_bool)
+                       mnl_attr_put(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA,
+                                    0, NULL);
+               break;
+       case MNL_TYPE_STRING:
+               mnl_attr_put_strz(nlh, DEVLINK_ATTR_PARAM_VALUE_DATA,
+                                 dl->opts.param_value);
+               if (!strcmp(dl->opts.param_value, ctx.value.vstr))
+                       return 0;
+               break;
+       default:
+               printf("Value type not supported\n");
+               return -ENOTSUP;
+       }
        return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+
+err_param_value_parse:
+       pr_err("Value \"%s\" is not a number or not within range\n",
+              dl->opts.param_value);
+       return err;
 }
 
-static int cmd_port_unsplit(struct dl *dl)
+static int cmd_dev_param_show(struct dl *dl)
 {
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
        struct nlmsghdr *nlh;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_UNSPLIT,
-                              NLM_F_REQUEST | NLM_F_ACK);
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
-       if (err)
-               return err;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PARAM_GET, flags);
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE |
+                                       DL_OPT_PARAM_NAME, 0);
+               if (err)
+                       return err;
+       }
+
+       pr_out_section_start(dl, "param");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_param_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
 }
 
-static int cmd_port(struct dl *dl)
+static int cmd_dev_param(struct dl *dl)
 {
        if (dl_argv_match(dl, "help")) {
-               cmd_port_help();
+               cmd_dev_help();
                return 0;
        } else if (dl_argv_match(dl, "show") ||
-                  dl_argv_match(dl, "list") ||  dl_no_arg(dl)) {
+                  dl_argv_match(dl, "list") || dl_no_arg(dl)) {
                dl_arg_inc(dl);
-               return cmd_port_show(dl);
+               return cmd_dev_param_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);
+               return cmd_dev_param_set(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)
+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);
+       uint8_t reload_failed = 0;
 
        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])
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME])
                return MNL_CB_ERROR;
-       pr_out_sb(dl, tb);
+
+       if (tb[DEVLINK_ATTR_RELOAD_FAILED])
+               reload_failed = mnl_attr_get_u8(tb[DEVLINK_ATTR_RELOAD_FAILED]);
+
+       if (reload_failed) {
+               __pr_out_handle_start(dl, tb, true, false);
+               pr_out_bool(dl, "reload_failed", true);
+               pr_out_handle_end(dl);
+       } else {
+               pr_out_handle(dl, tb);
+       }
+
        return MNL_CB_OK;
 }
 
-static int cmd_sb_show(struct dl *dl)
+static int cmd_dev_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
@@ -1821,140 +2731,522 @@ static int cmd_sb_show(struct dl *dl)
        if (dl_argc(dl) == 0)
                flags |= NLM_F_DUMP;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_GET, flags);
+       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, DL_OPT_SB);
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
                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_start(dl, "dev");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_show_cb, dl);
        pr_out_section_end(dl);
        return err;
 }
 
-static const char *pool_type_name(uint8_t type)
+static void cmd_dev_reload_help(void)
 {
-       switch (type) {
-       case DEVLINK_SB_POOL_TYPE_INGRESS: return "ingress";
-       case DEVLINK_SB_POOL_TYPE_EGRESS: return "egress";
-       default: return "<unknown type>";
-       }
+       pr_err("Usage: devlink dev reload DEV [ netns { PID | NAME | ID } ]\n");
 }
 
-static const char *threshold_type_name(uint8_t type)
+static int cmd_dev_reload(struct dl *dl)
 {
-       switch (type) {
-       case DEVLINK_SB_THRESHOLD_TYPE_STATIC: return "static";
-       case DEVLINK_SB_THRESHOLD_TYPE_DYNAMIC: return "dynamic";
-       default: return "<unknown type>";
+       struct nlmsghdr *nlh;
+       int err;
+
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dev_reload_help();
+               return 0;
        }
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_RELOAD,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, DL_OPT_NETNS);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
 }
 
-static void pr_out_sb_pool(struct dl *dl, struct nlattr **tb)
+static void pr_out_versions_single(struct dl *dl, const struct nlmsghdr *nlh,
+                                  const char *name, int type)
 {
-       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])));
+       struct nlattr *version;
+
+       mnl_attr_for_each(version, nlh, sizeof(struct genlmsghdr)) {
+               struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+               const char *ver_value;
+               const char *ver_name;
+               int err;
+
+               if (mnl_attr_get_type(version) != type)
+                       continue;
+
+               err = mnl_attr_parse_nested(version, attr_cb, tb);
+               if (err != MNL_CB_OK)
+                       continue;
+
+               if (!tb[DEVLINK_ATTR_INFO_VERSION_NAME] ||
+                   !tb[DEVLINK_ATTR_INFO_VERSION_VALUE])
+                       continue;
+
+               if (name) {
+                       pr_out_object_start(dl, name);
+                       name = NULL;
+               }
+
+               ver_name = mnl_attr_get_str(tb[DEVLINK_ATTR_INFO_VERSION_NAME]);
+               ver_value = mnl_attr_get_str(tb[DEVLINK_ATTR_INFO_VERSION_VALUE]);
+
+               pr_out_str(dl, ver_name, ver_value);
+               if (!dl->json_output)
+                       __pr_out_newline();
+       }
+
+       if (!name)
+               pr_out_object_end(dl);
+}
+
+static void pr_out_info(struct dl *dl, const struct nlmsghdr *nlh,
+                       struct nlattr **tb, bool has_versions)
+{
+       __pr_out_handle_start(dl, tb, true, false);
+
+       __pr_out_indent_inc();
+       if (tb[DEVLINK_ATTR_INFO_DRIVER_NAME]) {
+               struct nlattr *nla_drv = tb[DEVLINK_ATTR_INFO_DRIVER_NAME];
+
+               if (!dl->json_output)
+                       __pr_out_newline();
+               pr_out_str(dl, "driver", mnl_attr_get_str(nla_drv));
+       }
+
+       if (tb[DEVLINK_ATTR_INFO_SERIAL_NUMBER]) {
+               struct nlattr *nla_sn = tb[DEVLINK_ATTR_INFO_SERIAL_NUMBER];
+
+               if (!dl->json_output)
+                       __pr_out_newline();
+               pr_out_str(dl, "serial_number", mnl_attr_get_str(nla_sn));
+       }
+       __pr_out_indent_dec();
+
+       if (has_versions) {
+               pr_out_object_start(dl, "versions");
+
+               pr_out_versions_single(dl, nlh, "fixed",
+                                      DEVLINK_ATTR_INFO_VERSION_FIXED);
+               pr_out_versions_single(dl, nlh, "running",
+                                      DEVLINK_ATTR_INFO_VERSION_RUNNING);
+               pr_out_versions_single(dl, nlh, "stored",
+                                      DEVLINK_ATTR_INFO_VERSION_STORED);
+
+               pr_out_object_end(dl);
+       }
+
        pr_out_handle_end(dl);
 }
 
-static int cmd_sb_pool_show_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_versions_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);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       bool has_versions, has_info;
+       struct dl *dl = data;
 
        mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
-       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
-           !tb[DEVLINK_ATTR_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])
+
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME])
                return MNL_CB_ERROR;
-       pr_out_sb_pool(dl, tb);
+
+       has_versions = tb[DEVLINK_ATTR_INFO_VERSION_FIXED] ||
+               tb[DEVLINK_ATTR_INFO_VERSION_RUNNING] ||
+               tb[DEVLINK_ATTR_INFO_VERSION_STORED];
+       has_info = tb[DEVLINK_ATTR_INFO_DRIVER_NAME] ||
+               tb[DEVLINK_ATTR_INFO_SERIAL_NUMBER] ||
+               has_versions;
+
+       if (has_info)
+               pr_out_info(dl, nlh, tb, has_versions);
+
        return MNL_CB_OK;
 }
 
-static int cmd_sb_pool_show(struct dl *dl)
+static void cmd_dev_info_help(void)
+{
+       pr_err("Usage: devlink dev info [ DEV ]\n");
+}
+
+static int cmd_dev_info(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
        int err;
 
+       if (dl_argv_match(dl, "help")) {
+               cmd_dev_info_help();
+               return 0;
+       }
+
        if (dl_argc(dl) == 0)
                flags |= NLM_F_DUMP;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_POOL_GET, flags);
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_INFO_GET, flags);
 
        if (dl_argc(dl) > 0) {
-               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE | DL_OPT_SB_POOL,
-                                       DL_OPT_SB);
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
                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_start(dl, "info");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_versions_show_cb, dl);
        pr_out_section_end(dl);
        return err;
 }
 
-static int cmd_sb_pool_set(struct dl *dl)
+static void cmd_dev_flash_help(void)
+{
+       pr_err("Usage: devlink dev flash DEV file PATH [ component NAME ]\n");
+}
+
+
+struct cmd_dev_flash_status_ctx {
+       struct dl *dl;
+       char *last_msg;
+       char *last_component;
+       uint8_t not_first:1,
+               last_pc:1,
+               received_end:1,
+               flash_done:1;
+};
+
+static int nullstrcmp(const char *str1, const char *str2)
+{
+       if (str1 && str2)
+               return strcmp(str1, str2);
+       if (!str1 && !str2)
+               return 0;
+       return str1 ? 1 : -1;
+}
+
+static int cmd_dev_flash_status_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct cmd_dev_flash_status_ctx *ctx = data;
+       struct dl_opts *opts = &ctx->dl->opts;
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       const char *component = NULL;
+       uint64_t done = 0, total = 0;
+       const char *msg = NULL;
+       const char *bus_name;
+       const char *dev_name;
+
+       if (genl->cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS &&
+           genl->cmd != DEVLINK_CMD_FLASH_UPDATE_END)
+               return MNL_CB_STOP;
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME])
+               return MNL_CB_ERROR;
+       bus_name = mnl_attr_get_str(tb[DEVLINK_ATTR_BUS_NAME]);
+       dev_name = mnl_attr_get_str(tb[DEVLINK_ATTR_DEV_NAME]);
+       if (strcmp(bus_name, opts->bus_name) ||
+           strcmp(dev_name, opts->dev_name))
+               return MNL_CB_ERROR;
+
+       if (genl->cmd == DEVLINK_CMD_FLASH_UPDATE_END && ctx->not_first) {
+               pr_out("\n");
+               free(ctx->last_msg);
+               free(ctx->last_component);
+               ctx->received_end = 1;
+               return MNL_CB_STOP;
+       }
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG])
+               msg = mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG]);
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT])
+               component = mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT]);
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE])
+               done = mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE]);
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL])
+               total = mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL]);
+
+       if (!nullstrcmp(msg, ctx->last_msg) &&
+           !nullstrcmp(component, ctx->last_component) &&
+           ctx->last_pc && ctx->not_first) {
+               pr_out_tty("\b\b\b\b\b"); /* clean percentage */
+       } else {
+               if (ctx->not_first)
+                       pr_out("\n");
+               if (component) {
+                       pr_out("[%s] ", component);
+                       free(ctx->last_component);
+                       ctx->last_component = strdup(component);
+               }
+               if (msg) {
+                       pr_out("%s", msg);
+                       free(ctx->last_msg);
+                       ctx->last_msg = strdup(msg);
+               }
+       }
+       if (total) {
+               pr_out_tty(" %3lu%%", (done * 100) / total);
+               ctx->last_pc = 1;
+       } else {
+               ctx->last_pc = 0;
+       }
+       fflush(stdout);
+       ctx->not_first = 1;
+
+       return MNL_CB_STOP;
+}
+
+static int cmd_dev_flash_fds_process(struct cmd_dev_flash_status_ctx *ctx,
+                                    struct mnlg_socket *nlg_ntf,
+                                    int pipe_r)
+{
+       int nlfd = mnlg_socket_get_fd(nlg_ntf);
+       fd_set fds[3];
+       int fdmax;
+       int i;
+       int err;
+       int err2;
+
+       for (i = 0; i < 3; i++)
+               FD_ZERO(&fds[i]);
+       FD_SET(pipe_r, &fds[0]);
+       fdmax = pipe_r + 1;
+       FD_SET(nlfd, &fds[0]);
+       if (nlfd >= fdmax)
+               fdmax = nlfd + 1;
+
+       while (select(fdmax, &fds[0], &fds[1], &fds[2], NULL) < 0) {
+               if (errno == EINTR)
+                       continue;
+               pr_err("select() failed\n");
+               return -errno;
+       }
+       if (FD_ISSET(nlfd, &fds[0])) {
+               err = _mnlg_socket_recv_run(nlg_ntf,
+                                           cmd_dev_flash_status_cb, ctx);
+               if (err)
+                       return err;
+       }
+       if (FD_ISSET(pipe_r, &fds[0])) {
+               err = read(pipe_r, &err2, sizeof(err2));
+               if (err == -1) {
+                       pr_err("Failed to read pipe\n");
+                       return -errno;
+               }
+               if (err2)
+                       return err2;
+               ctx->flash_done = 1;
+       }
+       return 0;
+}
+
+
+static int cmd_dev_flash(struct dl *dl)
 {
+       struct cmd_dev_flash_status_ctx ctx = {.dl = dl,};
+       struct mnlg_socket *nlg_ntf;
        struct nlmsghdr *nlh;
+       int pipe_r, pipe_w;
+       int pipe_fds[2];
+       pid_t pid;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_POOL_SET,
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dev_flash_help();
+               return 0;
+       }
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_FLASH_UPDATE,
                               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);
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE | DL_OPT_FLASH_FILE_NAME,
+                               DL_OPT_FLASH_COMPONENT);
        if (err)
                return err;
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+       nlg_ntf = mnlg_socket_open(DEVLINK_GENL_NAME, DEVLINK_GENL_VERSION);
+       if (!nlg_ntf)
+               return err;
+
+       err = _mnlg_socket_group_add(nlg_ntf, DEVLINK_GENL_MCGRP_CONFIG_NAME);
+       if (err)
+               return err;
+
+       err = pipe(pipe_fds);
+       if (err == -1)
+               return -errno;
+       pipe_r = pipe_fds[0];
+       pipe_w = pipe_fds[1];
+
+       pid = fork();
+       if (pid == -1) {
+               close(pipe_r);
+               close(pipe_w);
+               return -errno;
+       } else if (!pid) {
+               /* In child, just execute the flash and pass returned
+                * value through pipe once it is done.
+                */
+               close(pipe_r);
+               err = _mnlg_socket_send(dl->nlg, nlh);
+               write(pipe_w, &err, sizeof(err));
+               close(pipe_w);
+               exit(0);
+       }
+       close(pipe_w);
+
+       do {
+               err = cmd_dev_flash_fds_process(&ctx, nlg_ntf, pipe_r);
+               if (err)
+                       goto out;
+       } while (!ctx.flash_done || (ctx.not_first && !ctx.received_end));
+
+       err = _mnlg_socket_recv_run(dl->nlg, NULL, NULL);
+out:
+       close(pipe_r);
+       mnlg_socket_close(nlg_ntf);
+       return err;
 }
 
-static int cmd_sb_pool(struct dl *dl)
+static int cmd_dev(struct dl *dl)
 {
        if (dl_argv_match(dl, "help")) {
-               cmd_sb_help();
+               cmd_dev_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")) {
+               return cmd_dev_show(dl);
+       } else if (dl_argv_match(dl, "eswitch")) {
                dl_arg_inc(dl);
-               return cmd_sb_pool_set(dl);
+               return cmd_dev_eswitch(dl);
+       } else if (dl_argv_match(dl, "reload")) {
+               dl_arg_inc(dl);
+               return cmd_dev_reload(dl);
+       } else if (dl_argv_match(dl, "param")) {
+               dl_arg_inc(dl);
+               return cmd_dev_param(dl);
+       } else if (dl_argv_match(dl, "info")) {
+               dl_arg_inc(dl);
+               return cmd_dev_info(dl);
+       } else if (dl_argv_match(dl, "flash")) {
+               dl_arg_inc(dl);
+               return cmd_dev_flash(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)
+static void cmd_port_help(void)
 {
-       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_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)
+{
+       switch (type) {
+       case DEVLINK_PORT_TYPE_NOTSET: return "notset";
+       case DEVLINK_PORT_TYPE_AUTO: return "auto";
+       case DEVLINK_PORT_TYPE_ETH: return "eth";
+       case DEVLINK_PORT_TYPE_IB: return "ib";
+       default: return "<unknown type>";
+       }
+}
+
+static const char *port_flavour_name(uint16_t flavour)
+{
+       switch (flavour) {
+       case DEVLINK_PORT_FLAVOUR_PHYSICAL:
+               return "physical";
+       case DEVLINK_PORT_FLAVOUR_CPU:
+               return "cpu";
+       case DEVLINK_PORT_FLAVOUR_DSA:
+               return "dsa";
+       case DEVLINK_PORT_FLAVOUR_PCI_PF:
+               return "pcipf";
+       case DEVLINK_PORT_FLAVOUR_PCI_VF:
+               return "pcivf";
+       default:
+               return "<unknown flavour>";
+       }
+}
+
+static void pr_out_port_pfvf_num(struct dl *dl, struct nlattr **tb)
+{
+       uint16_t fn_num;
+
+       if (tb[DEVLINK_ATTR_PORT_PCI_PF_NUMBER]) {
+               fn_num = mnl_attr_get_u16(tb[DEVLINK_ATTR_PORT_PCI_PF_NUMBER]);
+               pr_out_uint(dl, "pfnum", fn_num);
+       }
+       if (tb[DEVLINK_ATTR_PORT_PCI_VF_NUMBER]) {
+               fn_num = mnl_attr_get_u16(tb[DEVLINK_ATTR_PORT_PCI_VF_NUMBER]);
+               pr_out_uint(dl, "vfnum", fn_num);
+       }
+}
+
+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_start(dl, tb, false);
+       if (pt_attr) {
+               uint16_t port_type = mnl_attr_get_u16(pt_attr);
+
+               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_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_FLAVOUR]) {
+               uint16_t port_flavour =
+                               mnl_attr_get_u16(tb[DEVLINK_ATTR_PORT_FLAVOUR]);
+
+               pr_out_str(dl, "flavour", port_flavour_name(port_flavour));
+
+               switch (port_flavour) {
+               case DEVLINK_PORT_FLAVOUR_PCI_PF:
+               case DEVLINK_PORT_FLAVOUR_PCI_VF:
+                       pr_out_port_pfvf_num(dl, tb);
+                       break;
+               default:
+                       break;
+               }
+       }
+       if (tb[DEVLINK_ATTR_PORT_NUMBER]) {
+               uint32_t port_number;
+
+               port_number = mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_NUMBER]);
+               pr_out_uint(dl, "port", port_number);
+       }
+       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_sb_port_pool_show_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_port_show_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct dl *dl = data;
        struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
@@ -1962,14 +3254,13 @@ static int cmd_sb_port_pool_show_cb(const struct nlmsghdr *nlh, void *data)
 
        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])
+           !tb[DEVLINK_ATTR_PORT_INDEX])
                return MNL_CB_ERROR;
-       pr_out_sb_port_pool(dl, tb);
+       pr_out_port(dl, tb);
        return MNL_CB_OK;
 }
 
-static int cmd_sb_port_pool_show(struct dl *dl)
+static int cmd_port_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
@@ -1978,85 +3269,205 @@ static int cmd_sb_port_pool_show(struct dl *dl)
        if (dl_argc(dl) == 0)
                flags |= NLM_F_DUMP;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_PORT_POOL_GET, flags);
+       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 | DL_OPT_SB_POOL,
-                                       DL_OPT_SB);
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
                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_start(dl, "port");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_port_show_cb, dl);
        pr_out_section_end(dl);
-       return 0;
+       return err;
 }
 
-static int cmd_sb_port_pool_set(struct dl *dl)
+static int cmd_port_set(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_PORT_POOL_SET,
+       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_SB_POOL |
-                               DL_OPT_SB_TH, DL_OPT_SB);
+       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_sb_port_pool(struct dl *dl)
+static int cmd_port_split(struct dl *dl)
 {
-       if (dl_argv_match(dl, "help")) {
-               cmd_sb_help();
-               return 0;
+       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_argv_match(dl, "list") ||  dl_no_arg(dl)) {
                dl_arg_inc(dl);
-               return cmd_sb_port_pool_show(dl);
+               return cmd_port_show(dl);
        } else if (dl_argv_match(dl, "set")) {
                dl_arg_inc(dl);
-               return cmd_sb_port_pool_set(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 int cmd_sb_port(struct dl *dl)
+static void cmd_sb_help(void)
 {
-       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("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_err("Command \"%s\" not found\n", dl_argv(dl));
-       return -ENOENT;
+
+       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 void pr_out_sb_tc_bind(struct dl *dl, struct nlattr **tb)
+static const char *pool_type_name(uint8_t type)
 {
-       pr_out_port_handle_start_arr(dl, tb, true);
+       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, "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])));
+                   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);
+                   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])));
+       if (tb[DEVLINK_ATTR_SB_POOL_CELL_SIZE])
+               pr_out_uint(dl, "cell_size",
+                           mnl_attr_get_u32(tb[DEVLINK_ATTR_SB_POOL_CELL_SIZE]));
+       pr_out_handle_end(dl);
 }
 
-static int cmd_sb_tc_bind_show_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_sb_pool_show_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct dl *dl = data;
        struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
@@ -2064,15 +3475,15 @@ static int cmd_sb_tc_bind_show_cb(const struct nlmsghdr *nlh, void *data)
 
        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])
+           !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_tc_bind(dl, tb);
+       pr_out_sb_pool(dl, tb);
        return MNL_CB_OK;
 }
 
-static int cmd_sb_tc_bind_show(struct dl *dl)
+static int cmd_sb_pool_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
@@ -2081,39 +3492,38 @@ static int cmd_sb_tc_bind_show(struct dl *dl)
        if (dl_argc(dl) == 0)
                flags |= NLM_F_DUMP;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_TC_POOL_BIND_GET, flags);
+       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_HANDLEP | DL_OPT_SB_TC |
-                                       DL_OPT_SB_TYPE, DL_OPT_SB);
+               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, "tc_bind");
-       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_sb_tc_bind_show_cb, dl);
+       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_tc_bind_set(struct dl *dl)
+static int cmd_sb_pool_set(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_SB_TC_POOL_BIND_SET,
+       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_HANDLEP | DL_OPT_SB_TC |
-                               DL_OPT_SB_TYPE | DL_OPT_SB_POOL | DL_OPT_SB_TH,
-                               DL_OPT_SB);
+       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_tc_bind(struct dl *dl)
+static int cmd_sb_pool(struct dl *dl)
 {
        if (dl_argv_match(dl, "help")) {
                cmd_sb_help();
@@ -2121,48 +3531,236 @@ static int cmd_sb_tc_bind(struct dl *dl)
        } 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);
+               return cmd_sb_pool_show(dl);
        } else if (dl_argv_match(dl, "set")) {
                dl_arg_inc(dl);
-               return cmd_sb_tc_bind_set(dl);
+               return cmd_sb_pool_set(dl);
        }
        pr_err("Command \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
 }
 
-static int cmd_sb_tc(struct dl *dl)
+static void pr_out_sb_port_pool(struct dl *dl, struct nlattr **tb)
 {
-       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;
+       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);
 }
 
-struct occ_item {
-       struct list_head list;
-       uint32_t index;
-       uint32_t cur;
-       uint32_t max;
-       uint32_t bound_pool_index;
-};
+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);
 
-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;
-};
+       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;
+}
 
-struct occ_show {
+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;
@@ -2258,7 +3856,7 @@ static void pr_out_occ_show_item_list(const char *label, struct list_head *list,
                                  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);
+               pr_out_sp(21, "%10u/%u", occ_item->cur, occ_item->max);
                if (i++ % 4 == 0)
                        pr_out("\n");
        }
@@ -2538,8 +4136,27 @@ static const char *cmd_name(uint8_t cmd)
        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_NEW: return "new";
        case DEVLINK_CMD_PORT_DEL: return "del";
+       case DEVLINK_CMD_PARAM_GET: return "get";
+       case DEVLINK_CMD_PARAM_SET: return "set";
+       case DEVLINK_CMD_PARAM_NEW: return "new";
+       case DEVLINK_CMD_PARAM_DEL: return "del";
+       case DEVLINK_CMD_REGION_GET: return "get";
+       case DEVLINK_CMD_REGION_SET: return "set";
+       case DEVLINK_CMD_REGION_NEW: return "new";
+       case DEVLINK_CMD_REGION_DEL: return "del";
+       case DEVLINK_CMD_FLASH_UPDATE: return "begin";
+       case DEVLINK_CMD_FLASH_UPDATE_END: return "end";
+       case DEVLINK_CMD_FLASH_UPDATE_STATUS: return "status";
+       case DEVLINK_CMD_TRAP_GET: return "get";
+       case DEVLINK_CMD_TRAP_SET: return "set";
+       case DEVLINK_CMD_TRAP_NEW: return "new";
+       case DEVLINK_CMD_TRAP_DEL: return "del";
+       case DEVLINK_CMD_TRAP_GROUP_GET: return "get";
+       case DEVLINK_CMD_TRAP_GROUP_SET: return "set";
+       case DEVLINK_CMD_TRAP_GROUP_NEW: return "new";
+       case DEVLINK_CMD_TRAP_GROUP_DEL: return "del";
        default: return "<unknown cmd>";
        }
 }
@@ -2558,6 +4175,30 @@ static const char *cmd_obj(uint8_t cmd)
        case DEVLINK_CMD_PORT_NEW:
        case DEVLINK_CMD_PORT_DEL:
                return "port";
+       case DEVLINK_CMD_PARAM_GET:
+       case DEVLINK_CMD_PARAM_SET:
+       case DEVLINK_CMD_PARAM_NEW:
+       case DEVLINK_CMD_PARAM_DEL:
+               return "param";
+       case DEVLINK_CMD_REGION_GET:
+       case DEVLINK_CMD_REGION_SET:
+       case DEVLINK_CMD_REGION_NEW:
+       case DEVLINK_CMD_REGION_DEL:
+               return "region";
+       case DEVLINK_CMD_FLASH_UPDATE:
+       case DEVLINK_CMD_FLASH_UPDATE_END:
+       case DEVLINK_CMD_FLASH_UPDATE_STATUS:
+               return "flash";
+       case DEVLINK_CMD_TRAP_GET:
+       case DEVLINK_CMD_TRAP_SET:
+       case DEVLINK_CMD_TRAP_NEW:
+       case DEVLINK_CMD_TRAP_DEL:
+               return "trap";
+       case DEVLINK_CMD_TRAP_GROUP_GET:
+       case DEVLINK_CMD_TRAP_GROUP_SET:
+       case DEVLINK_CMD_TRAP_GROUP_NEW:
+       case DEVLINK_CMD_TRAP_GROUP_DEL:
+               return "trap-group";
        default: return "<unknown obj>";
        }
 }
@@ -2582,6 +4223,33 @@ static bool cmd_filter_check(struct dl *dl, uint8_t cmd)
        return false;
 }
 
+static void pr_out_flash_update(struct dl *dl, struct nlattr **tb)
+{
+       __pr_out_handle_start(dl, tb, true, false);
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG])
+               pr_out_str(dl, "msg",
+                          mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_MSG]));
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT])
+               pr_out_str(dl, "component",
+                          mnl_attr_get_str(tb[DEVLINK_ATTR_FLASH_UPDATE_COMPONENT]));
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE])
+               pr_out_u64(dl, "done",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_DONE]));
+
+       if (tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL])
+               pr_out_u64(dl, "total",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_FLASH_UPDATE_STATUS_TOTAL]));
+
+       pr_out_handle_end(dl);
+}
+
+static void pr_out_region(struct dl *dl, struct nlattr **tb);
+static void pr_out_trap(struct dl *dl, struct nlattr **tb, bool array);
+static void pr_out_trap_group(struct dl *dl, struct nlattr **tb, bool array);
+
 static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct dl *dl = data;
@@ -2601,7 +4269,7 @@ static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
                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);
+               pr_out_handle(dl, tb);
                break;
        case DEVLINK_CMD_PORT_GET: /* fall through */
        case DEVLINK_CMD_PORT_SET: /* fall through */
@@ -2614,6 +4282,65 @@ static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
                pr_out_mon_header(genl->cmd);
                pr_out_port(dl, tb);
                break;
+       case DEVLINK_CMD_PARAM_GET: /* fall through */
+       case DEVLINK_CMD_PARAM_SET: /* fall through */
+       case DEVLINK_CMD_PARAM_NEW: /* fall through */
+       case DEVLINK_CMD_PARAM_DEL:
+               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+                   !tb[DEVLINK_ATTR_PARAM])
+                       return MNL_CB_ERROR;
+               pr_out_mon_header(genl->cmd);
+               pr_out_param(dl, tb, false);
+               break;
+       case DEVLINK_CMD_REGION_GET: /* fall through */
+       case DEVLINK_CMD_REGION_SET: /* fall through */
+       case DEVLINK_CMD_REGION_NEW: /* fall through */
+       case DEVLINK_CMD_REGION_DEL:
+               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+                   !tb[DEVLINK_ATTR_REGION_NAME])
+                       return MNL_CB_ERROR;
+               pr_out_mon_header(genl->cmd);
+               pr_out_region(dl, tb);
+               break;
+       case DEVLINK_CMD_FLASH_UPDATE: /* fall through */
+       case DEVLINK_CMD_FLASH_UPDATE_END: /* fall through */
+       case DEVLINK_CMD_FLASH_UPDATE_STATUS:
+               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_flash_update(dl, tb);
+               break;
+       case DEVLINK_CMD_TRAP_GET: /* fall through */
+       case DEVLINK_CMD_TRAP_SET: /* fall through */
+       case DEVLINK_CMD_TRAP_NEW: /* fall through */
+       case DEVLINK_CMD_TRAP_DEL:
+               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+                   !tb[DEVLINK_ATTR_TRAP_NAME] ||
+                   !tb[DEVLINK_ATTR_TRAP_TYPE] ||
+                   !tb[DEVLINK_ATTR_TRAP_ACTION] ||
+                   !tb[DEVLINK_ATTR_TRAP_GROUP_NAME] ||
+                   !tb[DEVLINK_ATTR_TRAP_METADATA] ||
+                   !tb[DEVLINK_ATTR_STATS])
+                       return MNL_CB_ERROR;
+               pr_out_mon_header(genl->cmd);
+               pr_out_trap(dl, tb, false);
+               break;
+       case DEVLINK_CMD_TRAP_GROUP_GET: /* fall through */
+       case DEVLINK_CMD_TRAP_GROUP_SET: /* fall through */
+       case DEVLINK_CMD_TRAP_GROUP_NEW: /* fall through */
+       case DEVLINK_CMD_TRAP_GROUP_DEL:
+               mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+               if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+                   !tb[DEVLINK_ATTR_TRAP_GROUP_NAME] ||
+                   !tb[DEVLINK_ATTR_STATS])
+                       return MNL_CB_ERROR;
+               pr_out_mon_header(genl->cmd);
+               pr_out_trap_group(dl, tb, false);
+               break;
        }
        return MNL_CB_OK;
 }
@@ -2627,7 +4354,9 @@ static int cmd_mon_show(struct dl *dl)
        while ((cur_obj = dl_argv_index(dl, index++))) {
                if (strcmp(cur_obj, "all") != 0 &&
                    strcmp(cur_obj, "dev") != 0 &&
-                   strcmp(cur_obj, "port") != 0) {
+                   strcmp(cur_obj, "port") != 0 &&
+                   strcmp(cur_obj, "trap") != 0 &&
+                   strcmp(cur_obj, "trap-group") != 0) {
                        pr_err("Unknown object \"%s\"\n", cur_obj);
                        return -EINVAL;
                }
@@ -2644,7 +4373,7 @@ static int cmd_mon_show(struct dl *dl)
 static void cmd_mon_help(void)
 {
        pr_err("Usage: devlink monitor [ all | OBJECT-LIST ]\n"
-              "where  OBJECT-LIST := { dev | port }\n");
+              "where  OBJECT-LIST := { dev | port | trap | trap-group }\n");
 }
 
 static int cmd_mon(struct dl *dl)
@@ -2652,12 +4381,8 @@ 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;
+       return cmd_mon_show(dl);
 }
 
 struct dpipe_field {
@@ -2675,24 +4400,124 @@ struct dpipe_header {
        unsigned int fields_count;
 };
 
-struct dpipe_ctx {
+struct dpipe_table {
+       struct list_head list;
+       char *name;
+       unsigned int resource_id;
+       bool resource_valid;
+};
+
+struct dpipe_tables {
+       struct list_head table_list;
+};
+
+struct resource {
+       char *name;
+       uint64_t size;
+       uint64_t size_new;
+       uint64_t size_min;
+       uint64_t size_max;
+       uint64_t size_gran;
+       enum devlink_resource_unit unit;
+       bool size_valid;
+       uint64_t size_occ;
+       bool occ_valid;
+       uint64_t id;
+       struct list_head list;
+       struct list_head resource_list;
+       struct resource *parent;
+};
+
+struct resources {
+       struct list_head resource_list;
+};
+
+struct resource_ctx {
        struct dl *dl;
        int err;
-       struct list_head global_headers;
-       struct list_head local_headers;
-       bool print_headers;
+       struct resources *resources;
+       struct dpipe_tables *tables;
+       bool print_resources;
+       bool pending_change;
 };
 
-static struct dpipe_header *dpipe_header_alloc(unsigned int fields_count)
+static struct resource *resource_alloc(void)
 {
-       struct dpipe_header *header;
+       struct resource *resource;
 
-       header = calloc(1, sizeof(struct dpipe_header));
-       if (!header)
+       resource = calloc(1, sizeof(struct resource));
+       if (!resource)
                return NULL;
-       header->fields = calloc(fields_count, sizeof(struct dpipe_field));
-       if (!header->fields)
-               goto err_fields_alloc;
+       INIT_LIST_HEAD(&resource->resource_list);
+       return resource;
+}
+
+static void resource_free(struct resource *resource)
+{
+       struct resource *child_resource, *tmp;
+
+       list_for_each_entry_safe(child_resource, tmp, &resource->resource_list,
+                                list) {
+               free(child_resource->name);
+               resource_free(child_resource);
+       }
+       free(resource);
+}
+
+static struct resources *resources_alloc(void)
+{
+       struct resources *resources;
+
+       resources = calloc(1, sizeof(struct resources));
+       if (!resources)
+               return NULL;
+       INIT_LIST_HEAD(&resources->resource_list);
+       return resources;
+}
+
+static void resources_free(struct resources *resources)
+{
+       struct resource *resource, *tmp;
+
+       list_for_each_entry_safe(resource, tmp, &resources->resource_list, list)
+               resource_free(resource);
+}
+
+static int resource_ctx_init(struct resource_ctx *ctx, struct dl *dl)
+{
+       ctx->resources = resources_alloc();
+       if (!ctx->resources)
+               return -ENOMEM;
+       ctx->dl = dl;
+       return 0;
+}
+
+static void resource_ctx_fini(struct resource_ctx *ctx)
+{
+       resources_free(ctx->resources);
+}
+
+struct dpipe_ctx {
+       struct dl *dl;
+       int err;
+       struct list_head global_headers;
+       struct list_head local_headers;
+       struct dpipe_tables *tables;
+       struct resources *resources;
+       bool print_headers;
+       bool print_tables;
+};
+
+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;
 
@@ -2733,25 +4558,49 @@ static void dpipe_header_del(struct dpipe_header *header)
        list_del(&header->list);
 }
 
-static struct dpipe_ctx *dpipe_ctx_alloc(struct dl *dl)
+static struct dpipe_table *dpipe_table_alloc(void)
+{
+       return calloc(1, sizeof(struct dpipe_table));
+}
+
+static void dpipe_table_free(struct dpipe_table *table)
+{
+       free(table);
+}
+
+static struct dpipe_tables *dpipe_tables_alloc(void)
 {
-       struct dpipe_ctx *ctx;
+       struct dpipe_tables *tables;
 
-       ctx = calloc(1, sizeof(struct dpipe_ctx));
-       if (!ctx)
+       tables = calloc(1, sizeof(struct dpipe_tables));
+       if (!tables)
                return NULL;
-       ctx->dl = dl;
-       INIT_LIST_HEAD(&ctx->global_headers);
-       INIT_LIST_HEAD(&ctx->local_headers);
-       return ctx;
+       INIT_LIST_HEAD(&tables->table_list);
+       return tables;
+}
+
+static void dpipe_tables_free(struct dpipe_tables *tables)
+{
+       struct dpipe_table *table, *tmp;
+
+       list_for_each_entry_safe(table, tmp, &tables->table_list, list)
+               dpipe_table_free(table);
+       free(tables);
 }
 
-static void dpipe_ctx_free(struct dpipe_ctx *ctx)
+static int dpipe_ctx_init(struct dpipe_ctx *ctx, struct dl *dl)
 {
-       free(ctx);
+       ctx->tables = dpipe_tables_alloc();
+       if (!ctx->tables)
+               return -ENOMEM;
+
+       ctx->dl = dl;
+       INIT_LIST_HEAD(&ctx->global_headers);
+       INIT_LIST_HEAD(&ctx->local_headers);
+       return 0;
 }
 
-static void dpipe_ctx_clear(struct dpipe_ctx *ctx)
+static void dpipe_ctx_fini(struct dpipe_ctx *ctx)
 {
        struct dpipe_header *header, *tmp;
 
@@ -2767,6 +4616,7 @@ static void dpipe_ctx_clear(struct dpipe_ctx *ctx)
                dpipe_header_clear(header);
                dpipe_header_free(header);
        }
+       dpipe_tables_free(ctx->tables);
 }
 
 static const char *dpipe_header_id2s(struct dpipe_ctx *ctx,
@@ -3022,7 +4872,7 @@ static int cmd_dpipe_header_cb(const struct nlmsghdr *nlh, void *data)
 static int cmd_dpipe_headers_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
-       struct dpipe_ctx *ctx;
+       struct dpipe_ctx ctx = {};
        uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
        int err;
 
@@ -3032,20 +4882,19 @@ static int cmd_dpipe_headers_show(struct dl *dl)
        if (err)
                return err;
 
-       ctx = dpipe_ctx_alloc(dl);
-       if (!ctx)
-               return -ENOMEM;
+       err = dpipe_ctx_init(&ctx, dl);
+       if (err)
+               return err;
 
-       ctx->print_headers = true;
+       ctx.print_headers = true;
 
        pr_out_section_start(dl, "header");
-       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb, ctx);
+       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_err("error get headers %s\n", strerror(ctx.err));
        pr_out_section_end(dl);
 
-       dpipe_ctx_clear(ctx);
-       dpipe_ctx_free(ctx);
+       dpipe_ctx_fini(&ctx);
        return err;
 }
 
@@ -3239,11 +5088,73 @@ err_match_parse:
        return -EINVAL;
 }
 
+static struct resource *
+resource_find(struct resources *resources, struct resource *resource,
+             uint64_t resource_id)
+{
+       struct list_head *list_head;
+
+       if (!resource)
+               list_head = &resources->resource_list;
+       else
+               list_head = &resource->resource_list;
+
+       list_for_each_entry(resource, list_head, list) {
+               struct resource *child_resource;
+
+               if (resource->id == resource_id)
+                       return resource;
+
+               child_resource = resource_find(resources, resource,
+                                              resource_id);
+               if (child_resource)
+                       return child_resource;
+       }
+       return NULL;
+}
+
+static void
+resource_path_print(struct dl *dl, struct resources *resources,
+                   uint64_t resource_id)
+{
+       struct resource *resource, *parent_resource;
+       const char del[] = "/";
+       int path_len = 0;
+       char *path;
+
+       resource = resource_find(resources, NULL, resource_id);
+       if (!resource)
+               return;
+
+       for (parent_resource = resource; parent_resource;
+            parent_resource = parent_resource->parent)
+               path_len += strlen(parent_resource->name) + 1;
+
+       path_len++;
+       path = calloc(1, path_len);
+       if (!path)
+               return;
+
+       path += path_len - 1;
+       for (parent_resource = resource; parent_resource;
+               parent_resource = parent_resource->parent) {
+               path -= strlen(parent_resource->name);
+               memcpy(path, parent_resource->name,
+                      strlen(parent_resource->name));
+               path -= strlen(del);
+               memcpy(path, del, strlen(del));
+       }
+       pr_out_str(dl, "resource_path", path);
+       free(path);
+}
+
 static int dpipe_table_show(struct dpipe_ctx *ctx, struct nlattr *nl)
 {
        struct nlattr *nla_table[DEVLINK_ATTR_MAX + 1] = {};
+       struct dpipe_table *table;
+       uint32_t resource_units;
        bool counters_enabled;
-       const char *name;
+       bool resource_valid;
        uint32_t size;
        int err;
 
@@ -3259,15 +5170,37 @@ static int dpipe_table_show(struct dpipe_ctx *ctx, struct nlattr *nl)
                return -EINVAL;
        }
 
-       name = mnl_attr_get_str(nla_table[DEVLINK_ATTR_DPIPE_TABLE_NAME]);
+       table = dpipe_table_alloc();
+       if (!table)
+               return -ENOMEM;
+
+       table->name = strdup(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);
+       resource_valid = nla_table[DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID] &&
+                        ctx->resources;
+       if (resource_valid) {
+               table->resource_id = mnl_attr_get_u64(nla_table[DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_ID]);
+               table->resource_valid = true;
+       }
+
+       list_add_tail(&table->list, &ctx->tables->table_list);
+       if (!ctx->print_tables)
+               return 0;
+
+       pr_out_str(ctx->dl, "name", table->name);
        pr_out_uint(ctx->dl, "size", size);
        pr_out_str(ctx->dl, "counters_enabled",
                   counters_enabled ? "true" : "false");
 
+       if (resource_valid) {
+               resource_units = mnl_attr_get_u32(nla_table[DEVLINK_ATTR_DPIPE_TABLE_RESOURCE_UNITS]);
+               resource_path_print(ctx->dl, ctx->resources,
+                                   table->resource_id);
+               pr_out_uint(ctx->dl, "resource_units", resource_units);
+       }
+
        pr_out_array_start(ctx->dl, "match");
        if (dpipe_table_matches_show(ctx, nla_table[DEVLINK_ATTR_DPIPE_TABLE_MATCHES]))
                goto err_matches_show;
@@ -3292,15 +5225,18 @@ static int dpipe_tables_show(struct dpipe_ctx *ctx, struct nlattr **tb)
        struct nlattr *nla_table;
 
        mnl_attr_for_each_nested(nla_table, nla_tables) {
-               pr_out_handle_start_arr(ctx->dl, tb);
+               if (ctx->print_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 (ctx->print_tables)
+                       pr_out_handle_end(ctx->dl);
        }
        return 0;
 
 err_table_show:
-       pr_out_handle_end(ctx->dl);
+       if (ctx->print_tables)
+               pr_out_handle_end(ctx->dl);
        return -EINVAL;
 }
 
@@ -3320,39 +5256,63 @@ static int cmd_dpipe_table_show_cb(const struct nlmsghdr *nlh, void *data)
        return MNL_CB_OK;
 }
 
+static int cmd_resource_dump_cb(const struct nlmsghdr *nlh, void *data);
+
 static int cmd_dpipe_table_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
-       struct dpipe_ctx *ctx;
+       struct dpipe_ctx dpipe_ctx = {};
+       struct resource_ctx resource_ctx = {};
        uint16_t flags = NLM_F_REQUEST;
        int err;
 
-       ctx = dpipe_ctx_alloc(dl);
-       if (!ctx)
-               return -ENOMEM;
-
        err = dl_argv_parse(dl, DL_OPT_HANDLE, DL_OPT_DPIPE_TABLE_NAME);
        if (err)
-               goto out;
+               return err;
 
        nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_HEADERS_GET, flags);
+
+       err = dpipe_ctx_init(&dpipe_ctx, dl);
+       if (err)
+               return err;
+
+       dpipe_ctx.print_tables = true;
+
        dl_opts_put(nlh, dl);
-       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb, ctx);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb,
+                                 &dpipe_ctx);
        if (err) {
-               pr_err("error get headers %s\n", strerror(ctx->err));
-               goto out;
+               pr_err("error get headers %s\n", strerror(dpipe_ctx.err));
+               goto err_headers_get;
        }
 
+       err = resource_ctx_init(&resource_ctx, dl);
+       if (err)
+               goto err_resource_ctx_init;
+
+       resource_ctx.print_resources = false;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_RESOURCE_DUMP, flags);
+       dl_opts_put(nlh, dl);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_resource_dump_cb,
+                                 &resource_ctx);
+       if (!err)
+               dpipe_ctx.resources = resource_ctx.resources;
+
        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);
+       _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_table_show_cb, &dpipe_ctx);
        pr_out_section_end(dl);
-out:
-       dpipe_ctx_clear(ctx);
-       dpipe_ctx_free(ctx);
+
+       resource_ctx_fini(&resource_ctx);
+       dpipe_ctx_fini(&dpipe_ctx);
+       return 0;
+
+err_resource_ctx_init:
+err_headers_get:
+       dpipe_ctx_fini(&dpipe_ctx);
        return err;
 }
 
@@ -3575,226 +5535,1510 @@ static int dpipe_entry_match_value_show(struct dpipe_ctx *ctx,
        pr_out_dpipe_entry_value(ctx, nla_match_value, &match.info);
        pr_out_entry_end(ctx->dl);
 
-       return 0;
+       return 0;
+
+err_match_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
+}
+
+static int dpipe_entry_action_value_show(struct dpipe_ctx *ctx,
+                                        struct nlattr *nl)
+{
+       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_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 int
+dpipe_tables_action_values_show(struct dpipe_ctx *ctx,
+                               struct nlattr *nla_action_values)
+{
+       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 int
+dpipe_tables_match_values_show(struct dpipe_ctx *ctx,
+                              struct nlattr *nla_match_values)
+{
+       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 int dpipe_entry_show(struct dpipe_ctx *ctx, struct nlattr *nl)
+{
+       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 int dpipe_table_entries_show(struct dpipe_ctx *ctx, struct nlattr **tb)
+{
+       struct nlattr *nla_entries = tb[DEVLINK_ATTR_DPIPE_ENTRIES];
+       struct nlattr *nla_entry;
+
+       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 0;
+
+err_entry_show:
+       pr_out_handle_end(ctx->dl);
+       return -EINVAL;
+}
+
+static int cmd_dpipe_table_entry_dump_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_DPIPE_ENTRIES])
+               return MNL_CB_ERROR;
+
+       if (dpipe_table_entries_show(ctx, tb))
+               return MNL_CB_ERROR;
+       return MNL_CB_OK;
+}
+
+static int cmd_dpipe_table_dump(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       struct dpipe_ctx ctx = {};
+       uint16_t flags = NLM_F_REQUEST;
+       int err;
+
+       err = dpipe_ctx_init(&ctx, dl);
+       if (err)
+               return err;
+
+       err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_DPIPE_TABLE_NAME, 0);
+       if (err)
+               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_fini(&ctx);
+       return err;
+}
+
+static void cmd_dpipe_table_help(void)
+{
+       pr_err("Usage: devlink dpipe table [ OBJECT-LIST ]\n"
+              "where  OBJECT-LIST := { show | set | dump }\n");
+}
+
+static int cmd_dpipe_table(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dpipe_table_help();
+               return 0;
+       } else if (dl_argv_match(dl, "show")) {
+               dl_arg_inc(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;
+}
+
+static int
+resource_parse(struct resource_ctx *ctx, struct resource *resource,
+              struct nlattr **nla_resource)
+{
+       if (!nla_resource[DEVLINK_ATTR_RESOURCE_NAME] ||
+           !nla_resource[DEVLINK_ATTR_RESOURCE_SIZE] ||
+           !nla_resource[DEVLINK_ATTR_RESOURCE_ID] ||
+           !nla_resource[DEVLINK_ATTR_RESOURCE_UNIT] ||
+           !nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_MIN] ||
+           !nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_MAX] ||
+           !nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_GRAN]) {
+               return -EINVAL;
+       }
+
+       resource->name = strdup(mnl_attr_get_str(nla_resource[DEVLINK_ATTR_RESOURCE_NAME]));
+       resource->size = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_SIZE]);
+       resource->id = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_ID]);
+       resource->unit = mnl_attr_get_u8(nla_resource[DEVLINK_ATTR_RESOURCE_UNIT]);
+       resource->size_min = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_MIN]);
+       resource->size_max = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_MAX]);
+       resource->size_gran = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_GRAN]);
+
+       if (nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_NEW])
+               resource->size_new = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_NEW]);
+       else
+               resource->size_new = resource->size;
+
+       if (nla_resource[DEVLINK_ATTR_RESOURCE_OCC]) {
+               resource->size_occ = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_OCC]);
+               resource->occ_valid = true;
+       }
+
+       if (resource->size_new != resource->size)
+               ctx->pending_change = true;
+
+       return 0;
+}
+
+static int
+resource_get(struct resource_ctx *ctx, struct resource *resource,
+            struct resource *parent_resource, struct nlattr *nl)
+{
+       struct nlattr *nla_resource[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *nla_child_resource;
+       struct nlattr *nla_resources;
+       bool top = false;
+       int err;
+
+       if (!resource) {
+               nla_resources = nl;
+               top = true;
+               goto out;
+       }
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_resource);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       err = resource_parse(ctx, resource, nla_resource);
+       if (err)
+               return err;
+
+       resource->parent = parent_resource;
+       if (!nla_resource[DEVLINK_ATTR_RESOURCE_LIST])
+               return 0;
+
+       resource->size_valid = !!mnl_attr_get_u8(nla_resource[DEVLINK_ATTR_RESOURCE_SIZE_VALID]);
+       nla_resources = nla_resource[DEVLINK_ATTR_RESOURCE_LIST];
+out:
+       mnl_attr_for_each_nested(nla_child_resource, nla_resources) {
+               struct resource *child_resource;
+               struct list_head *list;
+
+               child_resource = resource_alloc();
+               if (!child_resource)
+                       return -ENOMEM;
+
+               if (top)
+                       list = &ctx->resources->resource_list;
+               else
+                       list = &resource->resource_list;
+
+               list_add_tail(&child_resource->list, list);
+               err = resource_get(ctx, child_resource, resource,
+                                  nla_child_resource);
+               if (err)
+                       return err;
+       }
+
+       return 0;
+}
+
+static const char *resource_unit_str_get(enum devlink_resource_unit unit)
+{
+       switch (unit) {
+       case DEVLINK_RESOURCE_UNIT_ENTRY: return "entry";
+       default: return "<unknown unit>";
+       }
+}
+
+static void resource_show(struct resource *resource,
+                         struct resource_ctx *ctx)
+{
+       struct resource *child_resource;
+       struct dpipe_table *table;
+       struct dl *dl = ctx->dl;
+       bool array = false;
+
+       pr_out_str(dl, "name", resource->name);
+       if (dl->verbose)
+               resource_path_print(dl, ctx->resources, resource->id);
+       pr_out_u64(dl, "size", resource->size);
+       if (resource->size != resource->size_new)
+               pr_out_u64(dl, "size_new", resource->size_new);
+       if (resource->occ_valid)
+               pr_out_uint(dl, "occ", resource->size_occ);
+       pr_out_str(dl, "unit", resource_unit_str_get(resource->unit));
+
+       if (resource->size_min != resource->size_max) {
+               pr_out_uint(dl, "size_min", resource->size_min);
+               pr_out_u64(dl, "size_max", resource->size_max);
+               pr_out_uint(dl, "size_gran", resource->size_gran);
+       }
+
+       list_for_each_entry(table, &ctx->tables->table_list, list)
+               if (table->resource_id == resource->id &&
+                   table->resource_valid)
+                       array = true;
+
+       if (array)
+               pr_out_array_start(dl, "dpipe_tables");
+       else
+               pr_out_str(dl, "dpipe_tables", "none");
+
+       list_for_each_entry(table, &ctx->tables->table_list, list) {
+               if (table->resource_id != resource->id ||
+                   !table->resource_valid)
+                       continue;
+               pr_out_entry_start(dl);
+               pr_out_str(dl, "table_name", table->name);
+               pr_out_entry_end(dl);
+       }
+       if (array)
+               pr_out_array_end(dl);
+
+       if (list_empty(&resource->resource_list))
+               return;
+
+       if (ctx->pending_change)
+               pr_out_str(dl, "size_valid", resource->size_valid ?
+                          "true" : "false");
+       pr_out_array_start(dl, "resources");
+       list_for_each_entry(child_resource, &resource->resource_list, list) {
+               pr_out_entry_start(dl);
+               resource_show(child_resource, ctx);
+               pr_out_entry_end(dl);
+       }
+       pr_out_array_end(dl);
+}
+
+static void
+resources_show(struct resource_ctx *ctx, struct nlattr **tb)
+{
+       struct resources *resources = ctx->resources;
+       struct resource *resource;
+
+       list_for_each_entry(resource, &resources->resource_list, list) {
+               pr_out_handle_start_arr(ctx->dl, tb);
+               resource_show(resource, ctx);
+               pr_out_handle_end(ctx->dl);
+       }
+}
+
+static int resources_get(struct resource_ctx *ctx, struct nlattr **tb)
+{
+       return resource_get(ctx, NULL, NULL, tb[DEVLINK_ATTR_RESOURCE_LIST]);
+}
+
+static int cmd_resource_dump_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct resource_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_RESOURCE_LIST])
+               return MNL_CB_ERROR;
+
+       err = resources_get(ctx, tb);
+       if (err) {
+               ctx->err = err;
+               return MNL_CB_ERROR;
+       }
+
+       if (ctx->print_resources)
+               resources_show(ctx, tb);
+
+       return MNL_CB_OK;
+}
+
+static int cmd_resource_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       struct dpipe_ctx dpipe_ctx = {};
+       struct resource_ctx resource_ctx = {};
+       int err;
+
+       err = dl_argv_parse(dl, DL_OPT_HANDLE, 0);
+       if (err)
+               return err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_TABLE_GET,
+                              NLM_F_REQUEST);
+       dl_opts_put(nlh, dl);
+
+       err = dpipe_ctx_init(&dpipe_ctx, dl);
+       if (err)
+               return err;
+
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_table_show_cb,
+                                 &dpipe_ctx);
+       if (err) {
+               pr_err("error get tables %s\n", strerror(dpipe_ctx.err));
+               goto out;
+       }
+
+       err = resource_ctx_init(&resource_ctx, dl);
+       if (err)
+               goto out;
+
+       resource_ctx.print_resources = true;
+       resource_ctx.tables = dpipe_ctx.tables;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_RESOURCE_DUMP,
+                              NLM_F_REQUEST | NLM_F_ACK);
+       dl_opts_put(nlh, dl);
+       pr_out_section_start(dl, "resources");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_resource_dump_cb,
+                                 &resource_ctx);
+       pr_out_section_end(dl);
+       resource_ctx_fini(&resource_ctx);
+out:
+       dpipe_ctx_fini(&dpipe_ctx);
+       return err;
+}
+
+static void cmd_resource_help(void)
+{
+       pr_err("Usage: devlink resource show DEV\n"
+              "       devlink resource set DEV path PATH size SIZE\n");
+}
+
+static struct resource *
+resource_find_by_name(struct list_head *list, char *name)
+{
+       struct resource *resource;
+
+       list_for_each_entry(resource, list, list) {
+               if (!strcmp(resource->name, name))
+                       return resource;
+       }
+       return NULL;
+}
+
+static int
+resource_path_parse(struct resource_ctx *ctx, const char *resource_path,
+                   uint32_t *p_resource_id, bool *p_resource_valid)
+{
+       struct resource *resource;
+       uint32_t resource_id = 0;
+       char *resource_path_dup;
+       struct list_head *list;
+       const char del[] = "/";
+       char *resource_name;
+
+       resource_path_dup = strdup(resource_path);
+       list = &ctx->resources->resource_list;
+       resource_name = strtok(resource_path_dup, del);
+       while (resource_name != NULL) {
+               resource = resource_find_by_name(list, resource_name);
+               if (!resource)
+                       goto err_resource_lookup;
+
+               list = &resource->resource_list;
+               resource_name = strtok(NULL, del);
+               resource_id = resource->id;
+       }
+       free(resource_path_dup);
+       *p_resource_valid = true;
+       *p_resource_id = resource_id;
+       return 0;
+
+err_resource_lookup:
+       free(resource_path_dup);
+       return -EINVAL;
+}
+
+static int cmd_resource_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       struct resource_ctx ctx = {};
+       int err;
+
+       err = resource_ctx_init(&ctx, dl);
+       if (err)
+               return err;
+
+       ctx.print_resources = false;
+       err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_RESOURCE_PATH |
+                           DL_OPT_RESOURCE_SIZE, 0);
+       if (err)
+               goto out;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_RESOURCE_DUMP,
+                              NLM_F_REQUEST);
+       dl_opts_put(nlh, dl);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_resource_dump_cb, &ctx);
+       if (err) {
+               pr_err("error getting resources %s\n", strerror(ctx.err));
+               goto out;
+       }
+
+       err = resource_path_parse(&ctx, dl->opts.resource_path,
+                                 &dl->opts.resource_id,
+                                 &dl->opts.resource_id_valid);
+       if (err) {
+               pr_err("error parsing resource path %s\n", strerror(-err));
+               goto out;
+       }
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_RESOURCE_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       dl_opts_put(nlh, dl);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+out:
+       resource_ctx_fini(&ctx);
+       return err;
+}
+
+static int cmd_resource(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_resource_help();
+               return 0;
+       } else if (dl_argv_match(dl, "show")) {
+               dl_arg_inc(dl);
+               return cmd_resource_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_resource_set(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static void pr_out_region_handle_start(struct dl *dl, struct nlattr **tb)
+{
+       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]);
+       const char *region_name = mnl_attr_get_str(tb[DEVLINK_ATTR_REGION_NAME]);
+       char buf[256];
+
+       sprintf(buf, "%s/%s/%s", bus_name, dev_name, region_name);
+       if (dl->json_output) {
+               jsonw_name(dl->jw, buf);
+               jsonw_start_object(dl->jw);
+       } else {
+               pr_out("%s:", buf);
+       }
+}
+
+static void pr_out_region_handle_end(struct dl *dl)
+{
+       if (dl->json_output)
+               jsonw_end_object(dl->jw);
+       else
+               pr_out("\n");
+}
+
+static void pr_out_region_snapshots_start(struct dl *dl, bool array)
+{
+       if (dl->json_output) {
+               jsonw_name(dl->jw, "snapshot");
+               jsonw_start_array(dl->jw);
+       } else {
+               if (g_indent_newline)
+                       pr_out("snapshot %s", array ? "[" : "");
+               else
+                       pr_out(" snapshot %s", array ? "[" : "");
+       }
+}
+
+static void pr_out_region_snapshots_end(struct dl *dl, bool array)
+{
+       if (dl->json_output)
+               jsonw_end_array(dl->jw);
+       else if (array)
+               pr_out("]");
+}
+
+static void pr_out_region_snapshots_id(struct dl *dl, struct nlattr **tb, int index)
+{
+       uint32_t snapshot_id;
+
+       if (!tb[DEVLINK_ATTR_REGION_SNAPSHOT_ID])
+               return;
+
+       snapshot_id = mnl_attr_get_u32(tb[DEVLINK_ATTR_REGION_SNAPSHOT_ID]);
+
+       if (dl->json_output)
+               jsonw_uint(dl->jw, snapshot_id);
+       else
+               pr_out("%s%u", index ? " " : "", snapshot_id);
+}
+
+static void pr_out_snapshots(struct dl *dl, struct nlattr **tb)
+{
+       struct nlattr *tb_snapshot[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *nla_sanpshot;
+       int err, index = 0;
+
+       pr_out_region_snapshots_start(dl, true);
+       mnl_attr_for_each_nested(nla_sanpshot, tb[DEVLINK_ATTR_REGION_SNAPSHOTS]) {
+               err = mnl_attr_parse_nested(nla_sanpshot, attr_cb, tb_snapshot);
+               if (err != MNL_CB_OK)
+                       return;
+               pr_out_region_snapshots_id(dl, tb_snapshot, index++);
+       }
+       pr_out_region_snapshots_end(dl, true);
+}
+
+static void pr_out_snapshot(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_region_snapshots_start(dl, false);
+       pr_out_region_snapshots_id(dl, tb, 0);
+       pr_out_region_snapshots_end(dl, false);
+}
+
+static void pr_out_region(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_region_handle_start(dl, tb);
+
+       if (tb[DEVLINK_ATTR_REGION_SIZE])
+               pr_out_u64(dl, "size",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_REGION_SIZE]));
+
+       if (tb[DEVLINK_ATTR_REGION_SNAPSHOTS])
+               pr_out_snapshots(dl, tb);
+
+       if (tb[DEVLINK_ATTR_REGION_SNAPSHOT_ID])
+               pr_out_snapshot(dl, tb);
+
+       pr_out_region_handle_end(dl);
+}
+
+static int cmd_region_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_REGION_NAME] || !tb[DEVLINK_ATTR_REGION_SIZE])
+               return MNL_CB_ERROR;
+
+       pr_out_region(dl, tb);
+
+       return MNL_CB_OK;
+}
+
+static int cmd_region_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_REGION_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION, 0);
+               if (err)
+                       return err;
+       }
+
+       pr_out_section_start(dl, "regions");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_region_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
+
+static int cmd_region_snapshot_del(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_REGION_DEL,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION |
+                               DL_OPT_REGION_SNAPSHOT_ID, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_region_read_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct nlattr *nla_entry, *nla_chunk_data, *nla_chunk_addr;
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb_field[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
+       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_REGION_CHUNKS])
+               return MNL_CB_ERROR;
+
+       mnl_attr_for_each_nested(nla_entry, tb[DEVLINK_ATTR_REGION_CHUNKS]) {
+               err = mnl_attr_parse_nested(nla_entry, attr_cb, tb_field);
+               if (err != MNL_CB_OK)
+                       return MNL_CB_ERROR;
+
+               nla_chunk_data = tb_field[DEVLINK_ATTR_REGION_CHUNK_DATA];
+               if (!nla_chunk_data)
+                       continue;
+
+               nla_chunk_addr = tb_field[DEVLINK_ATTR_REGION_CHUNK_ADDR];
+               if (!nla_chunk_addr)
+                       continue;
+
+               pr_out_region_chunk(dl, mnl_attr_get_payload(nla_chunk_data),
+                                   mnl_attr_get_payload_len(nla_chunk_data),
+                                   mnl_attr_get_u64(nla_chunk_addr));
+       }
+       return MNL_CB_OK;
+}
+
+static int cmd_region_dump(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_REGION_READ,
+                              NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION |
+                               DL_OPT_REGION_SNAPSHOT_ID, 0);
+       if (err)
+               return err;
+
+       pr_out_section_start(dl, "dump");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_region_read_cb, dl);
+       pr_out_section_end(dl);
+       if (!dl->json_output)
+               pr_out("\n");
+       return err;
+}
+
+static int cmd_region_read(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_REGION_READ,
+                              NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION |
+                               DL_OPT_REGION_ADDRESS | DL_OPT_REGION_LENGTH |
+                               DL_OPT_REGION_SNAPSHOT_ID, 0);
+       if (err)
+               return err;
+
+       pr_out_section_start(dl, "read");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_region_read_cb, dl);
+       pr_out_section_end(dl);
+       if (!dl->json_output)
+               pr_out("\n");
+       return err;
+}
+
+static void cmd_region_help(void)
+{
+       pr_err("Usage: devlink region show [ DEV/REGION ]\n");
+       pr_err("       devlink region del DEV/REGION snapshot SNAPSHOT_ID\n");
+       pr_err("       devlink region dump DEV/REGION [ snapshot SNAPSHOT_ID ]\n");
+       pr_err("       devlink region read DEV/REGION [ snapshot SNAPSHOT_ID ] address ADDRESS length LENGTH\n");
+}
+
+static int cmd_region(struct dl *dl)
+{
+       if (dl_no_arg(dl)) {
+               return cmd_region_show(dl);
+       } else if (dl_argv_match(dl, "help")) {
+               cmd_region_help();
+               return 0;
+       } else if (dl_argv_match(dl, "show")) {
+               dl_arg_inc(dl);
+               return cmd_region_show(dl);
+       } else if (dl_argv_match(dl, "del")) {
+               dl_arg_inc(dl);
+               return cmd_region_snapshot_del(dl);
+       } else if (dl_argv_match(dl, "dump")) {
+               dl_arg_inc(dl);
+               return cmd_region_dump(dl);
+       } else if (dl_argv_match(dl, "read")) {
+               dl_arg_inc(dl);
+               return cmd_region_read(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static int cmd_health_set_params(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+       err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME,
+                           DL_OPT_HEALTH_REPORTER_GRACEFUL_PERIOD |
+                           DL_OPT_HEALTH_REPORTER_AUTO_RECOVER);
+       if (err)
+               return err;
+
+       dl_opts_put(nlh, dl);
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_health_dump_clear(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl,
+                               DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0);
+       if (err)
+               return err;
+
+       dl_opts_put(nlh, dl);
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
+{
+       uint8_t *data;
+       uint32_t len;
+
+       switch (type) {
+       case MNL_TYPE_FLAG:
+               pr_out_bool_value(dl, mnl_attr_get_u8(nl_data));
+               break;
+       case MNL_TYPE_U8:
+               pr_out_uint_value(dl, mnl_attr_get_u8(nl_data));
+               break;
+       case MNL_TYPE_U16:
+               pr_out_uint_value(dl, mnl_attr_get_u16(nl_data));
+               break;
+       case MNL_TYPE_U32:
+               pr_out_uint_value(dl, mnl_attr_get_u32(nl_data));
+               break;
+       case MNL_TYPE_U64:
+               pr_out_uint64_value(dl, mnl_attr_get_u64(nl_data));
+               break;
+       case MNL_TYPE_NUL_STRING:
+               pr_out_str_value(dl, mnl_attr_get_str(nl_data));
+               break;
+       case MNL_TYPE_BINARY:
+               len = mnl_attr_get_payload_len(nl_data);
+               data = mnl_attr_get_payload(nl_data);
+               pr_out_binary_value(dl, data, len);
+               break;
+       default:
+               return -EINVAL;
+       }
+       return MNL_CB_OK;
+}
+
+struct nest_entry {
+       int attr_type;
+       struct list_head list;
+};
+
+struct fmsg_cb_data {
+       struct dl *dl;
+       uint8_t value_type;
+       struct list_head entry_list;
+};
+
+static int cmd_fmsg_nest_queue(struct fmsg_cb_data *fmsg_data,
+                              uint8_t *attr_value, bool insert)
+{
+       struct nest_entry *entry;
+
+       if (insert) {
+               entry = malloc(sizeof(struct nest_entry));
+               if (!entry)
+                       return -ENOMEM;
+
+               entry->attr_type = *attr_value;
+               list_add(&entry->list, &fmsg_data->entry_list);
+       } else {
+               if (list_empty(&fmsg_data->entry_list))
+                       return MNL_CB_ERROR;
+               entry = list_first_entry(&fmsg_data->entry_list,
+                                        struct nest_entry, list);
+               *attr_value = entry->attr_type;
+               list_del(&entry->list);
+               free(entry);
+       }
+       return MNL_CB_OK;
+}
+
+static int cmd_fmsg_nest(struct fmsg_cb_data *fmsg_data, uint8_t nest_value,
+                        bool start)
+{
+       struct dl *dl = fmsg_data->dl;
+       uint8_t value = nest_value;
+       int err;
+
+       err = cmd_fmsg_nest_queue(fmsg_data, &value, start);
+       if (err != MNL_CB_OK)
+               return err;
+
+       switch (value) {
+       case DEVLINK_ATTR_FMSG_OBJ_NEST_START:
+               if (start)
+                       pr_out_entry_start(dl);
+               else
+                       pr_out_entry_end(dl);
+               break;
+       case DEVLINK_ATTR_FMSG_PAIR_NEST_START:
+               break;
+       case DEVLINK_ATTR_FMSG_ARR_NEST_START:
+               if (dl->json_output) {
+                       if (start)
+                               jsonw_start_array(dl->jw);
+                       else
+                               jsonw_end_array(dl->jw);
+               } else {
+                       if (start) {
+                               __pr_out_newline();
+                               __pr_out_indent_inc();
+                       } else {
+                               __pr_out_indent_dec();
+                       }
+               }
+               break;
+       default:
+               return -EINVAL;
+       }
+       return MNL_CB_OK;
+}
+
+static int cmd_fmsg_object_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct fmsg_cb_data *fmsg_data = data;
+       struct dl *dl = fmsg_data->dl;
+       struct nlattr *nla_object;
+       int attr_type;
+       int err;
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_FMSG])
+               return MNL_CB_ERROR;
+
+       mnl_attr_for_each_nested(nla_object, tb[DEVLINK_ATTR_FMSG]) {
+               attr_type = mnl_attr_get_type(nla_object);
+               switch (attr_type) {
+               case DEVLINK_ATTR_FMSG_OBJ_NEST_START:
+               case DEVLINK_ATTR_FMSG_PAIR_NEST_START:
+               case DEVLINK_ATTR_FMSG_ARR_NEST_START:
+                       err = cmd_fmsg_nest(fmsg_data, attr_type, true);
+                       if (err != MNL_CB_OK)
+                               return err;
+                       break;
+               case DEVLINK_ATTR_FMSG_NEST_END:
+                       err = cmd_fmsg_nest(fmsg_data, attr_type, false);
+                       if (err != MNL_CB_OK)
+                               return err;
+                       break;
+               case DEVLINK_ATTR_FMSG_OBJ_NAME:
+                       pr_out_name(dl, mnl_attr_get_str(nla_object));
+                       break;
+               case DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE:
+                       fmsg_data->value_type = mnl_attr_get_u8(nla_object);
+                       break;
+               case DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA:
+                       err = fmsg_value_show(dl, fmsg_data->value_type,
+                                             nla_object);
+                       if (err != MNL_CB_OK)
+                               return err;
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       }
+       return MNL_CB_OK;
+}
+
+static int cmd_health_object_common(struct dl *dl, uint8_t cmd, uint16_t flags)
+{
+       struct fmsg_cb_data data;
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, cmd, flags | NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl,
+                               DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0);
+       if (err)
+               return err;
+
+       data.dl = dl;
+       INIT_LIST_HEAD(&data.entry_list);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_fmsg_object_cb, &data);
+       return err;
+}
+
+static int cmd_health_dump_show(struct dl *dl)
+{
+       return cmd_health_object_common(dl,
+                                       DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
+                                       NLM_F_DUMP);
+}
+
+static int cmd_health_diagnose(struct dl *dl)
+{
+       return cmd_health_object_common(dl,
+                                       DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
+                                       0);
+}
+
+static int cmd_health_recover(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl,
+                               DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0);
+       if (err)
+               return err;
+
+       dl_opts_put(nlh, dl);
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+enum devlink_health_reporter_state {
+       DEVLINK_HEALTH_REPORTER_STATE_HEALTHY,
+       DEVLINK_HEALTH_REPORTER_STATE_ERROR,
+};
+
+static const char *health_state_name(uint8_t state)
+{
+       switch (state) {
+       case DEVLINK_HEALTH_REPORTER_STATE_HEALTHY:
+               return HEALTH_REPORTER_STATE_HEALTHY_STR;
+       case DEVLINK_HEALTH_REPORTER_STATE_ERROR:
+               return HEALTH_REPORTER_STATE_ERROR_STR;
+       default:
+               return "<unknown state>";
+       }
+}
+
+static void format_logtime(uint64_t time_ms, char *ts_date, char *ts_time)
+{
+       struct sysinfo s_info;
+       struct tm *info;
+       time_t now, sec;
+       int err;
+
+       time(&now);
+       info = localtime(&now);
+       err = sysinfo(&s_info);
+       if (err)
+               goto out;
+       /* Subtract uptime in sec from now yields the time of system
+        * uptime. To this, add time_ms which is the amount of
+        * milliseconds elapsed between uptime and the dump taken.
+        */
+       sec = now - s_info.uptime + time_ms / 1000;
+       info = localtime(&sec);
+out:
+       strftime(ts_date, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%Y-%m-%d", info);
+       strftime(ts_time, HEALTH_REPORTER_TIMESTAMP_FMT_LEN, "%H:%M:%S", info);
+}
+
+static void pr_out_health(struct dl *dl, struct nlattr **tb_health)
+{
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       enum devlink_health_reporter_state state;
+       const struct nlattr *attr;
+       uint64_t time_ms;
+       int err;
+
+       err = mnl_attr_parse_nested(tb_health[DEVLINK_ATTR_HEALTH_REPORTER],
+                                   attr_cb, tb);
+       if (err != MNL_CB_OK)
+               return;
+
+       if (!tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME] ||
+           !tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT] ||
+           !tb[DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT] ||
+           !tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE])
+               return;
+
+       pr_out_handle_start_arr(dl, tb_health);
+
+       pr_out_str(dl, "name",
+                  mnl_attr_get_str(tb[DEVLINK_ATTR_HEALTH_REPORTER_NAME]));
+       if (!dl->json_output) {
+               __pr_out_newline();
+               __pr_out_indent_inc();
+       }
+       state = mnl_attr_get_u8(tb[DEVLINK_ATTR_HEALTH_REPORTER_STATE]);
+       pr_out_str(dl, "state", health_state_name(state));
+       pr_out_u64(dl, "error",
+                  mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT]));
+       pr_out_u64(dl, "recover",
+                  mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT]));
+       if (tb[DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS]) {
+               char dump_date[HEALTH_REPORTER_TIMESTAMP_FMT_LEN];
+               char dump_time[HEALTH_REPORTER_TIMESTAMP_FMT_LEN];
+
+               attr = tb[DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS];
+               time_ms = mnl_attr_get_u64(attr);
+               format_logtime(time_ms, dump_date, dump_time);
+
+               pr_out_str(dl, "last_dump_date", dump_date);
+               pr_out_str(dl, "last_dump_time", dump_time);
+       }
+       if (tb[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD])
+               pr_out_u64(dl, "grace_period",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD]));
+       if (tb[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER])
+               pr_out_bool(dl, "auto_recover",
+                           mnl_attr_get_u8(tb[DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER]));
+
+       __pr_out_indent_dec();
+       pr_out_handle_end(dl);
+}
+
+static int cmd_health_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_HEALTH_REPORTER])
+               return MNL_CB_ERROR;
+
+       pr_out_health(dl, tb);
 
-err_match_parse:
-       pr_out_entry_end(ctx->dl);
-       return -EINVAL;
+       return MNL_CB_OK;
 }
 
-static int dpipe_entry_action_value_show(struct dpipe_ctx *ctx,
-                                        struct nlattr *nl)
+static int cmd_health_show(struct dl *dl)
 {
-       struct nlattr *nla_action_value[DEVLINK_ATTR_MAX + 1] = {};
-       struct dpipe_action action;
+       struct nlmsghdr *nlh;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
        int err;
 
-       err = mnl_attr_parse_nested(nl, attr_cb, nla_action_value);
-       if (err != MNL_CB_OK)
-               return -EINVAL;
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_GET,
+                              flags);
 
-       if (!nla_action_value[DEVLINK_ATTR_DPIPE_ACTION] ||
-           !nla_action_value[DEVLINK_ATTR_DPIPE_VALUE]) {
-               return -EINVAL;
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl,
+                                       DL_OPT_HANDLE |
+                                       DL_OPT_HEALTH_REPORTER_NAME, 0);
+               if (err)
+                       return err;
        }
+       pr_out_section_start(dl, "health");
 
-       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 = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_health_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
 
-err_action_parse:
-       pr_out_entry_end(ctx->dl);
-       return -EINVAL;
+static void cmd_health_help(void)
+{
+       pr_err("Usage: devlink health show [ dev DEV reporter REPORTER_NAME ]\n");
+       pr_err("       devlink health recover DEV reporter REPORTER_NAME\n");
+       pr_err("       devlink health diagnose DEV reporter REPORTER_NAME\n");
+       pr_err("       devlink health dump show DEV reporter REPORTER_NAME\n");
+       pr_err("       devlink health dump clear DEV reporter REPORTER_NAME\n");
+       pr_err("       devlink health set DEV reporter REPORTER_NAME { grace_period | auto_recover } { msec | boolean }\n");
 }
 
-static int
-dpipe_tables_action_values_show(struct dpipe_ctx *ctx,
-                               struct nlattr *nla_action_values)
+static int cmd_health(struct dl *dl)
 {
-       struct nlattr *nla_action_value;
+       if (dl_argv_match(dl, "help")) {
+               cmd_health_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_health_show(dl);
+       } else if (dl_argv_match(dl, "recover")) {
+               dl_arg_inc(dl);
+               return cmd_health_recover(dl);
+       } else if (dl_argv_match(dl, "diagnose")) {
+               dl_arg_inc(dl);
+               return cmd_health_diagnose(dl);
+       } else if (dl_argv_match(dl, "dump")) {
+               dl_arg_inc(dl);
+               if (dl_argv_match(dl, "show")) {
+                       dl_arg_inc(dl);
+                       return cmd_health_dump_show(dl);
+               } else if (dl_argv_match(dl, "clear")) {
+                       dl_arg_inc(dl);
+                       return cmd_health_dump_clear(dl);
+               }
+       } else if (dl_argv_match(dl, "set")) {
+               dl_arg_inc(dl);
+               return cmd_health_set_params(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
 
-       mnl_attr_for_each_nested(nla_action_value, nla_action_values) {
-               if (dpipe_entry_action_value_show(ctx, nla_action_value))
-                       return -EINVAL;
+static const char *trap_type_name(uint8_t type)
+{
+       switch (type) {
+       case DEVLINK_TRAP_TYPE_DROP:
+               return "drop";
+       case DEVLINK_TRAP_TYPE_EXCEPTION:
+               return "exception";
+       default:
+               return "<unknown type>";
        }
-       return 0;
 }
 
-static int
-dpipe_tables_match_values_show(struct dpipe_ctx *ctx,
-                              struct nlattr *nla_match_values)
+static const char *trap_action_name(uint8_t action)
 {
-       struct nlattr *nla_match_value;
+       switch (action) {
+       case DEVLINK_TRAP_ACTION_DROP:
+               return "drop";
+       case DEVLINK_TRAP_ACTION_TRAP:
+               return "trap";
+       default:
+               return "<unknown action>";
+       }
+}
 
-       mnl_attr_for_each_nested(nla_match_value, nla_match_values) {
-               if (dpipe_entry_match_value_show(ctx, nla_match_value))
-                       return -EINVAL;
+static const char *trap_metadata_name(const struct nlattr *attr)
+{
+       switch (attr->nla_type) {
+       case DEVLINK_ATTR_TRAP_METADATA_TYPE_IN_PORT:
+               return "input_port";
+       default:
+               return "<unknown metadata type>";
        }
-       return 0;
 }
+static void pr_out_trap_metadata(struct dl *dl, struct nlattr *attr)
+{
+       struct nlattr *attr_metadata;
 
-static int dpipe_entry_show(struct dpipe_ctx *ctx, struct nlattr *nl)
+       pr_out_array_start(dl, "metadata");
+       mnl_attr_for_each_nested(attr_metadata, attr)
+               pr_out_str_value(dl, trap_metadata_name(attr_metadata));
+       pr_out_array_end(dl);
+}
+
+static void pr_out_trap(struct dl *dl, struct nlattr **tb, bool array)
 {
-       struct nlattr *nla_entry[DEVLINK_ATTR_MAX + 1] = {};
-       uint32_t entry_index;
-       uint64_t counter;
+       uint8_t action = mnl_attr_get_u8(tb[DEVLINK_ATTR_TRAP_ACTION]);
+       uint8_t type = mnl_attr_get_u8(tb[DEVLINK_ATTR_TRAP_TYPE]);
+
+       if (array)
+               pr_out_handle_start_arr(dl, tb);
+       else
+               __pr_out_handle_start(dl, tb, true, false);
+
+       pr_out_str(dl, "name", mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_NAME]));
+       pr_out_str(dl, "type", trap_type_name(type));
+       pr_out_bool(dl, "generic", !!tb[DEVLINK_ATTR_TRAP_GENERIC]);
+       pr_out_str(dl, "action", trap_action_name(action));
+       pr_out_str(dl, "group",
+                  mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_GROUP_NAME]));
+       if (dl->verbose)
+               pr_out_trap_metadata(dl, tb[DEVLINK_ATTR_TRAP_METADATA]);
+       pr_out_stats(dl, tb[DEVLINK_ATTR_STATS]);
+       pr_out_handle_end(dl);
+}
+
+static int cmd_trap_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_TRAP_NAME] || !tb[DEVLINK_ATTR_TRAP_TYPE] ||
+           !tb[DEVLINK_ATTR_TRAP_ACTION] ||
+           !tb[DEVLINK_ATTR_TRAP_GROUP_NAME] ||
+           !tb[DEVLINK_ATTR_TRAP_METADATA] || !tb[DEVLINK_ATTR_STATS])
+               return MNL_CB_ERROR;
+
+       pr_out_trap(dl, tb, true);
+
+       return MNL_CB_OK;
+}
+
+static void cmd_trap_help(void)
+{
+       pr_err("Usage: devlink trap set DEV trap TRAP [ action { trap | drop } ]\n");
+       pr_err("       devlink trap show [ DEV trap TRAP ]\n");
+       pr_err("       devlink trap group set DEV group GROUP [ action { trap | drop } ]\n");
+       pr_err("       devlink trap group show [ DEV group GROUP ]\n");
+}
+
+static int cmd_trap_show(struct dl *dl)
+{
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       struct nlmsghdr *nlh;
        int err;
 
-       err = mnl_attr_parse_nested(nl, attr_cb, nla_entry);
-       if (err != MNL_CB_OK)
-               return -EINVAL;
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
 
-       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;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_TRAP_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl,
+                                       DL_OPT_HANDLE | DL_OPT_TRAP_NAME, 0);
+               if (err)
+                       return err;
        }
 
-       entry_index = mnl_attr_get_u32(nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_INDEX]);
-       pr_out_uint(ctx->dl, "index", entry_index);
+       pr_out_section_start(dl, "trap");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_trap_show_cb, dl);
+       pr_out_section_end(dl);
 
-       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);
-       }
+       return err;
+}
 
-       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);
+static int cmd_trap_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
 
-       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;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_TRAP_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
 
-err_action_values_show:
-err_match_values_show:
-       pr_out_array_end(ctx->dl);
-       return -EINVAL;
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE | DL_OPT_TRAP_NAME,
+                               DL_OPT_TRAP_ACTION);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
 }
 
-static int dpipe_table_entries_show(struct dpipe_ctx *ctx, struct nlattr **tb)
+static void pr_out_trap_group(struct dl *dl, struct nlattr **tb, bool array)
 {
-       struct nlattr *nla_entries = tb[DEVLINK_ATTR_DPIPE_ENTRIES];
-       struct nlattr *nla_entry;
-
-       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 0;
+       if (array)
+               pr_out_handle_start_arr(dl, tb);
+       else
+               __pr_out_handle_start(dl, tb, true, false);
 
-err_entry_show:
-       pr_out_handle_end(ctx->dl);
-       return -EINVAL;
+       pr_out_str(dl, "name",
+                  mnl_attr_get_str(tb[DEVLINK_ATTR_TRAP_GROUP_NAME]));
+       pr_out_bool(dl, "generic", !!tb[DEVLINK_ATTR_TRAP_GENERIC]);
+       pr_out_stats(dl, tb[DEVLINK_ATTR_STATS]);
+       pr_out_handle_end(dl);
 }
 
-static int cmd_dpipe_table_entry_dump_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_trap_group_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);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
 
        mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
        if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
-           !tb[DEVLINK_ATTR_DPIPE_ENTRIES])
+           !tb[DEVLINK_ATTR_TRAP_GROUP_NAME] || !tb[DEVLINK_ATTR_STATS])
                return MNL_CB_ERROR;
 
-       if (dpipe_table_entries_show(ctx, tb))
-               return MNL_CB_ERROR;
+       pr_out_trap_group(dl, tb, true);
+
        return MNL_CB_OK;
 }
 
-static int cmd_dpipe_table_dump(struct dl *dl)
+static int cmd_trap_group_show(struct dl *dl)
 {
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
        struct nlmsghdr *nlh;
-       struct dpipe_ctx *ctx;
-       uint16_t flags = NLM_F_REQUEST;
        int err;
 
-       ctx = dpipe_ctx_alloc(dl);
-       if (!ctx)
-               return -ENOMEM;
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
 
-       err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_DPIPE_TABLE_NAME, 0);
-       if (err)
-               goto out;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_TRAP_GROUP_GET, flags);
 
-       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;
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl,
+                                       DL_OPT_HANDLE | DL_OPT_TRAP_GROUP_NAME,
+                                       0);
+               if (err)
+                       return err;
        }
 
-       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_start(dl, "trap_group");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_trap_group_show_cb, dl);
        pr_out_section_end(dl);
-out:
-       dpipe_ctx_clear(ctx);
-       dpipe_ctx_free(ctx);
+
        return err;
 }
 
-static void cmd_dpipe_table_help(void)
+static int cmd_trap_group_set(struct dl *dl)
 {
-       pr_err("Usage: devlink dpipe table [ OBJECT-LIST ]\n"
-              "where  OBJECT-LIST := { show | set | dump }\n");
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_TRAP_GROUP_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl,
+                               DL_OPT_HANDLE | DL_OPT_TRAP_GROUP_NAME,
+                               DL_OPT_TRAP_ACTION);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
 }
 
-static int cmd_dpipe_table(struct dl *dl)
+static int cmd_trap_group(struct dl *dl)
 {
-       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
-               cmd_dpipe_table_help();
+       if (dl_argv_match(dl, "help")) {
+               cmd_trap_help();
                return 0;
-       } else if (dl_argv_match(dl, "show")) {
+       } else if (dl_argv_match(dl, "show") ||
+                  dl_argv_match(dl, "list") || dl_no_arg(dl)) {
                dl_arg_inc(dl);
-               return cmd_dpipe_table_show(dl);
+               return cmd_trap_group_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);
+               return cmd_trap_group_set(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)
+static int cmd_trap(struct dl *dl)
 {
-       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
-               cmd_dpipe_help();
+       if (dl_argv_match(dl, "help")) {
+               cmd_trap_help();
                return 0;
-       } else if (dl_argv_match(dl, "header")) {
+       } else if (dl_argv_match(dl, "show") ||
+                  dl_argv_match(dl, "list") || dl_no_arg(dl)) {
                dl_arg_inc(dl);
-               return cmd_dpipe_header(dl);
-       } else if (dl_argv_match(dl, "table")) {
+               return cmd_trap_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
                dl_arg_inc(dl);
-               return cmd_dpipe_table(dl);
+               return cmd_trap_set(dl);
+       } else if (dl_argv_match(dl, "group")) {
+               dl_arg_inc(dl);
+               return cmd_trap_group(dl);
        }
        pr_err("Command \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
@@ -3803,9 +7047,9 @@ static int cmd_dpipe(struct dl *dl)
 static void help(void)
 {
        pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
-              "       devlink [ -f[orce] ] -b[atch] filename\n"
-              "where  OBJECT := { dev | port | sb | monitor | dpipe }\n"
-              "       OPTIONS := { -V[ersion] | -n[no-nice-names] | -j[json] | -p[pretty] | -v[verbose] }\n");
+              "       devlink [ -f[orce] ] -b[atch] filename -N[etns] netnsname\n"
+              "where  OBJECT := { dev | port | sb | monitor | dpipe | resource | region | health | trap }\n"
+              "       OPTIONS := { -V[ersion] | -n[o-nice-names] | -j[son] | -p[retty] | -v[erbose] -s[tatistics] }\n");
 }
 
 static int dl_cmd(struct dl *dl, int argc, char **argv)
@@ -3831,6 +7075,18 @@ static int dl_cmd(struct dl *dl, int argc, char **argv)
        } else if (dl_argv_match(dl, "dpipe")) {
                dl_arg_inc(dl);
                return cmd_dpipe(dl);
+       } else if (dl_argv_match(dl, "resource")) {
+               dl_arg_inc(dl);
+               return cmd_resource(dl);
+       } else if (dl_argv_match(dl, "region")) {
+               dl_arg_inc(dl);
+               return cmd_region(dl);
+       } else if (dl_argv_match(dl, "health")) {
+               dl_arg_inc(dl);
+               return cmd_health(dl);
+       } else if (dl_argv_match(dl, "trap")) {
+               dl_arg_inc(dl);
+               return cmd_trap(dl);
        }
        pr_err("Object \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
@@ -3940,6 +7196,8 @@ int main(int argc, char **argv)
                { "json",               no_argument,            NULL, 'j' },
                { "pretty",             no_argument,            NULL, 'p' },
                { "verbose",            no_argument,            NULL, 'v' },
+               { "statistics",         no_argument,            NULL, 's' },
+               { "Netns",              required_argument,      NULL, 'N' },
                { NULL, 0, NULL, 0 }
        };
        const char *batch_file = NULL;
@@ -3955,7 +7213,7 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       while ((opt = getopt_long(argc, argv, "Vfb:njpv",
+       while ((opt = getopt_long(argc, argv, "Vfb:njpvsN:",
                                  long_options, NULL)) >= 0) {
 
                switch (opt) {
@@ -3981,6 +7239,15 @@ int main(int argc, char **argv)
                case 'v':
                        dl->verbose = true;
                        break;
+               case 's':
+                       dl->stats = true;
+                       break;
+               case 'N':
+                       if (netns_switch(optarg)) {
+                               ret = EXIT_FAILURE;
+                               goto dl_free;
+                       }
+                       break;
                default:
                        pr_err("Unknown option.\n");
                        help();