]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - devlink/devlink.c
devlink: Refactor validation of finding required arguments
[mirror_iproute2.git] / devlink / devlink.c
index 7602970bc58a8e0a25da1517bedd4b9ed695703b..a774b196b7fdb24e1a2cd1bc79ccefdaa63b1c9c 100644 (file)
 #include <getopt.h>
 #include <limits.h>
 #include <errno.h>
+#include <inttypes.h>
 #include <linux/genetlink.h>
 #include <linux/devlink.h>
 #include <libmnl/libmnl.h>
+#include <netinet/ether.h>
 
 #include "SNAPSHOT.h"
 #include "list.h"
 #define ESWITCH_INLINE_MODE_NETWORK "network"
 #define ESWITCH_INLINE_MODE_TRANSPORT "transport"
 
+#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
+
+static int g_new_line_count;
+
 #define pr_err(args...) fprintf(stderr, ##args)
 #define pr_out(args...)                                                \
        do {                                                    \
@@ -42,6 +51,7 @@
                        g_indent_newline = false;               \
                }                                               \
                fprintf(stdout, ##args);                        \
+               g_new_line_count = 0;                           \
        } while (0)
 
 #define pr_out_sp(num, args...)                                        \
@@ -49,6 +59,7 @@
                int ret = fprintf(stdout, ##args);              \
                if (ret < num)                                  \
                        fprintf(stdout, "%*s", num - ret, "");  \
+               g_new_line_count = 0;                           \
        } while (0)
 
 static int g_indent_level;
@@ -76,8 +87,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,
@@ -177,6 +191,17 @@ 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)
 
 struct dl_opts {
        uint32_t present; /* flags of present items */
@@ -197,6 +222,19 @@ 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;
 };
 
 struct dl {
@@ -334,6 +372,29 @@ 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,
 };
 
 static int attr_cb(const struct nlattr *attr, void *data)
@@ -342,7 +403,7 @@ static int attr_cb(const struct nlattr *attr, void *data)
        int type;
 
        if (mnl_attr_type_valid(attr, DEVLINK_ATTR_MAX) < 0)
-               return MNL_CB_ERROR;
+               return MNL_CB_OK;
 
        type = mnl_attr_get_type(attr);
        if (mnl_attr_validate(attr, devlink_policy[type]) < 0)
@@ -472,6 +533,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;
@@ -500,6 +575,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);
@@ -526,18 +629,26 @@ static int __dl_argv_handle_port(char *str,
                                 char **p_bus_name, char **p_dev_name,
                                 uint32_t *p_port_index)
 {
-       char *handlestr = handlestr;
-       char *portstr = portstr;
+       char *handlestr;
+       char *portstr;
        int err;
 
-       strslashrsplit(str, &handlestr, &portstr);
+       err = strslashrsplit(str, &handlestr, &portstr);
+       if (err) {
+               pr_err("Port identification \"%s\" is invalid\n", str);
+               return err;
+       }
        err = strtouint32_t(portstr, p_port_index);
        if (err) {
                pr_err("Port index \"%s\" is not a number or not within range\n",
                       portstr);
                return err;
        }
-       strslashrsplit(handlestr, p_bus_name, p_dev_name);
+       err = strslashrsplit(handlestr, p_bus_name, p_dev_name);
+       if (err) {
+               pr_err("Port identification \"%s\" is invalid\n", str);
+               return err;
+       }
        return 0;
 }
 
@@ -621,6 +732,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);
@@ -770,6 +939,65 @@ static int eswitch_encap_mode_get(const char *typestr, bool *p_mode)
        return 0;
 }
 
+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;
+}
+
+struct dl_args_metadata {
+       uint32_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."},
+};
+
+static int dl_args_finding_required_validate(uint32_t o_required,
+                                            uint32_t o_found)
+{
+       uint32_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, uint32_t o_required,
                         uint32_t o_optional)
 {
@@ -779,7 +1007,7 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
        int err;
 
        if (o_required & DL_OPT_HANDLE && o_required & DL_OPT_HANDLEP) {
-               uint32_t handle_bit = handle_bit;
+               uint32_t handle_bit;
 
                err = dl_argv_handle_both(dl, &opts->bus_name, &opts->dev_name,
                                          &opts->port_index, &handle_bit);
@@ -797,6 +1025,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)) {
@@ -937,6 +1172,81 @@ 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 {
                        pr_err("Unknown option \"%s\"\n", dl_argv(dl));
                        return -EINVAL;
@@ -950,78 +1260,7 @@ 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;
-       }
-
-       if ((o_required & DL_OPT_SB_SIZE) && !(o_found & DL_OPT_SB_SIZE)) {
-               pr_err("Pool size option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_SB_TYPE) && !(o_found & DL_OPT_SB_TYPE)) {
-               pr_err("Pool type option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_SB_THTYPE) && !(o_found & DL_OPT_SB_THTYPE)) {
-               pr_err("Pool threshold type option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_SB_TH) && !(o_found & DL_OPT_SB_TH)) {
-               pr_err("Threshold option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_SB_TC) && !(o_found & DL_OPT_SB_TC)) {
-               pr_err("TC index option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_ESWITCH_MODE) &&
-           !(o_found & DL_OPT_ESWITCH_MODE)) {
-               pr_err("E-Switch mode option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_ESWITCH_INLINE_MODE) &&
-           !(o_found & DL_OPT_ESWITCH_INLINE_MODE)) {
-               pr_err("E-Switch inline-mode option expected.\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_DPIPE_TABLE_NAME) &&
-           !(o_found & DL_OPT_DPIPE_TABLE_NAME)) {
-               pr_err("Dpipe table name expected\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_DPIPE_TABLE_COUNTERS) &&
-           !(o_found & DL_OPT_DPIPE_TABLE_COUNTERS)) {
-               pr_err("Dpipe table counter state expected\n");
-               return -EINVAL;
-       }
-
-       if ((o_required & DL_OPT_ESWITCH_ENCAP_MODE) &&
-           !(o_found & DL_OPT_ESWITCH_ENCAP_MODE)) {
-               pr_err("E-Switch encapsulation option expected.\n");
-               return -EINVAL;
-       }
-
-       return 0;
+       return dl_args_finding_required_validate(o_required, o_found);
 }
 
 static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
@@ -1036,6 +1275,11 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
                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,
@@ -1079,6 +1323,33 @@ 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);
 }
 
 static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
@@ -1137,6 +1408,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\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,
@@ -1350,6 +1626,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 (val)
+               pr_out_str(dl, name, "true");
+       else
+               pr_out_str(dl, name, "false");
+}
+
 static void pr_out_uint(struct dl *dl, const char *name, unsigned int val)
 {
        if (dl->json_output) {
@@ -1362,6 +1646,57 @@ static void pr_out_uint(struct dl *dl, const char *name, unsigned int val)
        }
 }
 
+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");
+
+       return pr_out_uint(dl, name, val);
+}
+
+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)
+{
+       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_dev(struct dl *dl, struct nlattr **tb)
 {
        pr_out_handle(dl, tb);
@@ -1392,20 +1727,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)
@@ -1422,6 +1783,19 @@ static void pr_out_entry_end(struct dl *dl)
                __pr_out_newline();
 }
 
+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) {
@@ -1540,43 +1914,425 @@ 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;
+
+       for (i = 0; i < len; i++)
+               if (!strcmp(param_val_conv[i].name, name))
+                       return true;
+
+       return false;
+}
+
+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)
+{
+       uint32_t i;
+
+       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;
+               }
+
+       return -ENOENT;
+}
+
+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)
+{
+       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 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,
+       },
+};
+
+#define PARAM_VAL_CONV_LEN ARRAY_SIZE(param_val_conv)
+
+static void pr_out_param_value(struct dl *dl, const char *nla_name,
+                              int nla_type, struct nlattr *nl)
+{
+       struct nlattr *nla_value[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *val_attr;
+       const char *vstr;
+       bool conv_exists;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_value);
+       if (err != MNL_CB_OK)
+               return;
+
+       if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] ||
+           (nla_type != MNL_TYPE_FLAG &&
+            !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]))
+               return;
+
+       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;
+       }
+}
+
+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 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])
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_PARAM])
                return MNL_CB_ERROR;
-       pr_out_dev(dl, tb);
+       pr_out_param(dl, tb, true);
        return MNL_CB_OK;
 }
 
-static int cmd_dev_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 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;
+
+       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;
+
+       err = mnl_attr_parse_nested(tb[DEVLINK_ATTR_PARAM], attr_cb, nla_param);
+       if (err != MNL_CB_OK)
+               return MNL_CB_ERROR;
+
+       if (!nla_param[DEVLINK_ATTR_PARAM_TYPE] ||
+           !nla_param[DEVLINK_ATTR_PARAM_VALUES_LIST])
+               return MNL_CB_ERROR;
+
+       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;
+
+               err = mnl_attr_parse_nested(param_value_attr,
+                                           attr_cb, nla_value);
+               if (err != MNL_CB_OK)
+                       return MNL_CB_ERROR;
+
+               if (!nla_value[DEVLINK_ATTR_PARAM_VALUE_CMODE] ||
+                   (nla_type != MNL_TYPE_FLAG &&
+                    !nla_value[DEVLINK_ATTR_PARAM_VALUE_DATA]))
+                       return MNL_CB_ERROR;
+
+               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_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;
+
+       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);
+
+       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_dev_param_show(struct dl *dl)
+{
        uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       struct nlmsghdr *nlh;
        int err;
 
        if (dl_argc(dl) == 0)
                flags |= NLM_F_DUMP;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_GET, flags);
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PARAM_GET, flags);
 
        if (dl_argc(dl) > 0) {
-               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 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, "dev");
-       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_show_cb, dl);
+       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_dev(struct dl *dl)
+static int cmd_dev_param(struct dl *dl)
 {
        if (dl_argv_match(dl, "help")) {
                cmd_dev_help();
@@ -1584,79 +2340,28 @@ static int cmd_dev(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_dev_show(dl);
-       } else if (dl_argv_match(dl, "eswitch")) {
+               return cmd_dev_param_show(dl);
+       } else if (dl_argv_match(dl, "set")) {
                dl_arg_inc(dl);
-               return cmd_dev_eswitch(dl);
+               return cmd_dev_param_set(dl);
        }
        pr_err("Command \"%s\" not found\n", dl_argv(dl));
        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 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 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_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 int cmd_dev_show_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct dl *dl = data;
        struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
        struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
 
        mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
-       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
-           !tb[DEVLINK_ATTR_PORT_INDEX])
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME])
                return MNL_CB_ERROR;
-       pr_out_port(dl, tb);
+       pr_out_dev(dl, tb);
        return MNL_CB_OK;
 }
 
-static int cmd_port_show(struct dl *dl)
+static int cmd_dev_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
@@ -1665,64 +2370,386 @@ static int cmd_port_show(struct dl *dl)
        if (dl_argc(dl) == 0)
                flags |= NLM_F_DUMP;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_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_HANDLEP, 0);
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
                if (err)
                        return err;
        }
 
-       pr_out_section_start(dl, "port");
-       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_port_show_cb, dl);
+       pr_out_section_start(dl, "dev");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dev_show_cb, dl);
        pr_out_section_end(dl);
        return err;
 }
 
-static int cmd_port_set(struct dl *dl)
+static void cmd_dev_reload_help(void)
 {
-       struct nlmsghdr *nlh;
-       int err;
-
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SET,
-                              NLM_F_REQUEST | NLM_F_ACK);
-
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_TYPE, 0);
-       if (err)
-               return err;
-
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+       pr_err("Usage: devlink dev reload [ DEV ]\n");
 }
 
-static int cmd_port_split(struct dl *dl)
+static int cmd_dev_reload(struct dl *dl)
 {
        struct nlmsghdr *nlh;
        int err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SPLIT,
+       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_HANDLEP | DL_OPT_PORT_COUNT, 0);
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
        if (err)
                return err;
 
        return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
 }
 
-static int cmd_port_unsplit(struct dl *dl)
+static void pr_out_versions_single(struct dl *dl, const struct nlmsghdr *nlh,
+                                  const char *name, int type)
 {
-       struct nlmsghdr *nlh;
-       int err;
+       struct nlattr *version;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_UNSPLIT,
-                              NLM_F_REQUEST | NLM_F_ACK);
+       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;
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
-       if (err)
-               return err;
+               if (mnl_attr_get_type(version) != type)
+                       continue;
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
-}
+               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_versions_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       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])
+               return MNL_CB_ERROR;
+
+       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 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_INFO_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE, 0);
+               if (err)
+                       return err;
+       }
+
+       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 void cmd_dev_flash_help(void)
+{
+       pr_err("Usage: devlink dev flash DEV file PATH [ component NAME ]\n");
+}
+
+static int cmd_dev_flash(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       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_FLASH_FILE_NAME,
+                               DL_OPT_FLASH_COMPONENT);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_dev(struct dl *dl)
+{
+       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);
+       } 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 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 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";
+       default:
+               return "<unknown flavour>";
+       }
+}
+
+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));
+       }
+       if (tb[DEVLINK_ATTR_PORT_SPLIT_GROUP])
+               pr_out_uint(dl, "split_group",
+                           mnl_attr_get_u32(tb[DEVLINK_ATTR_PORT_SPLIT_GROUP]));
+       pr_out_port_handle_end(dl);
+}
+
+static int cmd_port_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct dl *dl = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_PORT_INDEX])
+               return MNL_CB_ERROR;
+       pr_out_port(dl, tb);
+       return MNL_CB_OK;
+}
+
+static int cmd_port_show(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
+       int err;
+
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_GET, flags);
+
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
+               if (err)
+                       return err;
+       }
+
+       pr_out_section_start(dl, "port");
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_port_show_cb, dl);
+       pr_out_section_end(dl);
+       return err;
+}
+
+static int cmd_port_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_TYPE, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_port_split(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_SPLIT,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP | DL_OPT_PORT_COUNT, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+static int cmd_port_unsplit(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_PORT_UNSPLIT,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLEP, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
 
 static int cmd_port(struct dl *dl)
 {
@@ -1857,6 +2884,9 @@ static void pr_out_sb_pool(struct dl *dl, struct nlattr **tb)
                    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);
 }
 
@@ -2529,8 +3559,16 @@ 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";
        default: return "<unknown cmd>";
        }
 }
@@ -2549,6 +3587,16 @@ 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";
        default: return "<unknown obj>";
        }
 }
@@ -2573,6 +3621,8 @@ static bool cmd_filter_check(struct dl *dl, uint8_t cmd)
        return false;
 }
 
+static void pr_out_region(struct dl *dl, struct nlattr **tb);
+
 static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct dl *dl = data;
@@ -2605,14 +3655,36 @@ static int cmd_mon_show_cb(const struct nlmsghdr *nlh, void *data)
                pr_out_mon_header(genl->cmd);
                pr_out_port(dl, tb);
                break;
-       }
-       return MNL_CB_OK;
-}
-
-static int cmd_mon_show(struct dl *dl)
-{
-       int err;
-       unsigned int index = 0;
+       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;
+       }
+       return MNL_CB_OK;
+}
+
+static int cmd_mon_show(struct dl *dl)
+{
+       int err;
+       unsigned int index = 0;
        const char *cur_obj;
 
        while ((cur_obj = dl_argv_index(dl, index++))) {
@@ -2666,12 +3738,112 @@ struct dpipe_header {
        unsigned int fields_count;
 };
 
+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 resources *resources;
+       struct dpipe_tables *tables;
+       bool print_resources;
+       bool pending_change;
+};
+
+static struct resource *resource_alloc(void)
+{
+       struct resource *resource;
+
+       resource = calloc(1, sizeof(struct resource));
+       if (!resource)
+               return NULL;
+       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)
@@ -2724,25 +3896,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_ctx_free(struct dpipe_ctx *ctx)
+static void dpipe_tables_free(struct dpipe_tables *tables)
 {
-       free(ctx);
+       struct dpipe_table *table, *tmp;
+
+       list_for_each_entry_safe(table, tmp, &tables->table_list, list)
+               dpipe_table_free(table);
+       free(tables);
+}
+
+static int dpipe_ctx_init(struct dpipe_ctx *ctx, struct dl *dl)
+{
+       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;
 
@@ -2758,6 +3954,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,
@@ -3013,7 +4210,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;
 
@@ -3023,595 +4220,1499 @@ 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;
 }
 
 static void cmd_dpipe_header_help(void)
 {
-       pr_err("Usage: devlink dpipe headers show DEV\n");
+       pr_err("Usage: devlink dpipe headers show DEV\n");
+}
+
+static int cmd_dpipe_header(struct dl *dl)
+{
+       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
+               cmd_dpipe_header_help();
+               return 0;
+       } else if (dl_argv_match(dl, "show")) {
+               dl_arg_inc(dl);
+               return cmd_dpipe_headers_show(dl);
+       }
+       pr_err("Command \"%s\" not found\n", dl_argv(dl));
+       return -ENOENT;
+}
+
+static const char
+*dpipe_action_type_e2s(enum devlink_dpipe_action_type action_type)
+{
+       switch (action_type) {
+       case DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY:
+               return "field_modify";
+       default:
+               return "<unknown>";
+       }
+}
+
+struct dpipe_op_info {
+       uint32_t header_id;
+       uint32_t field_id;
+       bool header_global;
+};
+
+struct dpipe_action {
+       struct dpipe_op_info info;
+       uint32_t type;
+};
+
+static void pr_out_dpipe_action(struct dpipe_action *action,
+                               struct dpipe_ctx *ctx)
+{
+       struct dpipe_op_info *op_info = &action->info;
+       const char *mapping;
+
+       pr_out_str(ctx->dl, "type",
+                  dpipe_action_type_e2s(action->type));
+       pr_out_str(ctx->dl, "header",
+                  dpipe_header_id2s(ctx, op_info->header_id,
+                                    op_info->header_global));
+       pr_out_str(ctx->dl, "field",
+                  dpipe_field_id2s(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global));
+       mapping = dpipe_mapping_get(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global);
+       if (mapping)
+               pr_out_str(ctx->dl, "mapping", mapping);
+}
+
+static int dpipe_action_parse(struct dpipe_action *action, struct nlattr *nl)
+{
+       struct nlattr *nla_action[DEVLINK_ATTR_MAX + 1] = {};
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_action);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE] ||
+           !nla_action[DEVLINK_ATTR_DPIPE_HEADER_INDEX] ||
+           !nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID] ||
+           !nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]) {
+               return -EINVAL;
+       }
+
+       action->type = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE]);
+       action->info.header_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID]);
+       action->info.field_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]);
+       action->info.header_global = !!mnl_attr_get_u8(nla_action[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
+
+       return 0;
+}
+
+static int dpipe_table_actions_show(struct dpipe_ctx *ctx,
+                                   struct nlattr *nla_actions)
+{
+       struct nlattr *nla_action;
+       struct dpipe_action action;
+
+       mnl_attr_for_each_nested(nla_action, nla_actions) {
+               pr_out_entry_start(ctx->dl);
+               if (dpipe_action_parse(&action, nla_action))
+                       goto err_action_parse;
+               pr_out_dpipe_action(&action, ctx);
+               pr_out_entry_end(ctx->dl);
+       }
+       return 0;
+
+err_action_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
+}
+
+static const char *
+dpipe_match_type_e2s(enum devlink_dpipe_match_type match_type)
+{
+       switch (match_type) {
+       case DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT:
+               return "field_exact";
+       default:
+               return "<unknown>";
+       }
+}
+
+struct dpipe_match {
+       struct dpipe_op_info info;
+       uint32_t type;
+};
+
+static void pr_out_dpipe_match(struct dpipe_match *match,
+                              struct dpipe_ctx *ctx)
+{
+       struct dpipe_op_info *op_info = &match->info;
+       const char *mapping;
+
+       pr_out_str(ctx->dl, "type",
+                  dpipe_match_type_e2s(match->type));
+       pr_out_str(ctx->dl, "header",
+                  dpipe_header_id2s(ctx, op_info->header_id,
+                                    op_info->header_global));
+       pr_out_str(ctx->dl, "field",
+                  dpipe_field_id2s(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global));
+       mapping = dpipe_mapping_get(ctx, op_info->header_id,
+                                   op_info->field_id,
+                                   op_info->header_global);
+       if (mapping)
+               pr_out_str(ctx->dl, "mapping", mapping);
+}
+
+static int dpipe_match_parse(struct dpipe_match *match,
+                            struct nlattr *nl)
+
+{
+       struct nlattr *nla_match[DEVLINK_ATTR_MAX + 1] = {};
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_match);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE] ||
+           !nla_match[DEVLINK_ATTR_DPIPE_HEADER_INDEX] ||
+           !nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID] ||
+           !nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]) {
+               return -EINVAL;
+       }
+
+       match->type = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE]);
+       match->info.header_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID]);
+       match->info.field_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]);
+       match->info.header_global = !!mnl_attr_get_u8(nla_match[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
+
+       return 0;
+}
+
+static int dpipe_table_matches_show(struct dpipe_ctx *ctx,
+                                   struct nlattr *nla_matches)
+{
+       struct nlattr *nla_match;
+       struct dpipe_match match;
+
+       mnl_attr_for_each_nested(nla_match, nla_matches) {
+               pr_out_entry_start(ctx->dl);
+               if (dpipe_match_parse(&match, nla_match))
+                       goto err_match_parse;
+               pr_out_dpipe_match(&match, ctx);
+               pr_out_entry_end(ctx->dl);
+       }
+       return 0;
+
+err_match_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
+}
+
+static 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;
+       bool resource_valid;
+       uint32_t size;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_table);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_table[DEVLINK_ATTR_DPIPE_TABLE_NAME] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_SIZE] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_ACTIONS] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_MATCHES] ||
+           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED]) {
+               return -EINVAL;
+       }
+
+       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]);
+
+       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;
+       pr_out_array_end(ctx->dl);
+
+       pr_out_array_start(ctx->dl, "action");
+       if (dpipe_table_actions_show(ctx, nla_table[DEVLINK_ATTR_DPIPE_TABLE_ACTIONS]))
+               goto err_actions_show;
+       pr_out_array_end(ctx->dl);
+
+       return 0;
+
+err_actions_show:
+err_matches_show:
+       pr_out_array_end(ctx->dl);
+       return -EINVAL;
+}
+
+static int dpipe_tables_show(struct dpipe_ctx *ctx, struct nlattr **tb)
+{
+       struct nlattr *nla_tables = tb[DEVLINK_ATTR_DPIPE_TABLES];
+       struct nlattr *nla_table;
+
+       mnl_attr_for_each_nested(nla_table, nla_tables) {
+               if (ctx->print_tables)
+                       pr_out_handle_start_arr(ctx->dl, tb);
+               if (dpipe_table_show(ctx, nla_table))
+                       goto err_table_show;
+               if (ctx->print_tables)
+                       pr_out_handle_end(ctx->dl);
+       }
+       return 0;
+
+err_table_show:
+       if (ctx->print_tables)
+               pr_out_handle_end(ctx->dl);
+       return -EINVAL;
+}
+
+static int cmd_dpipe_table_show_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct dpipe_ctx *ctx = data;
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+
+       mnl_attr_parse(nlh, sizeof(*genl), attr_cb, tb);
+       if (!tb[DEVLINK_ATTR_BUS_NAME] || !tb[DEVLINK_ATTR_DEV_NAME] ||
+           !tb[DEVLINK_ATTR_DPIPE_TABLES])
+               return MNL_CB_ERROR;
+
+       if (dpipe_tables_show(ctx, tb))
+               return MNL_CB_ERROR;
+       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 dpipe_ctx = {};
+       struct resource_ctx resource_ctx = {};
+       uint16_t flags = NLM_F_REQUEST;
+       int err;
+
+       err = dl_argv_parse(dl, DL_OPT_HANDLE, DL_OPT_DPIPE_TABLE_NAME);
+       if (err)
+               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,
+                                 &dpipe_ctx);
+       if (err) {
+               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, &dpipe_ctx);
+       pr_out_section_end(dl);
+
+       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;
+}
+
+static int cmd_dpipe_table_set(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
+
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
+
+       err = dl_argv_parse_put(nlh, dl,
+                               DL_OPT_HANDLE | DL_OPT_DPIPE_TABLE_NAME |
+                               DL_OPT_DPIPE_TABLE_COUNTERS, 0);
+       if (err)
+               return err;
+
+       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+}
+
+enum dpipe_value_type {
+       DPIPE_VALUE_TYPE_VALUE,
+       DPIPE_VALUE_TYPE_MASK,
+};
+
+static const char *
+dpipe_value_type_e2s(enum dpipe_value_type type)
+{
+       switch (type) {
+       case DPIPE_VALUE_TYPE_VALUE:
+               return "value";
+       case DPIPE_VALUE_TYPE_MASK:
+               return "value_mask";
+       default:
+               return "<unknown>";
+       }
+}
+
+struct dpipe_field_printer {
+       unsigned int field_id;
+       void (*printer)(struct dpipe_ctx *, enum dpipe_value_type, void *);
+};
+
+struct dpipe_header_printer {
+       struct dpipe_field_printer *printers;
+       unsigned int printers_count;
+       unsigned int header_id;
+};
+
+static void dpipe_field_printer_ipv4_addr(struct dpipe_ctx *ctx,
+                                         enum dpipe_value_type type,
+                                         void *value)
+{
+       struct in_addr ip_addr;
+
+       ip_addr.s_addr = htonl(*(uint32_t *)value);
+       pr_out_str(ctx->dl, dpipe_value_type_e2s(type), inet_ntoa(ip_addr));
+}
+
+static void
+dpipe_field_printer_ethernet_addr(struct dpipe_ctx *ctx,
+                                 enum dpipe_value_type type,
+                                 void *value)
+{
+       pr_out_str(ctx->dl, dpipe_value_type_e2s(type),
+                  ether_ntoa((struct ether_addr *)value));
+}
+
+static void dpipe_field_printer_ipv6_addr(struct dpipe_ctx *ctx,
+                                         enum dpipe_value_type type,
+                                         void *value)
+{
+       char str[INET6_ADDRSTRLEN];
+
+       inet_ntop(AF_INET6, value, str, INET6_ADDRSTRLEN);
+       pr_out_str(ctx->dl, dpipe_value_type_e2s(type), str);
+}
+
+static struct dpipe_field_printer dpipe_field_printers_ipv4[] = {
+       {
+               .printer = dpipe_field_printer_ipv4_addr,
+               .field_id = DEVLINK_DPIPE_FIELD_IPV4_DST_IP,
+       }
+};
+
+static struct dpipe_header_printer dpipe_header_printer_ipv4  = {
+       .printers = dpipe_field_printers_ipv4,
+       .printers_count = ARRAY_SIZE(dpipe_field_printers_ipv4),
+       .header_id = DEVLINK_DPIPE_HEADER_IPV4,
+};
+
+static struct dpipe_field_printer dpipe_field_printers_ethernet[] = {
+       {
+               .printer = dpipe_field_printer_ethernet_addr,
+               .field_id = DEVLINK_DPIPE_FIELD_ETHERNET_DST_MAC,
+       },
+};
+
+static struct dpipe_header_printer dpipe_header_printer_ethernet = {
+       .printers = dpipe_field_printers_ethernet,
+       .printers_count = ARRAY_SIZE(dpipe_field_printers_ethernet),
+       .header_id = DEVLINK_DPIPE_HEADER_ETHERNET,
+};
+
+static struct dpipe_field_printer dpipe_field_printers_ipv6[] = {
+       {
+               .printer = dpipe_field_printer_ipv6_addr,
+               .field_id = DEVLINK_DPIPE_FIELD_IPV6_DST_IP,
+       }
+};
+
+static struct dpipe_header_printer dpipe_header_printer_ipv6 = {
+       .printers = dpipe_field_printers_ipv6,
+       .printers_count = ARRAY_SIZE(dpipe_field_printers_ipv6),
+       .header_id = DEVLINK_DPIPE_HEADER_IPV6,
+};
+
+static struct dpipe_header_printer *dpipe_header_printers[] = {
+       &dpipe_header_printer_ipv4,
+       &dpipe_header_printer_ethernet,
+       &dpipe_header_printer_ipv6,
+};
+
+static int dpipe_print_prot_header(struct dpipe_ctx *ctx,
+                                  struct dpipe_op_info *info,
+                                  enum dpipe_value_type type,
+                                  void *value)
+{
+       unsigned int header_printers_count = ARRAY_SIZE(dpipe_header_printers);
+       struct dpipe_header_printer *header_printer;
+       struct dpipe_field_printer *field_printer;
+       unsigned int field_printers_count;
+       int j;
+       int i;
+
+       for (i = 0; i < header_printers_count; i++) {
+               header_printer = dpipe_header_printers[i];
+               if (header_printer->header_id != info->header_id)
+                       continue;
+               field_printers_count = header_printer->printers_count;
+               for (j = 0; j < field_printers_count; j++) {
+                       field_printer = &header_printer->printers[j];
+                       if (field_printer->field_id != info->field_id)
+                               continue;
+                       field_printer->printer(ctx, type, value);
+                       return 0;
+               }
+       }
+
+       return -EINVAL;
+}
+
+static void __pr_out_entry_value(struct dpipe_ctx *ctx,
+                                void *value,
+                                unsigned int value_len,
+                                struct dpipe_op_info *info,
+                                enum dpipe_value_type type)
+{
+       if (info->header_global &&
+           !dpipe_print_prot_header(ctx, info, type, value))
+               return;
+
+       if (value_len == sizeof(uint32_t)) {
+               uint32_t *value_32 = value;
+
+               pr_out_uint(ctx->dl, dpipe_value_type_e2s(type), *value_32);
+       }
+}
+
+static void pr_out_dpipe_entry_value(struct dpipe_ctx *ctx,
+                                    struct nlattr **nla_match_value,
+                                    struct dpipe_op_info *info)
+{
+       void *value, *value_mask;
+       uint32_t value_mapping;
+       uint16_t value_len;
+       bool mask, mapping;
+
+       mask = !!nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MASK];
+       mapping = !!nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MAPPING];
+
+       value_len = mnl_attr_get_payload_len(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
+       value = mnl_attr_get_payload(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
+
+       if (mapping) {
+               value_mapping = mnl_attr_get_u32(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MAPPING]);
+               pr_out_uint(ctx->dl, "mapping_value", value_mapping);
+       }
+
+       if (mask) {
+               value_mask = mnl_attr_get_payload(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
+               __pr_out_entry_value(ctx, value_mask, value_len, info,
+                                    DPIPE_VALUE_TYPE_MASK);
+       }
+
+       __pr_out_entry_value(ctx, value, value_len, info, DPIPE_VALUE_TYPE_VALUE);
+}
+
+static int dpipe_entry_match_value_show(struct dpipe_ctx *ctx,
+                                       struct nlattr *nl)
+{
+       struct nlattr *nla_match_value[DEVLINK_ATTR_MAX + 1] = {};
+       struct dpipe_match match;
+       int err;
+
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_match_value);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
+
+       if (!nla_match_value[DEVLINK_ATTR_DPIPE_MATCH] ||
+           !nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]) {
+               return -EINVAL;
+       }
+
+       pr_out_entry_start(ctx->dl);
+       if (dpipe_match_parse(&match,
+                             nla_match_value[DEVLINK_ATTR_DPIPE_MATCH]))
+               goto err_match_parse;
+       pr_out_dpipe_match(&match, ctx);
+       pr_out_dpipe_entry_value(ctx, nla_match_value, &match.info);
+       pr_out_entry_end(ctx->dl);
+
+       return 0;
+
+err_match_parse:
+       pr_out_entry_end(ctx->dl);
+       return -EINVAL;
+}
+
+static int 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_header(struct dl *dl)
+static int cmd_dpipe(struct dl *dl)
 {
        if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
-               cmd_dpipe_header_help();
+               cmd_dpipe_help();
                return 0;
-       } else if (dl_argv_match(dl, "show")) {
+       } else if (dl_argv_match(dl, "header")) {
                dl_arg_inc(dl);
-               return cmd_dpipe_headers_show(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 const char
-*dpipe_action_type_e2s(enum devlink_dpipe_action_type action_type)
-{
-       switch (action_type) {
-       case DEVLINK_DPIPE_ACTION_TYPE_FIELD_MODIFY:
-               return "field_modify";
-       default:
-               return "<unknown>";
+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;
        }
-}
-
-static void pr_out_dpipe_action(struct dpipe_ctx *ctx,
-                               uint32_t header_id, uint32_t field_id,
-                               uint32_t action_type, bool global)
-{
-       const char *mapping;
-
-       pr_out_str(ctx->dl, "type", dpipe_action_type_e2s(action_type));
-       pr_out_str(ctx->dl, "header", dpipe_header_id2s(ctx, header_id,
-                                                       global));
-       pr_out_str(ctx->dl, "field", dpipe_field_id2s(ctx, header_id, field_id,
-                                                     global));
-       mapping = dpipe_mapping_get(ctx, header_id, field_id, global);
-       if (mapping)
-               pr_out_str(ctx->dl, "mapping", mapping);
-}
 
-static int dpipe_action_show(struct dpipe_ctx *ctx, struct nlattr *nl)
-{
-       struct nlattr *nla_action[DEVLINK_ATTR_MAX + 1] = {};
-       uint32_t header_id, field_id, action_type;
-       bool global;
-       int err;
+       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]);
 
-       err = mnl_attr_parse_nested(nl, attr_cb, nla_action);
-       if (err != MNL_CB_OK)
-               return -EINVAL;
+       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_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE] ||
-           !nla_action[DEVLINK_ATTR_DPIPE_HEADER_INDEX] ||
-           !nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID] ||
-           !nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]) {
-               return -EINVAL;
+       if (nla_resource[DEVLINK_ATTR_RESOURCE_OCC]) {
+               resource->size_occ = mnl_attr_get_u64(nla_resource[DEVLINK_ATTR_RESOURCE_OCC]);
+               resource->occ_valid = true;
        }
 
-       header_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_HEADER_ID]);
-       field_id = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_FIELD_ID]);
-       action_type = mnl_attr_get_u32(nla_action[DEVLINK_ATTR_DPIPE_ACTION_TYPE]);
-       global = !!mnl_attr_get_u8(nla_action[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
+       if (resource->size_new != resource->size)
+               ctx->pending_change = true;
 
-       pr_out_dpipe_action(ctx, header_id, field_id, action_type, global);
        return 0;
 }
 
-static int dpipe_table_actions_show(struct dpipe_ctx *ctx,
-                                   struct nlattr *nla_actions)
+static int
+resource_get(struct resource_ctx *ctx, struct resource *resource,
+            struct resource *parent_resource, struct nlattr *nl)
 {
-       struct nlattr *nla_action;
+       struct nlattr *nla_resource[DEVLINK_ATTR_MAX + 1] = {};
+       struct nlattr *nla_child_resource;
+       struct nlattr *nla_resources;
+       bool top = false;
+       int err;
 
-       mnl_attr_for_each_nested(nla_action, nla_actions) {
-               pr_out_entry_start(ctx->dl);
-               if (dpipe_action_show(ctx, nla_action))
-                       goto err_action_show;
-               pr_out_entry_end(ctx->dl);
+       if (!resource) {
+               nla_resources = nl;
+               top = true;
+               goto out;
        }
-       return 0;
-
-err_action_show:
-       pr_out_entry_end(ctx->dl);
-       return -EINVAL;
-}
 
-static const char *
-dpipe_match_type_e2s(enum devlink_dpipe_match_type match_type)
-{
-       switch (match_type) {
-       case DEVLINK_DPIPE_MATCH_TYPE_FIELD_EXACT:
-               return "field_exact";
-       default:
-               return "<unknown>";
-       }
-}
+       err = mnl_attr_parse_nested(nl, attr_cb, nla_resource);
+       if (err != MNL_CB_OK)
+               return -EINVAL;
 
-static void pr_out_dpipe_match(struct dpipe_ctx *ctx,
-                              uint32_t header_id, uint32_t field_id,
-                              uint32_t match_type, bool global)
-{
-       const char *mapping;
+       err = resource_parse(ctx, resource, nla_resource);
+       if (err)
+               return err;
 
-       pr_out_str(ctx->dl, "type", dpipe_match_type_e2s(match_type));
-       pr_out_str(ctx->dl, "header", dpipe_header_id2s(ctx, header_id,
-                                                       global));
-       pr_out_str(ctx->dl, "field", dpipe_field_id2s(ctx, header_id, field_id,
-                                                     global));
-       mapping = dpipe_mapping_get(ctx, header_id, field_id, global);
-       if (mapping)
-               pr_out_str(ctx->dl, "mapping", mapping);
+       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;
 
-static int dpipe_match_show(struct dpipe_ctx *ctx, struct nlattr *nl)
-{
-       struct nlattr *nla_match[DEVLINK_ATTR_MAX + 1] = {};
-       uint32_t header_id, field_id, match_type;
-       bool global;
-       int err;
+               child_resource = resource_alloc();
+               if (!child_resource)
+                       return -ENOMEM;
 
-       err = mnl_attr_parse_nested(nl, attr_cb, nla_match);
-       if (err != MNL_CB_OK)
-               return -EINVAL;
+               if (top)
+                       list = &ctx->resources->resource_list;
+               else
+                       list = &resource->resource_list;
 
-       if (!nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE] ||
-           !nla_match[DEVLINK_ATTR_DPIPE_HEADER_INDEX] ||
-           !nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID] ||
-           !nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]) {
-               return -EINVAL;
+               list_add_tail(&child_resource->list, list);
+               err = resource_get(ctx, child_resource, resource,
+                                  nla_child_resource);
+               if (err)
+                       return err;
        }
 
-       match_type = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_MATCH_TYPE]);
-       header_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_HEADER_ID]);
-       field_id = mnl_attr_get_u32(nla_match[DEVLINK_ATTR_DPIPE_FIELD_ID]);
-       global = !!mnl_attr_get_u8(nla_match[DEVLINK_ATTR_DPIPE_HEADER_GLOBAL]);
-
-       pr_out_dpipe_match(ctx, header_id, field_id, match_type, global);
        return 0;
 }
 
-static int dpipe_table_matches_show(struct dpipe_ctx *ctx,
-                                   struct nlattr *nla_matches)
+static const char *resource_unit_str_get(enum devlink_resource_unit unit)
 {
-       struct nlattr *nla_match;
-
-       mnl_attr_for_each_nested(nla_match, nla_matches) {
-               pr_out_entry_start(ctx->dl);
-               if (dpipe_match_show(ctx, nla_match))
-                       goto err_match_show;
-               pr_out_entry_end(ctx->dl);
+       switch (unit) {
+       case DEVLINK_RESOURCE_UNIT_ENTRY: return "entry";
+       default: return "<unknown unit>";
        }
-       return 0;
-
-err_match_show:
-       pr_out_entry_end(ctx->dl);
-       return -EINVAL;
 }
 
-static int dpipe_table_show(struct dpipe_ctx *ctx, struct nlattr *nl)
+static void resource_show(struct resource *resource,
+                         struct resource_ctx *ctx)
 {
-       struct nlattr *nla_table[DEVLINK_ATTR_MAX + 1] = {};
-       bool counters_enabled;
-       const char *name;
-       uint32_t size;
-       int err;
+       struct resource *child_resource;
+       struct dpipe_table *table;
+       struct dl *dl = ctx->dl;
+       bool array = false;
 
-       err = mnl_attr_parse_nested(nl, attr_cb, nla_table);
-       if (err != MNL_CB_OK)
-               return -EINVAL;
+       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 (!nla_table[DEVLINK_ATTR_DPIPE_TABLE_NAME] ||
-           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_SIZE] ||
-           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_ACTIONS] ||
-           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_MATCHES] ||
-           !nla_table[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED]) {
-               return -EINVAL;
+       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);
        }
 
-       name = mnl_attr_get_str(nla_table[DEVLINK_ATTR_DPIPE_TABLE_NAME]);
-       size = mnl_attr_get_u32(nla_table[DEVLINK_ATTR_DPIPE_TABLE_SIZE]);
-       counters_enabled = !!mnl_attr_get_u8(nla_table[DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED]);
-
-       pr_out_str(ctx->dl, "name", name);
-       pr_out_uint(ctx->dl, "size", size);
-       pr_out_str(ctx->dl, "counters_enabled",
-                  counters_enabled ? "true" : "false");
+       list_for_each_entry(table, &ctx->tables->table_list, list)
+               if (table->resource_id == resource->id &&
+                   table->resource_valid)
+                       array = true;
 
-       pr_out_array_start(ctx->dl, "match");
-       if (dpipe_table_matches_show(ctx, nla_table[DEVLINK_ATTR_DPIPE_TABLE_MATCHES]))
-               goto err_matches_show;
-       pr_out_array_end(ctx->dl);
+       if (array)
+               pr_out_array_start(dl, "dpipe_tables");
+       else
+               pr_out_str(dl, "dpipe_tables", "none");
 
-       pr_out_array_start(ctx->dl, "action");
-       if (dpipe_table_actions_show(ctx, nla_table[DEVLINK_ATTR_DPIPE_TABLE_ACTIONS]))
-               goto err_actions_show;
-       pr_out_array_end(ctx->dl);
+       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);
 
-       return 0;
+       if (list_empty(&resource->resource_list))
+               return;
 
-err_actions_show:
-err_matches_show:
-       pr_out_array_end(ctx->dl);
-       return -EINVAL;
+       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 int dpipe_tables_show(struct dpipe_ctx *ctx, struct nlattr **tb)
+static void
+resources_show(struct resource_ctx *ctx, struct nlattr **tb)
 {
-       struct nlattr *nla_tables = tb[DEVLINK_ATTR_DPIPE_TABLES];
-       struct nlattr *nla_table;
+       struct resources *resources = ctx->resources;
+       struct resource *resource;
 
-       mnl_attr_for_each_nested(nla_table, nla_tables) {
+       list_for_each_entry(resource, &resources->resource_list, list) {
                pr_out_handle_start_arr(ctx->dl, tb);
-               if (dpipe_table_show(ctx, nla_table))
-                       goto err_table_show;
+               resource_show(resource, ctx);
                pr_out_handle_end(ctx->dl);
        }
-       return 0;
+}
 
-err_table_show:
-       pr_out_handle_end(ctx->dl);
-       return -EINVAL;
+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_dpipe_table_show_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_resource_dump_cb(const struct nlmsghdr *nlh, void *data)
 {
-       struct dpipe_ctx *ctx = 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_DPIPE_TABLES])
+           !tb[DEVLINK_ATTR_RESOURCE_LIST])
                return MNL_CB_ERROR;
 
-       if (dpipe_tables_show(ctx, tb))
+       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_dpipe_table_show(struct dl *dl)
+static int cmd_resource_show(struct dl *dl)
 {
        struct nlmsghdr *nlh;
-       struct dpipe_ctx *ctx;
-       uint16_t flags = NLM_F_REQUEST;
+       struct dpipe_ctx dpipe_ctx = {};
+       struct resource_ctx resource_ctx = {};
        int err;
 
-       ctx = dpipe_ctx_alloc(dl);
-       if (!ctx)
-               return -ENOMEM;
-
-       err = dl_argv_parse(dl, DL_OPT_HANDLE, DL_OPT_DPIPE_TABLE_NAME);
+       err = dl_argv_parse(dl, DL_OPT_HANDLE, 0);
        if (err)
-               goto out;
+               return err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_HEADERS_GET, flags);
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_TABLE_GET,
+                              NLM_F_REQUEST);
        dl_opts_put(nlh, dl);
-       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb, ctx);
+
+       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 headers %s\n", strerror(ctx->err));
+               pr_err("error get tables %s\n", strerror(dpipe_ctx.err));
                goto out;
        }
 
-       flags = NLM_F_REQUEST | NLM_F_ACK;
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_TABLE_GET, flags);
-       dl_opts_put(nlh, dl);
+       err = resource_ctx_init(&resource_ctx, dl);
+       if (err)
+               goto out;
 
-       pr_out_section_start(dl, "table");
-       _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_table_show_cb, ctx);
+       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_clear(ctx);
-       dpipe_ctx_free(ctx);
+       dpipe_ctx_fini(&dpipe_ctx);
        return err;
 }
 
-static int cmd_dpipe_table_set(struct dl *dl)
+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;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_TABLE_COUNTERS_SET,
-                              NLM_F_REQUEST | NLM_F_ACK);
-
-       err = dl_argv_parse_put(nlh, dl,
-                               DL_OPT_HANDLE | DL_OPT_DPIPE_TABLE_NAME |
-                               DL_OPT_DPIPE_TABLE_COUNTERS, 0);
+       err = resource_ctx_init(&ctx, dl);
        if (err)
                return err;
 
-       return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
-}
+       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;
 
-static int dpipe_entry_value_show(struct dpipe_ctx *ctx,
-                                 struct nlattr **nla_match_value)
-{
-       uint16_t value_len;
-       bool mask, mapping;
+       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;
+       }
 
-       mask = !!nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MASK];
-       mapping = !!nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MAPPING];
+       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;
+       }
 
-       value_len = mnl_attr_get_payload_len(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
-       if (value_len == sizeof(uint32_t)) {
-               uint32_t value, value_mask, value_mapping;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_RESOURCE_SET,
+                              NLM_F_REQUEST | NLM_F_ACK);
 
-               if (mapping) {
-                       value_mapping = mnl_attr_get_u32(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MAPPING]);
-                       pr_out_uint(ctx->dl, "mapping_value", value_mapping);
-               }
+       dl_opts_put(nlh, dl);
+       err = _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
+out:
+       resource_ctx_fini(&ctx);
+       return err;
+}
 
-               if (mask) {
-                       value_mask = mnl_attr_get_u32(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE_MASK]);
-                       pr_out_uint(ctx->dl, "mask_value", value_mask);
-               }
+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);
+       }
+}
 
-               value = mnl_attr_get_u32(nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]);
-               pr_out_uint(ctx->dl, "value", value);
+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 {
-               return -EINVAL;
+               if (g_indent_newline)
+                       pr_out("snapshot %s", array ? "[" : "");
+               else
+                       pr_out(" snapshot %s", array ? "[" : "");
        }
+}
 
-       return 0;
+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 int dpipe_entry_match_value_show(struct dpipe_ctx *ctx,
-                                       struct nlattr *nl)
+static void pr_out_region_snapshots_id(struct dl *dl, struct nlattr **tb, int index)
 {
-       struct nlattr *nla_match_value[DEVLINK_ATTR_MAX + 1] = {};
-       int err;
+       uint32_t snapshot_id;
 
-       err = mnl_attr_parse_nested(nl, attr_cb, nla_match_value);
-       if (err != MNL_CB_OK)
-               return -EINVAL;
+       if (!tb[DEVLINK_ATTR_REGION_SNAPSHOT_ID])
+               return;
 
-       if (!nla_match_value[DEVLINK_ATTR_DPIPE_MATCH] ||
-           !nla_match_value[DEVLINK_ATTR_DPIPE_VALUE]) {
-               return -EINVAL;
-       }
+       snapshot_id = mnl_attr_get_u32(tb[DEVLINK_ATTR_REGION_SNAPSHOT_ID]);
 
-       pr_out_entry_start(ctx->dl);
-       if (dpipe_match_show(ctx, nla_match_value[DEVLINK_ATTR_DPIPE_MATCH]))
-               goto err_match_show;
-       if (dpipe_entry_value_show(ctx, nla_match_value))
-               goto err_value_show;
-       pr_out_entry_end(ctx->dl);
+       if (dl->json_output)
+               jsonw_uint(dl->jw, snapshot_id);
+       else
+               pr_out("%s%u", index ? " " : "", snapshot_id);
+}
 
-       return 0;
+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;
 
-err_match_show:
-err_value_show:
-       pr_out_entry_end(ctx->dl);
-       return -EINVAL;
+       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 int dpipe_entry_action_value_show(struct dpipe_ctx *ctx,
-                                        struct nlattr *nl)
+static void pr_out_snapshot(struct dl *dl, struct nlattr **tb)
 {
-       struct nlattr *nla_action_value[DEVLINK_ATTR_MAX + 1] = {};
-       int err;
+       pr_out_region_snapshots_start(dl, false);
+       pr_out_region_snapshots_id(dl, tb, 0);
+       pr_out_region_snapshots_end(dl, false);
+}
 
-       err = mnl_attr_parse_nested(nl, attr_cb, nla_action_value);
-       if (err != MNL_CB_OK)
-               return -EINVAL;
+static void pr_out_region(struct dl *dl, struct nlattr **tb)
+{
+       pr_out_region_handle_start(dl, tb);
 
-       if (!nla_action_value[DEVLINK_ATTR_DPIPE_ACTION] ||
-           !nla_action_value[DEVLINK_ATTR_DPIPE_VALUE]) {
-               return -EINVAL;
-       }
+       if (tb[DEVLINK_ATTR_REGION_SIZE])
+               pr_out_u64(dl, "size",
+                          mnl_attr_get_u64(tb[DEVLINK_ATTR_REGION_SIZE]));
 
-       pr_out_entry_start(ctx->dl);
-       if (dpipe_action_show(ctx, nla_action_value[DEVLINK_ATTR_DPIPE_ACTION]))
-               goto err_action_show;
-       if (dpipe_entry_value_show(ctx, nla_action_value))
-               goto err_value_show;
-       pr_out_entry_end(ctx->dl);
+       if (tb[DEVLINK_ATTR_REGION_SNAPSHOTS])
+               pr_out_snapshots(dl, tb);
 
-       return 0;
+       if (tb[DEVLINK_ATTR_REGION_SNAPSHOT_ID])
+               pr_out_snapshot(dl, tb);
 
-err_action_show:
-err_value_show:
-       pr_out_entry_end(ctx->dl);
-       return -EINVAL;
+       pr_out_region_handle_end(dl);
 }
 
-static int
-dpipe_tables_action_values_show(struct dpipe_ctx *ctx,
-                               struct nlattr *nla_action_values)
+static int cmd_region_show_cb(const struct nlmsghdr *nlh, void *data)
 {
-       struct nlattr *nla_action_value;
+       struct genlmsghdr *genl = mnl_nlmsg_get_payload(nlh);
+       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       struct dl *dl = data;
 
-       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;
-}
+       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;
 
-static int
-dpipe_tables_match_values_show(struct dpipe_ctx *ctx,
-                              struct nlattr *nla_match_values)
-{
-       struct nlattr *nla_match_value;
+       pr_out_region(dl, tb);
 
-       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;
+       return MNL_CB_OK;
 }
 
-static int dpipe_entry_show(struct dpipe_ctx *ctx, struct nlattr *nl)
+static int cmd_region_show(struct dl *dl)
 {
-       struct nlattr *nla_entry[DEVLINK_ATTR_MAX + 1] = {};
-       uint32_t entry_index;
-       uint64_t counter;
+       struct nlmsghdr *nlh;
+       uint16_t flags = NLM_F_REQUEST | NLM_F_ACK;
        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;
-       }
+       if (dl_argc(dl) == 0)
+               flags |= NLM_F_DUMP;
 
-       entry_index = mnl_attr_get_u32(nla_entry[DEVLINK_ATTR_DPIPE_ENTRY_INDEX]);
-       pr_out_uint(ctx->dl, "index", entry_index);
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_REGION_GET, flags);
 
-       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);
+       if (dl_argc(dl) > 0) {
+               err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION, 0);
+               if (err)
+                       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);
-
-       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;
+       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 dpipe_table_entries_show(struct dpipe_ctx *ctx, struct nlattr **tb)
+static int cmd_region_snapshot_del(struct dl *dl)
 {
-       struct nlattr *nla_entries = tb[DEVLINK_ATTR_DPIPE_ENTRIES];
-       struct nlattr *nla_entry;
+       struct nlmsghdr *nlh;
+       int err;
 
-       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;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_REGION_DEL,
+                              NLM_F_REQUEST | NLM_F_ACK);
 
-err_entry_show:
-       pr_out_handle_end(ctx->dl);
-       return -EINVAL;
+       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_dpipe_table_entry_dump_cb(const struct nlmsghdr *nlh, void *data)
+static int cmd_region_read_cb(const struct nlmsghdr *nlh, void *data)
 {
-       struct dpipe_ctx *ctx = data;
-       struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {};
+       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_DPIPE_ENTRIES])
+           !tb[DEVLINK_ATTR_REGION_CHUNKS])
                return MNL_CB_ERROR;
 
-       if (dpipe_table_entries_show(ctx, tb))
-               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_dpipe_table_dump(struct dl *dl)
+static int cmd_region_dump(struct dl *dl)
 {
        struct nlmsghdr *nlh;
-       struct dpipe_ctx *ctx;
-       uint16_t flags = NLM_F_REQUEST;
        int err;
 
-       ctx = dpipe_ctx_alloc(dl);
-       if (!ctx)
-               return -ENOMEM;
+       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_REGION_READ,
+                              NLM_F_REQUEST | NLM_F_ACK | NLM_F_DUMP);
 
-       err = dl_argv_parse(dl, DL_OPT_HANDLE | DL_OPT_DPIPE_TABLE_NAME, 0);
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE_REGION |
+                               DL_OPT_REGION_SNAPSHOT_ID, 0);
        if (err)
-               goto out;
+               return err;
 
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_HEADERS_GET, flags);
-       dl_opts_put(nlh, dl);
-       err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_header_cb, ctx);
-       if (err) {
-               pr_err("error get headers %s\n", strerror(ctx->err));
-               goto out;
-       }
+       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;
+}
 
-       flags = NLM_F_REQUEST | NLM_F_ACK;
-       nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_DPIPE_ENTRIES_GET, flags);
-       dl_opts_put(nlh, dl);
+static int cmd_region_read(struct dl *dl)
+{
+       struct nlmsghdr *nlh;
+       int err;
 
-       pr_out_section_start(dl, "table_entry");
-       _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_dpipe_table_entry_dump_cb, ctx);
+       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);
-out:
-       dpipe_ctx_clear(ctx);
-       dpipe_ctx_free(ctx);
+       if (!dl->json_output)
+               pr_out("\n");
        return err;
 }
 
-static void cmd_dpipe_table_help(void)
+static void cmd_region_help(void)
 {
-       pr_err("Usage: devlink dpipe table [ OBJECT-LIST ]\n"
-              "where  OBJECT-LIST := { show | set | dump }\n");
+       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_dpipe_table(struct dl *dl)
+static int cmd_region(struct dl *dl)
 {
-       if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
-               cmd_dpipe_table_help();
+       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_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")) {
+               return cmd_region_show(dl);
+       } else if (dl_argv_match(dl, "del")) {
                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")) {
+               return cmd_region_snapshot_del(dl);
+       } else if (dl_argv_match(dl, "dump")) {
                dl_arg_inc(dl);
-               return cmd_dpipe_header(dl);
-       } else if (dl_argv_match(dl, "table")) {
+               return cmd_region_dump(dl);
+       } else if (dl_argv_match(dl, "read")) {
                dl_arg_inc(dl);
-               return cmd_dpipe_table(dl);
+               return cmd_region_read(dl);
        }
        pr_err("Command \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
@@ -3620,12 +5721,16 @@ static int cmd_dpipe(struct dl *dl)
 static void help(void)
 {
        pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
-              "where  OBJECT := { dev | port | sb | monitor | dpipe }\n"
-              "       OPTIONS := { -V[ersion] | -n[no-nice-names] | -j[json] | -p[pretty] | -v[verbose] }\n");
+              "       devlink [ -f[orce] ] -b[atch] filename\n"
+              "where  OBJECT := { dev | port | sb | monitor | dpipe | resource | region }\n"
+              "       OPTIONS := { -V[ersion] | -n[o-nice-names] | -j[son] | -p[retty] | -v[erbose] }\n");
 }
 
-static int dl_cmd(struct dl *dl)
+static int dl_cmd(struct dl *dl, int argc, char **argv)
 {
+       dl->argc = argc;
+       dl->argv = argv;
+
        if (dl_argv_match(dl, "help") || dl_no_arg(dl)) {
                help();
                return 0;
@@ -3644,18 +5749,21 @@ static int dl_cmd(struct dl *dl)
        } 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);
        }
        pr_err("Object \"%s\" not found\n", dl_argv(dl));
        return -ENOENT;
 }
 
-static int dl_init(struct dl *dl, int argc, char **argv)
+static int dl_init(struct dl *dl)
 {
        int err;
 
-       dl->argc = argc;
-       dl->argv = argv;
-
        dl->nlg = mnlg_socket_open(DEVLINK_GENL_NAME, DEVLINK_GENL_VERSION);
        if (!dl->nlg) {
                pr_err("Failed to connect to devlink Netlink\n");
@@ -3707,16 +5815,59 @@ static void dl_free(struct dl *dl)
        free(dl);
 }
 
+static int dl_batch(struct dl *dl, const char *name, bool force)
+{
+       char *line = NULL;
+       size_t len = 0;
+       int ret = EXIT_SUCCESS;
+
+       if (name && strcmp(name, "-") != 0) {
+               if (freopen(name, "r", stdin) == NULL) {
+                       fprintf(stderr,
+                               "Cannot open file \"%s\" for reading: %s\n",
+                               name, strerror(errno));
+                       return EXIT_FAILURE;
+               }
+       }
+
+       cmdlineno = 0;
+       while (getcmdline(&line, &len, stdin) != -1) {
+               char *largv[100];
+               int largc;
+
+               largc = makeargs(line, largv, 100);
+               if (!largc)
+                       continue;       /* blank line */
+
+               if (dl_cmd(dl, largc, largv)) {
+                       fprintf(stderr, "Command failed %s:%d\n",
+                               name, cmdlineno);
+                       ret = EXIT_FAILURE;
+                       if (!force)
+                               break;
+               }
+       }
+
+       if (line)
+               free(line);
+
+       return ret;
+}
+
 int main(int argc, char **argv)
 {
        static const struct option long_options[] = {
                { "Version",            no_argument,            NULL, 'V' },
+               { "force",              no_argument,            NULL, 'f' },
+               { "batch",              required_argument,      NULL, 'b' },
                { "no-nice-names",      no_argument,            NULL, 'n' },
                { "json",               no_argument,            NULL, 'j' },
                { "pretty",             no_argument,            NULL, 'p' },
                { "verbose",            no_argument,            NULL, 'v' },
                { NULL, 0, NULL, 0 }
        };
+       const char *batch_file = NULL;
+       bool force = false;
        struct dl *dl;
        int opt;
        int err;
@@ -3728,7 +5879,7 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       while ((opt = getopt_long(argc, argv, "Vnjpv",
+       while ((opt = getopt_long(argc, argv, "Vfb:njpv",
                                  long_options, NULL)) >= 0) {
 
                switch (opt) {
@@ -3736,6 +5887,12 @@ int main(int argc, char **argv)
                        printf("devlink utility, iproute2-ss%s\n", SNAPSHOT);
                        ret = EXIT_SUCCESS;
                        goto dl_free;
+               case 'f':
+                       force = true;
+                       break;
+               case 'b':
+                       batch_file = optarg;
+                       break;
                case 'n':
                        dl->no_nice_names = true;
                        break;
@@ -3759,13 +5916,17 @@ int main(int argc, char **argv)
        argc -= optind;
        argv += optind;
 
-       err = dl_init(dl, argc, argv);
+       err = dl_init(dl);
        if (err) {
                ret = EXIT_FAILURE;
                goto dl_free;
        }
 
-       err = dl_cmd(dl);
+       if (batch_file)
+               err = dl_batch(dl, batch_file, force);
+       else
+               err = dl_cmd(dl, argc, argv);
+
        if (err) {
                ret = EXIT_FAILURE;
                goto dl_fini;