Revert "devlink: Add option to set and show eswitch inline mode"

This reverts commit b9dcf9c2826cc193937e5c337dee96a4c111e56a.

Intended for net-next

diff --git a/devlink/devlink.c b/devlink/devlink.c
index 23db9e7cd24fbc588e38258e6c138217126e47e3..673234fa7b17559268588fca0033acd85b0c705c 100644 (file)
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -28,10 +28,6 @@
 
 #define ESWITCH_MODE_LEGACY "legacy"
 #define ESWITCH_MODE_SWITCHDEV "switchdev"
-#define ESWITCH_INLINE_MODE_NONE "none"
-#define ESWITCH_INLINE_MODE_LINK "link"
-#define ESWITCH_INLINE_MODE_NETWORK "network"
-#define ESWITCH_INLINE_MODE_TRANSPORT "transport"
 
 #define pr_err(args...) fprintf(stderr, ##args)
 #define pr_out(args...) fprintf(stdout, ##args)
@@ -136,7 +132,6 @@ static void ifname_map_free(struct ifname_map *ifname_map)
 #define DL_OPT_SB_TH           BIT(9)
 #define DL_OPT_SB_TC           BIT(10)
 #define DL_OPT_ESWITCH_MODE    BIT(11)
-#define DL_OPT_ESWITCH_INLINE_MODE     BIT(12)
 
 struct dl_opts {
        uint32_t present; /* flags of present items */
@@ -153,7 +148,6 @@ struct dl_opts {
        uint32_t sb_threshold;
        uint16_t sb_tc_index;
        enum devlink_eswitch_mode eswitch_mode;
-       enum devlink_eswitch_inline_mode eswitch_inline_mode;
 };
 
 struct dl {
@@ -311,9 +305,6 @@ static int attr_cb(const struct nlattr *attr, void *data)
        if (type == DEVLINK_ATTR_ESWITCH_MODE &&
            mnl_attr_validate(attr, MNL_TYPE_U16) < 0)
                return MNL_CB_ERROR;
-       if (type == DEVLINK_ATTR_ESWITCH_INLINE_MODE &&
-           mnl_attr_validate(attr, MNL_TYPE_U8) < 0)
-               return MNL_CB_ERROR;
        tb[type] = attr;
        return MNL_CB_OK;
 }
@@ -691,24 +682,6 @@ static int eswitch_mode_get(const char *typestr,
        return 0;
 }
 
-static int eswitch_inline_mode_get(const char *typestr,
-                                  enum devlink_eswitch_inline_mode *p_mode)
-{
-       if (strcmp(typestr, ESWITCH_INLINE_MODE_NONE) == 0) {
-               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_NONE;
-       } else if (strcmp(typestr, ESWITCH_INLINE_MODE_LINK) == 0) {
-               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_LINK;
-       } else if (strcmp(typestr, ESWITCH_INLINE_MODE_NETWORK) == 0) {
-               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_NETWORK;
-       } else if (strcmp(typestr, ESWITCH_INLINE_MODE_TRANSPORT) == 0) {
-               *p_mode = DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT;
-       } else {
-               pr_err("Unknown eswitch inline mode \"%s\"\n", typestr);
-               return -EINVAL;
-       }
-       return 0;
-}
-
 static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                         uint32_t o_optional)
 {
@@ -830,19 +803,6 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                        if (err)
                                return err;
                        o_found |= DL_OPT_ESWITCH_MODE;
-               } else if (dl_argv_match(dl, "inline-mode") &&
-                          (o_all & DL_OPT_ESWITCH_INLINE_MODE)) {
-                       const char *typestr;
-
-                       dl_arg_inc(dl);
-                       err = dl_argv_str(dl, &typestr);
-                       if (err)
-                               return err;
-                       err = eswitch_inline_mode_get(
-                               typestr, &opts->eswitch_inline_mode);
-                       if (err)
-                               return err;
-                       o_found |= DL_OPT_ESWITCH_INLINE_MODE;
                } else {
                        pr_err("Unknown option \"%s\"\n", dl_argv(dl));
                        return -EINVAL;
@@ -903,12 +863,6 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
                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;
-       }
-
        return 0;
 }
 
@@ -955,9 +909,6 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl)
        if (opts->present & DL_OPT_ESWITCH_MODE)
                mnl_attr_put_u16(nlh, DEVLINK_ATTR_ESWITCH_MODE,
                                 opts->eswitch_mode);
-       if (opts->present & DL_OPT_ESWITCH_INLINE_MODE)
-               mnl_attr_put_u8(nlh, DEVLINK_ATTR_ESWITCH_INLINE_MODE,
-                               opts->eswitch_inline_mode);
 }
 
 static int dl_argv_parse_put(struct nlmsghdr *nlh, struct dl *dl,
@@ -1013,7 +964,6 @@ static void cmd_dev_help(void)
 {
        pr_err("Usage: devlink dev show [ DEV ]\n");
        pr_err("       devlink dev eswitch set DEV [ mode { legacy | switchdev } ]\n");
-       pr_err("                               [ inline-mode { none | link | network | transport } ]\n");
        pr_err("       devlink dev eswitch show DEV\n");
 }
 
@@ -1253,22 +1203,6 @@ static const char *eswitch_mode_name(uint32_t mode)
        }
 }
 
-static const char *eswitch_inline_mode_name(uint32_t mode)
-{
-       switch (mode) {
-       case DEVLINK_ESWITCH_INLINE_MODE_NONE:
-               return ESWITCH_INLINE_MODE_NONE;
-       case DEVLINK_ESWITCH_INLINE_MODE_LINK:
-               return ESWITCH_INLINE_MODE_LINK;
-       case DEVLINK_ESWITCH_INLINE_MODE_NETWORK:
-               return ESWITCH_INLINE_MODE_NETWORK;
-       case DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT:
-               return ESWITCH_INLINE_MODE_TRANSPORT;
-       default:
-               return "<unknown mode>";
-       }
-}
-
 static void pr_out_eswitch(struct dl *dl, struct nlattr **tb)
 {
        __pr_out_handle_start(dl, tb, true, false);
@@ -1276,12 +1210,6 @@ static void pr_out_eswitch(struct dl *dl, struct nlattr **tb)
        if (tb[DEVLINK_ATTR_ESWITCH_MODE])
                pr_out_str(dl, "mode",
                           eswitch_mode_name(mnl_attr_get_u16(tb[DEVLINK_ATTR_ESWITCH_MODE])));
-
-       if (tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE])
-               pr_out_str(dl, "inline-mode",
-                          eswitch_inline_mode_name(mnl_attr_get_u8(
-                                  tb[DEVLINK_ATTR_ESWITCH_INLINE_MODE])));
-
        pr_out_handle_end(dl);
 }
 
@@ -1324,18 +1252,10 @@ static int cmd_dev_eswitch_set(struct dl *dl)
        nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_ESWITCH_MODE_SET,
                               NLM_F_REQUEST | NLM_F_ACK);
 
-       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE,
-                               DL_OPT_ESWITCH_MODE |
-                               DL_OPT_ESWITCH_INLINE_MODE);
-
+       err = dl_argv_parse_put(nlh, dl, DL_OPT_HANDLE | DL_OPT_ESWITCH_MODE, 0);
        if (err)
                return err;
 
-       if (dl->opts.present == 1) {
-               pr_err("Need to set at least one option\n");
-               return -ENOENT;
-       }
-
        return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL);
 }
 

diff --git a/include/linux/devlink.h b/include/linux/devlink.h
index 7c14d77313f254aba6a497a3750fd10fb48e6e03..b7c1a06974600899eac3c7b9ea2c3bdd15a2882c 100644 (file)
--- a/include/linux/devlink.h
+++ b/include/linux/devlink.h
@@ -102,13 +102,6 @@ enum devlink_eswitch_mode {
        DEVLINK_ESWITCH_MODE_SWITCHDEV,
 };
 
-enum devlink_eswitch_inline_mode {
-       DEVLINK_ESWITCH_INLINE_MODE_NONE,
-       DEVLINK_ESWITCH_INLINE_MODE_LINK,
-       DEVLINK_ESWITCH_INLINE_MODE_NETWORK,
-       DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT,
-};
-
 enum devlink_attr {
        /* don't change the order or add anything between, this is ABI! */
        DEVLINK_ATTR_UNSPEC,
@@ -140,7 +133,6 @@ enum devlink_attr {
        DEVLINK_ATTR_SB_OCC_CUR,                /* u32 */
        DEVLINK_ATTR_SB_OCC_MAX,                /* u32 */
        DEVLINK_ATTR_ESWITCH_MODE,              /* u16 */
-       DEVLINK_ATTR_ESWITCH_INLINE_MODE,       /* u8 */
 
        /* add new attributes above here, update the policy in devlink.c */
 

diff --git a/man/man8/devlink-dev.8 b/man/man8/devlink-dev.8
index 6bfe66f87955aacce5cceb8b7bffc0328ab4c1cc..931e334da3c3cb61fe21088aa7f9f7feb3db9f11 100644 (file)
--- a/man/man8/devlink-dev.8
+++ b/man/man8/devlink-dev.8
@@ -31,9 +31,6 @@ devlink-dev \- devlink device configuration
 .RI "[ "
 .BR mode " { " legacy " | " switchdev " } "
 .RI "]"
-.RI "[ "
-.BR inline-mode " { " none " | " link " | " network " | " transport " } "
-.RI "]"
 
 .ti -8
 .BR "devlink dev eswitch show"
@@ -65,22 +62,6 @@ Set eswitch mode
 .I switchdev
 - SRIOV switchdev offloads
 
-.TP
-.BR inline-mode " { " none " | " link " | " network " | " transport " } "
-Some HWs need the VF driver to put part of the packet headers on the TX descriptor so the e-switch can do proper matching and steering.
-
-.I none
-- None
-
-.I link
-- L2 mode
-
-.I network
-- L3 mode
-
-.I transport
-- L4 mode
-
 .SH "EXAMPLES"
 .PP
 devlink dev show