Skip to content

net: fix netdev to devlink_port linkage and expose to user

Jiri Pirko linux-rdma netdev 4 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest13 patches 2 repliesApplied 13/13
  2. v313 patches 13 repliesSuperseded
  3. v213 patches 3 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v113 patches0 repliesSuperseded

Changes in v4 from the cover letter

- mostly cosmetics, see patches 5, 6 and 13 for changelogs v2->v3:
- see patch 6 for a changelog

Patches in v4 All 13 applied

#Subject and filesSizeRepliesApplied
1/13net: devlink: convert devlink port type-specific pointers to unioninclude/net/devlink.h net/core/devlink.c+23 -70 repliesApplied
2/13net: devlink: move port_type_warn_schedule() call to __devlink_port_type_set()net/core/devlink.c+5 -20 repliesApplied
3/13net: devlink: move port_type_netdev_checks() call to __devlink_port_type_set()net/core/devlink.c+33 -300 repliesApplied
4/13net: devlink: take RTNL in port_fill() function only if it is not heldnet/core/devlink.c+31 -150 repliesApplied
5/13net: devlink: track netdev with devlink_port assignedinclude/linux/netdevice.h net/core/dev.c net/core/devlink.c+99 -92 repliesApplied
6/13net: make drivers to use SET_NETDEV_DEVLINK_PORT to set devlink_portdrivers/net/ethernet/broadcom/bnxt/bnxt.c drivers/net/ethernet/freescale/dpaa2/dpaa2-eth-devlink.c drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +27 more+41 -1670 repliesApplied
7/13net: devlink: remove netdev arg from devlink_port_type_eth_set()drivers/net/ethernet/mellanox/mlx4/main.c include/net/devlink.h net/core/devlink.c+16 -120 repliesApplied
8/13net: devlink: remove net namespace check from devlink_nl_port_fill()net/core/devlink.c+1 -20 repliesApplied
9/13net: devlink: store copy netdevice ifindex and ifname to allow port_fill() without RTNL heldinclude/net/devlink.h net/core/devlink.c+29 -410 repliesApplied
10/13net: devlink: add not cleared type warning to port unregisternet/core/devlink.c+1 -00 repliesApplied
11/13net: devlink: use devlink_port pointer instead of ndo_get_devlink_portnet/core/devlink.c net/core/net-sysfs.c net/ethtool/ioctl.c+6 -210 repliesApplied
12/13net: remove unused ndo_get_devlink_portdrivers/net/ethernet/broadcom/bnxt/bnxt.c drivers/net/ethernet/fungible/funeth/funeth_main.c drivers/net/ethernet/intel/ice/ice_main.c +19 more+0 -1500 repliesApplied
13/13net: expose devlink port over rtnetlinkinclude/net/devlink.h include/uapi/linux/if_link.h net/core/devlink.c +1 more+73 -00 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [patch net-next v4 00/13] net: fix netdev to devlink_port linkage and expose to user

From: Jiri Pirko <[email protected]>

Currently, the info about linkage from netdev to the related devlink_port instance is done using ndo_get_devlink_port(). This is not sufficient, as it is up to the driver to implement it and some of them don't do that. Also it leads to a lot of unnecessary boilerplate code in all the drivers.

Instead of that, introduce a possibility for driver to expose this relationship by new SET_NETDEV_DEVLINK_PORT macro which stores it into dev->devlink_port. It is ensured by the driver init/fini flows that the devlink_port pointer does not change during the netdev lifetime. Devlink port is always registered before netdev register and unregistered after netdev unregister.

Benefit from this linkage setup and remove explicit calls from driver to devlink_port_type_eth_set() and clear(). Many of the driver didn't use it correctly anyway. Let the devlink.c to track associated netdev events and adjust type and type pointer accordingly. Also use this events to to keep track on ifname change and remove RTNL lock taking from devlink_nl_port_fill().

Finally, remove the ndo_get_devlink_port() ndo which is no longer used and expose devlink_port handle as a new netdev netlink attribute to the user. That way, during the ifname->devlink_port lookup, userspace app does not have to dump whole devlink port list and instead it can just do a simple RTM_GETLINK query.

---
v3->v4:
- mostly cosmetics, see patches 5, 6 and 13 for changelogs v2->v3:
- see patch 6 for a changelog
v1->v2:
- see patches 5 and 6 for changelogs

Jiri Pirko (13):
net: devlink: convert devlink port type-specific pointers to union
net: devlink: move port_type_warn_schedule() call to

    __devlink_port_type_set()
  net: devlink: move port_type_netdev_checks() call to
    __devlink_port_type_set()

net: devlink: take RTNL in port_fill() function only if it is not held
net: devlink: track netdev with devlink_port assigned
net: make drivers to use SET_NETDEV_DEVLINK_PORT to set devlink_port
net: devlink: remove netdev arg from devlink_port_type_eth_set()
net: devlink: remove net namespace check from devlink_nl_port_fill()
net: devlink: store copy netdevice ifindex and ifname to allow
port_fill() without RTNL held
net: devlink: add not cleared type warning to port unregister
net: devlink: use devlink_port pointer instead of ndo_get_devlink_port
net: remove unused ndo_get_devlink_port
net: expose devlink port over rtnetlink

 drivers/net/ethernet/broadcom/bnxt/bnxt.c     |  14 +-
 .../freescale/dpaa2/dpaa2-eth-devlink.c       |  11 +-
 .../net/ethernet/freescale/dpaa2/dpaa2-eth.c  |   1 +
 .../ethernet/fungible/funeth/funeth_main.c    |  13 +-
 drivers/net/ethernet/intel/ice/ice_devlink.c  |  14 +-
 drivers/net/ethernet/intel/ice/ice_main.c     |  18 +-
 drivers/net/ethernet/intel/ice/ice_repr.c     |  12 +-
 .../marvell/prestera/prestera_devlink.c       |  17 --
 .../marvell/prestera/prestera_devlink.h       |   5 -
 .../ethernet/marvell/prestera/prestera_main.c |   5 +-
 .../net/ethernet/mellanox/mlx4/en_netdev.c    |   9 +-
 drivers/net/ethernet/mellanox/mlx4/main.c     |   2 +-
 .../ethernet/mellanox/mlx5/core/en/devlink.c  |  17 --
 .../ethernet/mellanox/mlx5/core/en/devlink.h  |   2 -
 .../net/ethernet/mellanox/mlx5/core/en_main.c |   4 +-
 .../net/ethernet/mellanox/mlx5/core/en_rep.c  |  44 +---
 drivers/net/ethernet/mellanox/mlxsw/core.c    |  20 +-
 drivers/net/ethernet/mellanox/mlxsw/core.h    |   7 +-
 drivers/net/ethernet/mellanox/mlxsw/minimal.c |  17 +-
 .../net/ethernet/mellanox/mlxsw/spectrum.c    |  16 +-
 drivers/net/ethernet/mscc/ocelot_net.c        |  11 +-
 drivers/net/ethernet/mscc/ocelot_vsc7514.c    |   9 -
 drivers/net/ethernet/netronome/nfp/nfp_app.h  |   2 -
 .../net/ethernet/netronome/nfp/nfp_devlink.c  |  23 +-
 .../ethernet/netronome/nfp/nfp_net_common.c   |   2 -
 .../net/ethernet/netronome/nfp/nfp_net_main.c |  11 +-
 .../net/ethernet/netronome/nfp/nfp_net_repr.c |   1 -
 drivers/net/ethernet/netronome/nfp/nfp_port.h |   2 -
 .../ethernet/pensando/ionic/ionic_devlink.c   |   2 +-
 drivers/net/ethernet/ti/am65-cpsw-nuss.c      |  14 +-
 drivers/net/netdevsim/dev.c                   |   2 -
 drivers/net/netdevsim/netdev.c                |  10 +-
 include/linux/netdevice.h                     |  24 ++-
 include/net/devlink.h                         |  32 ++-
 include/uapi/linux/if_link.h                  |   2 +
 net/core/dev.c                                |  14 +-
 net/core/devlink.c                            | 203 +++++++++++++-----
 net/core/net-sysfs.c                          |   4 +-
 net/core/rtnetlink.c                          |  39 ++++
 net/dsa/dsa2.c                                |   9 -
 net/dsa/slave.c                               |   9 +-
 net/ethtool/ioctl.c                           |  11 +-
 42 files changed, 293 insertions(+), 391 deletions(-)
Signature · 1 line
2.37.3