releases/6.7.11/devlink-fix-length-of-eswitch-inline-mode.patch

   1 From 63987aacdebf7e773f956f7a09df0b0073ab3572 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Sun, 10 Mar 2024 18:45:47 +0200
   4 Subject: devlink: Fix length of eswitch inline-mode
   5
   6 From: William Tu <witu@nvidia.com>
   7
   8 [ Upstream commit 8f4cd89bf10607de08231d6d91a73dd63336808e ]
   9
  10 Set eswitch inline-mode to be u8, not u16. Otherwise, errors below
  11
  12 $ devlink dev eswitch set pci/0000:08:00.0 mode switchdev \
  13   inline-mode network
  14     Error: Attribute failed policy validation.
  15     kernel answers: Numerical result out of rang
  16     netlink: 'devlink': attribute type 26 has an invalid length.
  17
  18 Fixes: f2f9dd164db0 ("netlink: specs: devlink: add the remaining command to generate complete split_ops")
  19 Signed-off-by: William Tu <witu@nvidia.com>
  20 Reviewed-by: Jiri Pirko <jiri@nvidia.com>
  21 Reviewed-by: Simon Horman <horms@kernel.org>
  22 Link: https://lore.kernel.org/r/20240310164547.35219-1-witu@nvidia.com
  23 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  24 Signed-off-by: Sasha Levin <sashal@kernel.org>
  25 ---
  26  Documentation/netlink/specs/devlink.yaml | 2 +-
  27  net/devlink/netlink_gen.c                | 2 +-
  28  2 files changed, 2 insertions(+), 2 deletions(-)
  29
  30 diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netlink/specs/devlink.yaml
  31 index 572d83a414d0d..42a9d77803b2b 100644
  32 --- a/Documentation/netlink/specs/devlink.yaml
  33 +++ b/Documentation/netlink/specs/devlink.yaml
  34 @@ -244,7 +244,7 @@ attribute-sets:
  35
  36        -
  37          name: eswitch-inline-mode
  38 -        type: u16
  39 +        type: u8
  40          enum: eswitch-inline-mode
  41        -
  42          name: dpipe-tables
  43 diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c
  44 index 788dfdc498a95..371f27f653317 100644
  45 --- a/net/devlink/netlink_gen.c
  46 +++ b/net/devlink/netlink_gen.c
  47 @@ -198,7 +198,7 @@ static const struct nla_policy devlink_eswitch_set_nl_policy[DEVLINK_ATTR_ESWITC
  48         [DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },
  49         [DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },
  50         [DEVLINK_ATTR_ESWITCH_MODE] = NLA_POLICY_MAX(NLA_U16, 1),
  51 -       [DEVLINK_ATTR_ESWITCH_INLINE_MODE] = NLA_POLICY_MAX(NLA_U16, 3),
  52 +       [DEVLINK_ATTR_ESWITCH_INLINE_MODE] = NLA_POLICY_MAX(NLA_U8, 3),
  53         [DEVLINK_ATTR_ESWITCH_ENCAP_MODE] = NLA_POLICY_MAX(NLA_U8, 1),
  54  };
  55
  56 --
  57 2.43.0
  58