Skip to content

devlink: expose instance locking and simplify port splitting

Jakub Kicinski netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 30 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6devlink: expose instance locking and add locked port registeringinclude/net/devlink.h net/core/devlink.c+86 -2413 replies
2/6eth: nfp: wrap locking assertions in helpersdrivers/net/ethernet/netronome/nfp/flower/main.c drivers/net/ethernet/netronome/nfp/nfp_app.c drivers/net/ethernet/netronome/nfp/nfp_app.h +1 more+14 -50 replies
3/6eth: nfp: replace driver's "pf" lock with devlink instance lockdrivers/net/ethernet/netronome/nfp/nfp_app.h drivers/net/ethernet/netronome/nfp/nfp_devlink.c drivers/net/ethernet/netronome/nfp/nfp_main.c +3 more+48 -410 replies
4/6eth: mlxsw: switch to explicit locking for port registrationdrivers/net/ethernet/mellanox/mlxsw/core.c drivers/net/ethernet/mellanox/mlxsw/minimal.c drivers/net/ethernet/mellanox/mlxsw/spectrum.c+22 -22 replies
5/6devlink: hold the instance lock in port_split / port_unsplit callbacksdrivers/net/ethernet/mellanox/mlxsw/spectrum.c drivers/net/ethernet/netronome/nfp/nfp_devlink.c net/core/devlink.c+8 -330 replies
6/6devlink: pass devlink_port to port_split / port_unsplit callbacksdrivers/net/ethernet/mellanox/mlxsw/core.c drivers/net/ethernet/netronome/nfp/nfp_devlink.c drivers/net/ethernet/netronome/nfp/nfp_port.c +3 more+35 -830 replies

Reviews trailers per patch

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

Read the v1 thread

Cover letter [RFT net-next 0/6] devlink: expose instance locking and simplify port splitting

This series puts the devlink ports fully under the devlink instance lock's protection. As discussed in the past it implements my preferred solution of exposing the instance lock to the drivers. This way drivers which want to support port splitting can lock the devlink instance themselves on the probe path, and we can take that lock in the core on the split/unsplit paths.

nfp and mlxsw are converted, with slightly deeper changes done in nfp since I'm more familiar with that driver.

Now that the devlink port is protected we can pass a pointer to the drivers, instead of passing a port index and forcing the drivers to do their own lookups. Both nfp and mlxsw can container_of() to their own structures.

I'd appreciate some testing, I don't have access to this HW.

Jakub Kicinski (6):
devlink: expose instance locking and add locked port registering
eth: nfp: wrap locking assertions in helpers
eth: nfp: replace driver's "pf" lock with devlink instance lock
eth: mlxsw: switch to explicit locking for port registration
devlink: hold the instance lock in port_split / port_unsplit callbacks
devlink: pass devlink_port to port_split / port_unsplit callbacks

 drivers/net/ethernet/mellanox/mlxsw/core.c    |  36 ++---
 drivers/net/ethernet/mellanox/mlxsw/minimal.c |   6 +
 .../net/ethernet/mellanox/mlxsw/spectrum.c    |   7 +
 .../net/ethernet/netronome/nfp/flower/main.c  |   4 +-
 drivers/net/ethernet/netronome/nfp/nfp_app.c  |   2 +-
 drivers/net/ethernet/netronome/nfp/nfp_app.h  |  12 +-
 .../net/ethernet/netronome/nfp/nfp_devlink.c  |  55 +++----
 drivers/net/ethernet/netronome/nfp/nfp_main.c |  19 +--
 drivers/net/ethernet/netronome/nfp/nfp_main.h |   6 +-
 .../net/ethernet/netronome/nfp/nfp_net_main.c |  34 ++--
 .../net/ethernet/netronome/nfp/nfp_net_repr.c |   4 +-
 drivers/net/ethernet/netronome/nfp/nfp_port.c |  17 --
 drivers/net/ethernet/netronome/nfp/nfp_port.h |   2 -
 include/net/devlink.h                         |  15 +-
 net/core/devlink.c                            | 148 ++++++++++--------
 15 files changed, 196 insertions(+), 171 deletions(-)
Signature · 1 line
2.34.1