[iproute2-next v3 2/2] devlink: support setting the overwrite mask

[Jacob Keller]

Add support for specifying the overwrite sections to allow in the flash
update command. This is done by adding a new "overwrite" option which
can take either "settings" or "identifiers" passing the overwrite mode
multiple times will combine the fields using bitwise-OR.

Signed-off-by: Jacob Keller <jacob.e.kel...@intel.com>
---
 devlink/devlink.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/devlink/devlink.c b/devlink/devlink.c
index 8ec96c01fbcf..1dc9096781f7 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -302,6 +302,7 @@ static void ifname_map_free(struct ifname_map *ifname_map)
 #define DL_OPT_TRAP_POLICER_BURST      BIT(36)
 #define DL_OPT_HEALTH_REPORTER_AUTO_DUMP     BIT(37)
 #define DL_OPT_PORT_FUNCTION_HW_ADDR BIT(38)
+#define DL_OPT_FLASH_OVERWRITE         BIT(39)
 
 struct dl_opts {
        uint64_t present; /* flags of present items */
@@ -349,6 +350,7 @@ struct dl_opts {
        uint64_t trap_policer_burst;
        char port_function_hw_addr[MAX_ADDR_LEN];
        uint32_t port_function_hw_addr_len;
+       uint32_t overwrite_mask;
 };
 
 struct dl {
@@ -1285,6 +1287,19 @@ eswitch_encap_mode_get(const char *typestr,
        return 0;
 }
 
+static int flash_overwrite_section_get(const char *sectionstr, uint32_t *mask)
+{
+       if (strcmp(sectionstr, "settings") == 0) {
+               *mask |= DEVLINK_FLASH_OVERWRITE_SETTINGS;
+       } else if (strcmp(sectionstr, "identifiers") == 0) {
+               *mask |= DEVLINK_FLASH_OVERWRITE_IDENTIFIERS;
+       } else {
+               pr_err("Unknown overwrite section \"%s\"\n", sectionstr);
+               return -EINVAL;
+       }
+       return 0;
+}
+
 static int param_cmode_get(const char *cmodestr,
                           enum devlink_param_cmode *cmode)
 {
@@ -1627,6 +1642,21 @@ static int dl_argv_parse(struct dl *dl, uint64_t 
o_required,
                        if (err)
                                return err;
                        o_found |= DL_OPT_FLASH_COMPONENT;
+
+               } else if (dl_argv_match(dl, "overwrite") &&
+                               (o_all & DL_OPT_FLASH_OVERWRITE)) {
+                       const char *sectionstr;
+
+                       dl_arg_inc(dl);
+                       err = dl_argv_str(dl, &sectionstr);
+                       if(err)
+                               return err;
+                       err = flash_overwrite_section_get(sectionstr,
+                                                         
&opts->overwrite_mask);
+                       if (err)
+                               return err;
+                       o_found |= DL_OPT_FLASH_OVERWRITE;
+
                } else if (dl_argv_match(dl, "reporter") &&
                           (o_all & DL_OPT_HEALTH_REPORTER_NAME)) {
                        dl_arg_inc(dl);
@@ -1767,6 +1797,18 @@ dl_function_attr_put(struct nlmsghdr *nlh, const struct 
dl_opts *opts)
        mnl_attr_nest_end(nlh, nest);
 }
 
+static void
+dl_flash_update_overwrite_put(struct nlmsghdr *nlh, const struct dl_opts *opts)
+{
+       struct nla_bitfield32 overwrite_mask;
+
+       overwrite_mask.selector = DEVLINK_SUPPORTED_FLASH_OVERWRITE_SECTIONS;
+       overwrite_mask.value = opts->overwrite_mask;
+
+       mnl_attr_put(nlh, DEVLINK_ATTR_FLASH_UPDATE_OVERWRITE_MASK,
+                    sizeof(overwrite_mask), &overwrite_mask);
+}
+
 static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
 {
        struct dl_opts *opts = &dl->opts;
@@ -1854,6 +1896,8 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl 
*dl)
        if (opts->present & DL_OPT_FLASH_COMPONENT)
                mnl_attr_put_strz(nlh, DEVLINK_ATTR_FLASH_UPDATE_COMPONENT,
                                  opts->flash_component);
+       if (opts->present & DL_OPT_FLASH_OVERWRITE)
+               dl_flash_update_overwrite_put(nlh, opts);
        if (opts->present & DL_OPT_HEALTH_REPORTER_NAME)
                mnl_attr_put_strz(nlh, DEVLINK_ATTR_HEALTH_REPORTER_NAME,
                                  opts->reporter_name);
@@ -1954,7 +1998,7 @@ static void cmd_dev_help(void)
        pr_err("       devlink dev param show [DEV name PARAMETER]\n");
        pr_err("       devlink dev reload DEV [ netns { PID | NAME | ID } ]\n");
        pr_err("       devlink dev info [ DEV ]\n");
-       pr_err("       devlink dev flash DEV file PATH [ component NAME ]\n");
+       pr_err("       devlink dev flash DEV file PATH [ component NAME ] [ 
overwrite SECTION ]\n");
 }
 
 static bool cmp_arr_last_handle(struct dl *dl, const char *bus_name,
@@ -3219,7 +3263,7 @@ static int cmd_dev_flash(struct dl *dl)
                               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);
+                               DL_OPT_FLASH_COMPONENT | 
DL_OPT_FLASH_OVERWRITE);
        if (err)
                return err;
 
-- 
2.28.0.218.ge27853923b9d.dirty