OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 29 Jan 2021 01:09:31 +0000 (17:09 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 29 Jan 2021 01:09:31 +0000 (17:09 -0800)
drivers/net/can/dev.c
  b552766c872f ("can: dev: prevent potential information leak in can_fill_info()")
  3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir")
  0a042c6ec991 ("can: dev: move netlink related code into seperate file")

  Code move.

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
  57ac4a31c483 ("net/mlx5e: Correctly handle changing the number of queues when the interface is down")
  214baf22870c ("net/mlx5e: Support HTB offload")

  Adjacent code changes

net/switchdev/switchdev.c
  20776b465c0c ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP")
  ffb68fc58e96 ("net: switchdev: remove the transaction structure from port object notifiers")
  bae33f2b5afe ("net: switchdev: remove the transaction structure from port attributes")

  Transaction parameter gets dropped otherwise keep the fix.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
28 files changed:
1  2 
Documentation/networking/ip-sysctl.rst
MAINTAINERS
Makefile
drivers/net/can/dev/netlink.c
drivers/net/dsa/bcm_sf2.c
drivers/net/dsa/microchip/ksz8795.c
drivers/net/dsa/microchip/ksz_common.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ice/ice_txrx.c
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
drivers/net/usb/qmi_wwan.c
drivers/net/wireless/intel/iwlwifi/mvm/d3.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
include/linux/mlx5/driver.h
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/mac80211/ieee80211_i.h
net/mac80211/iface.c
net/nfc/netlink.c
net/switchdev/switchdev.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
index 3ae884c,0000000..867f6be
mode 100644,000000..100644
--- /dev/null
@@@ -1,379 -1,0 +1,379 @@@
-       struct can_berr_counter bec;
 +// SPDX-License-Identifier: GPL-2.0-only
 +/* Copyright (C) 2005 Marc Kleine-Budde, Pengutronix
 + * Copyright (C) 2006 Andrey Volkov, Varma Electronics
 + * Copyright (C) 2008-2009 Wolfgang Grandegger <wg@grandegger.com>
 + */
 +
 +#include <linux/can/dev.h>
 +#include <net/rtnetlink.h>
 +
 +static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = {
 +      [IFLA_CAN_STATE]        = { .type = NLA_U32 },
 +      [IFLA_CAN_CTRLMODE]     = { .len = sizeof(struct can_ctrlmode) },
 +      [IFLA_CAN_RESTART_MS]   = { .type = NLA_U32 },
 +      [IFLA_CAN_RESTART]      = { .type = NLA_U32 },
 +      [IFLA_CAN_BITTIMING]    = { .len = sizeof(struct can_bittiming) },
 +      [IFLA_CAN_BITTIMING_CONST]
 +                              = { .len = sizeof(struct can_bittiming_const) },
 +      [IFLA_CAN_CLOCK]        = { .len = sizeof(struct can_clock) },
 +      [IFLA_CAN_BERR_COUNTER] = { .len = sizeof(struct can_berr_counter) },
 +      [IFLA_CAN_DATA_BITTIMING]
 +                              = { .len = sizeof(struct can_bittiming) },
 +      [IFLA_CAN_DATA_BITTIMING_CONST]
 +                              = { .len = sizeof(struct can_bittiming_const) },
 +      [IFLA_CAN_TERMINATION]  = { .type = NLA_U16 },
 +};
 +
 +static int can_validate(struct nlattr *tb[], struct nlattr *data[],
 +                      struct netlink_ext_ack *extack)
 +{
 +      bool is_can_fd = false;
 +
 +      /* Make sure that valid CAN FD configurations always consist of
 +       * - nominal/arbitration bittiming
 +       * - data bittiming
 +       * - control mode with CAN_CTRLMODE_FD set
 +       */
 +
 +      if (!data)
 +              return 0;
 +
 +      if (data[IFLA_CAN_CTRLMODE]) {
 +              struct can_ctrlmode *cm = nla_data(data[IFLA_CAN_CTRLMODE]);
 +
 +              is_can_fd = cm->flags & cm->mask & CAN_CTRLMODE_FD;
 +      }
 +
 +      if (is_can_fd) {
 +              if (!data[IFLA_CAN_BITTIMING] || !data[IFLA_CAN_DATA_BITTIMING])
 +                      return -EOPNOTSUPP;
 +      }
 +
 +      if (data[IFLA_CAN_DATA_BITTIMING]) {
 +              if (!is_can_fd || !data[IFLA_CAN_BITTIMING])
 +                      return -EOPNOTSUPP;
 +      }
 +
 +      return 0;
 +}
 +
 +static int can_changelink(struct net_device *dev, struct nlattr *tb[],
 +                        struct nlattr *data[],
 +                        struct netlink_ext_ack *extack)
 +{
 +      struct can_priv *priv = netdev_priv(dev);
 +      int err;
 +
 +      /* We need synchronization with dev->stop() */
 +      ASSERT_RTNL();
 +
 +      if (data[IFLA_CAN_BITTIMING]) {
 +              struct can_bittiming bt;
 +
 +              /* Do not allow changing bittiming while running */
 +              if (dev->flags & IFF_UP)
 +                      return -EBUSY;
 +
 +              /* Calculate bittiming parameters based on
 +               * bittiming_const if set, otherwise pass bitrate
 +               * directly via do_set_bitrate(). Bail out if neither
 +               * is given.
 +               */
 +              if (!priv->bittiming_const && !priv->do_set_bittiming)
 +                      return -EOPNOTSUPP;
 +
 +              memcpy(&bt, nla_data(data[IFLA_CAN_BITTIMING]), sizeof(bt));
 +              err = can_get_bittiming(dev, &bt,
 +                                      priv->bittiming_const,
 +                                      priv->bitrate_const,
 +                                      priv->bitrate_const_cnt);
 +              if (err)
 +                      return err;
 +
 +              if (priv->bitrate_max && bt.bitrate > priv->bitrate_max) {
 +                      netdev_err(dev, "arbitration bitrate surpasses transceiver capabilities of %d bps\n",
 +                                 priv->bitrate_max);
 +                      return -EINVAL;
 +              }
 +
 +              memcpy(&priv->bittiming, &bt, sizeof(bt));
 +
 +              if (priv->do_set_bittiming) {
 +                      /* Finally, set the bit-timing registers */
 +                      err = priv->do_set_bittiming(dev);
 +                      if (err)
 +                              return err;
 +              }
 +      }
 +
 +      if (data[IFLA_CAN_CTRLMODE]) {
 +              struct can_ctrlmode *cm;
 +              u32 ctrlstatic;
 +              u32 maskedflags;
 +
 +              /* Do not allow changing controller mode while running */
 +              if (dev->flags & IFF_UP)
 +                      return -EBUSY;
 +              cm = nla_data(data[IFLA_CAN_CTRLMODE]);
 +              ctrlstatic = priv->ctrlmode_static;
 +              maskedflags = cm->flags & cm->mask;
 +
 +              /* check whether provided bits are allowed to be passed */
 +              if (cm->mask & ~(priv->ctrlmode_supported | ctrlstatic))
 +                      return -EOPNOTSUPP;
 +
 +              /* do not check for static fd-non-iso if 'fd' is disabled */
 +              if (!(maskedflags & CAN_CTRLMODE_FD))
 +                      ctrlstatic &= ~CAN_CTRLMODE_FD_NON_ISO;
 +
 +              /* make sure static options are provided by configuration */
 +              if ((maskedflags & ctrlstatic) != ctrlstatic)
 +                      return -EOPNOTSUPP;
 +
 +              /* clear bits to be modified and copy the flag values */
 +              priv->ctrlmode &= ~cm->mask;
 +              priv->ctrlmode |= maskedflags;
 +
 +              /* CAN_CTRLMODE_FD can only be set when driver supports FD */
 +              if (priv->ctrlmode & CAN_CTRLMODE_FD)
 +                      dev->mtu = CANFD_MTU;
 +              else
 +                      dev->mtu = CAN_MTU;
 +      }
 +
 +      if (data[IFLA_CAN_RESTART_MS]) {
 +              /* Do not allow changing restart delay while running */
 +              if (dev->flags & IFF_UP)
 +                      return -EBUSY;
 +              priv->restart_ms = nla_get_u32(data[IFLA_CAN_RESTART_MS]);
 +      }
 +
 +      if (data[IFLA_CAN_RESTART]) {
 +              /* Do not allow a restart while not running */
 +              if (!(dev->flags & IFF_UP))
 +                      return -EINVAL;
 +              err = can_restart_now(dev);
 +              if (err)
 +                      return err;
 +      }
 +
 +      if (data[IFLA_CAN_DATA_BITTIMING]) {
 +              struct can_bittiming dbt;
 +
 +              /* Do not allow changing bittiming while running */
 +              if (dev->flags & IFF_UP)
 +                      return -EBUSY;
 +
 +              /* Calculate bittiming parameters based on
 +               * data_bittiming_const if set, otherwise pass bitrate
 +               * directly via do_set_bitrate(). Bail out if neither
 +               * is given.
 +               */
 +              if (!priv->data_bittiming_const && !priv->do_set_data_bittiming)
 +                      return -EOPNOTSUPP;
 +
 +              memcpy(&dbt, nla_data(data[IFLA_CAN_DATA_BITTIMING]),
 +                     sizeof(dbt));
 +              err = can_get_bittiming(dev, &dbt,
 +                                      priv->data_bittiming_const,
 +                                      priv->data_bitrate_const,
 +                                      priv->data_bitrate_const_cnt);
 +              if (err)
 +                      return err;
 +
 +              if (priv->bitrate_max && dbt.bitrate > priv->bitrate_max) {
 +                      netdev_err(dev, "canfd data bitrate surpasses transceiver capabilities of %d bps\n",
 +                                 priv->bitrate_max);
 +                      return -EINVAL;
 +              }
 +
 +              memcpy(&priv->data_bittiming, &dbt, sizeof(dbt));
 +
 +              if (priv->do_set_data_bittiming) {
 +                      /* Finally, set the bit-timing registers */
 +                      err = priv->do_set_data_bittiming(dev);
 +                      if (err)
 +                              return err;
 +              }
 +      }
 +
 +      if (data[IFLA_CAN_TERMINATION]) {
 +              const u16 termval = nla_get_u16(data[IFLA_CAN_TERMINATION]);
 +              const unsigned int num_term = priv->termination_const_cnt;
 +              unsigned int i;
 +
 +              if (!priv->do_set_termination)
 +                      return -EOPNOTSUPP;
 +
 +              /* check whether given value is supported by the interface */
 +              for (i = 0; i < num_term; i++) {
 +                      if (termval == priv->termination_const[i])
 +                              break;
 +              }
 +              if (i >= num_term)
 +                      return -EINVAL;
 +
 +              /* Finally, set the termination value */
 +              err = priv->do_set_termination(dev, termval);
 +              if (err)
 +                      return err;
 +
 +              priv->termination = termval;
 +      }
 +
 +      return 0;
 +}
 +
 +static size_t can_get_size(const struct net_device *dev)
 +{
 +      struct can_priv *priv = netdev_priv(dev);
 +      size_t size = 0;
 +
 +      if (priv->bittiming.bitrate)                            /* IFLA_CAN_BITTIMING */
 +              size += nla_total_size(sizeof(struct can_bittiming));
 +      if (priv->bittiming_const)                              /* IFLA_CAN_BITTIMING_CONST */
 +              size += nla_total_size(sizeof(struct can_bittiming_const));
 +      size += nla_total_size(sizeof(struct can_clock));       /* IFLA_CAN_CLOCK */
 +      size += nla_total_size(sizeof(u32));                    /* IFLA_CAN_STATE */
 +      size += nla_total_size(sizeof(struct can_ctrlmode));    /* IFLA_CAN_CTRLMODE */
 +      size += nla_total_size(sizeof(u32));                    /* IFLA_CAN_RESTART_MS */
 +      if (priv->do_get_berr_counter)                          /* IFLA_CAN_BERR_COUNTER */
 +              size += nla_total_size(sizeof(struct can_berr_counter));
 +      if (priv->data_bittiming.bitrate)                       /* IFLA_CAN_DATA_BITTIMING */
 +              size += nla_total_size(sizeof(struct can_bittiming));
 +      if (priv->data_bittiming_const)                         /* IFLA_CAN_DATA_BITTIMING_CONST */
 +              size += nla_total_size(sizeof(struct can_bittiming_const));
 +      if (priv->termination_const) {
 +              size += nla_total_size(sizeof(priv->termination));              /* IFLA_CAN_TERMINATION */
 +              size += nla_total_size(sizeof(*priv->termination_const) *       /* IFLA_CAN_TERMINATION_CONST */
 +                                     priv->termination_const_cnt);
 +      }
 +      if (priv->bitrate_const)                                /* IFLA_CAN_BITRATE_CONST */
 +              size += nla_total_size(sizeof(*priv->bitrate_const) *
 +                                     priv->bitrate_const_cnt);
 +      if (priv->data_bitrate_const)                           /* IFLA_CAN_DATA_BITRATE_CONST */
 +              size += nla_total_size(sizeof(*priv->data_bitrate_const) *
 +                                     priv->data_bitrate_const_cnt);
 +      size += sizeof(priv->bitrate_max);                      /* IFLA_CAN_BITRATE_MAX */
 +
 +      return size;
 +}
 +
 +static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
 +{
 +      struct can_priv *priv = netdev_priv(dev);
 +      struct can_ctrlmode cm = {.flags = priv->ctrlmode};
++      struct can_berr_counter bec = { };
 +      enum can_state state = priv->state;
 +
 +      if (priv->do_get_state)
 +              priv->do_get_state(dev, &state);
 +
 +      if ((priv->bittiming.bitrate &&
 +           nla_put(skb, IFLA_CAN_BITTIMING,
 +                   sizeof(priv->bittiming), &priv->bittiming)) ||
 +
 +          (priv->bittiming_const &&
 +           nla_put(skb, IFLA_CAN_BITTIMING_CONST,
 +                   sizeof(*priv->bittiming_const), priv->bittiming_const)) ||
 +
 +          nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv->clock), &priv->clock) ||
 +          nla_put_u32(skb, IFLA_CAN_STATE, state) ||
 +          nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) ||
 +          nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) ||
 +
 +          (priv->do_get_berr_counter &&
 +           !priv->do_get_berr_counter(dev, &bec) &&
 +           nla_put(skb, IFLA_CAN_BERR_COUNTER, sizeof(bec), &bec)) ||
 +
 +          (priv->data_bittiming.bitrate &&
 +           nla_put(skb, IFLA_CAN_DATA_BITTIMING,
 +                   sizeof(priv->data_bittiming), &priv->data_bittiming)) ||
 +
 +          (priv->data_bittiming_const &&
 +           nla_put(skb, IFLA_CAN_DATA_BITTIMING_CONST,
 +                   sizeof(*priv->data_bittiming_const),
 +                   priv->data_bittiming_const)) ||
 +
 +          (priv->termination_const &&
 +           (nla_put_u16(skb, IFLA_CAN_TERMINATION, priv->termination) ||
 +            nla_put(skb, IFLA_CAN_TERMINATION_CONST,
 +                    sizeof(*priv->termination_const) *
 +                    priv->termination_const_cnt,
 +                    priv->termination_const))) ||
 +
 +          (priv->bitrate_const &&
 +           nla_put(skb, IFLA_CAN_BITRATE_CONST,
 +                   sizeof(*priv->bitrate_const) *
 +                   priv->bitrate_const_cnt,
 +                   priv->bitrate_const)) ||
 +
 +          (priv->data_bitrate_const &&
 +           nla_put(skb, IFLA_CAN_DATA_BITRATE_CONST,
 +                   sizeof(*priv->data_bitrate_const) *
 +                   priv->data_bitrate_const_cnt,
 +                   priv->data_bitrate_const)) ||
 +
 +          (nla_put(skb, IFLA_CAN_BITRATE_MAX,
 +                   sizeof(priv->bitrate_max),
 +                   &priv->bitrate_max))
 +          )
 +
 +              return -EMSGSIZE;
 +
 +      return 0;
 +}
 +
 +static size_t can_get_xstats_size(const struct net_device *dev)
 +{
 +      return sizeof(struct can_device_stats);
 +}
 +
 +static int can_fill_xstats(struct sk_buff *skb, const struct net_device *dev)
 +{
 +      struct can_priv *priv = netdev_priv(dev);
 +
 +      if (nla_put(skb, IFLA_INFO_XSTATS,
 +                  sizeof(priv->can_stats), &priv->can_stats))
 +              goto nla_put_failure;
 +      return 0;
 +
 +nla_put_failure:
 +      return -EMSGSIZE;
 +}
 +
 +static int can_newlink(struct net *src_net, struct net_device *dev,
 +                     struct nlattr *tb[], struct nlattr *data[],
 +                     struct netlink_ext_ack *extack)
 +{
 +      return -EOPNOTSUPP;
 +}
 +
 +static void can_dellink(struct net_device *dev, struct list_head *head)
 +{
 +}
 +
 +struct rtnl_link_ops can_link_ops __read_mostly = {
 +      .kind           = "can",
 +      .maxtype        = IFLA_CAN_MAX,
 +      .policy         = can_policy,
 +      .setup          = can_setup,
 +      .validate       = can_validate,
 +      .newlink        = can_newlink,
 +      .changelink     = can_changelink,
 +      .dellink        = can_dellink,
 +      .get_size       = can_get_size,
 +      .fill_info      = can_fill_info,
 +      .get_xstats_size = can_get_xstats_size,
 +      .fill_xstats    = can_fill_xstats,
 +};
 +
 +int can_netlink_register(void)
 +{
 +      return rtnl_link_register(&can_link_ops);
 +}
 +
 +void can_netlink_unregister(void)
 +{
 +      rtnl_link_unregister(&can_link_ops);
 +}
Simple merge
Simple merge
Simple merge
@@@ -447,18 -447,7 +447,18 @@@ int mlx5e_ethtool_set_channels(struct m
                goto out;
        }
  
-       new_channels.params = priv->channels.params;
 +      /* Don't allow changing the number of channels if HTB offload is active,
 +       * because the numeration of the QoS SQs will change, while per-queue
 +       * qdiscs are attached.
 +       */
 +      if (priv->htb.maj_id) {
 +              err = -EINVAL;
 +              netdev_err(priv->netdev, "%s: HTB offload is active, cannot change the number of channels\n",
 +                         __func__);
 +              goto out;
 +      }
 +
+       new_channels.params = *cur_params;
        new_channels.params.num_channels = count;
  
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -388,9 -460,11 +388,10 @@@ static int __switchdev_handle_port_obj_
        extack = switchdev_notifier_info_to_extack(&port_obj_info->info);
  
        if (check_cb(dev)) {
-               /* This flag is only checked if the return value is success. */
-               port_obj_info->handled = true;
-               return add_cb(dev, port_obj_info->obj, extack);
 -              err = add_cb(dev, port_obj_info->obj, port_obj_info->trans,
 -                           extack);
++              err = add_cb(dev, port_obj_info->obj, extack);
+               if (err != -EOPNOTSUPP)
+                       port_obj_info->handled = true;
+               return err;
        }
  
        /* Switch ports might be stacked under e.g. a LAG. Ignore the
@@@ -493,8 -570,10 +495,10 @@@ static int __switchdev_handle_port_attr
        int err = -EOPNOTSUPP;
  
        if (check_cb(dev)) {
-               port_attr_info->handled = true;
-               return set_cb(dev, port_attr_info->attr);
 -              err = set_cb(dev, port_attr_info->attr, port_attr_info->trans);
++              err = set_cb(dev, port_attr_info->attr);
+               if (err != -EOPNOTSUPP)
+                       port_attr_info->handled = true;
+               return err;
        }
  
        /* Switch ports might be stacked under e.g. a LAG. Ignore the