Skip to content

xfrm & bonding: Correct use of xso.real_dev

Cosmin Ratiu linux-kselftest netdev 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest6 patches 7 repliesIn review
  2. v26 patches 5 repliesSuperseded
  3. v16 patches 5 repliesSuperseded

Changes in v3 from the cover letter

Added a comment with locking expectations for real_dev. Removed unnecessary bond variable from bond_ipsec_del_sa(). v1 -> v2:
Added missing kdoc for various functions.
Made bond_ipsec_del_sa() use xso.real_dev instead of curr_active_slave.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6net/mlx5: Avoid using xso.real_dev unnecessarilydrivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h+6 -110 replies
2/6xfrm: Use xdo.dev instead of xdo.real_devdrivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c net/xfrm/xfrm_device.c net/xfrm/xfrm_state.c+1 -50 replies
3/6xfrm: Remove unneeded device check from validate_xmit_xfrmnet/xfrm/xfrm_device.c+1 -60 replies
4/6xfrm: Add explicit dev to .xdo_dev_state_{add,delete,free}Documentation/networking/xfrm_device.rst drivers/net/bonding/bond_main.c drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +11 more+136 -990 replies
5/6bonding: Mark active offloaded xfrm_statesdrivers/net/bonding/bond_main.c+5 -31 reply
6/6bonding: Fix multiple long standing offload racesdrivers/net/bonding/bond_main.c include/net/xfrm.h+41 -481 reply

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchLeon RomanovskyNikolay AleksandrovHangbin Liu
SeriesR-b
1/6R-b
2/6R-b
3/6R-b
4/6R-b
5/6R-b T-b R-b
6/6R-b T-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCH net-next v3 0/6] xfrm & bonding: Correct use of xso.real_dev

This patch series was motivated by fixing a few bugs in the bonding driver related to xfrm state migration on device failover.

struct xfrm_dev_offload has two net_device pointers: dev and real_dev. The first one is the device the xfrm_state is offloaded on and the second one is used by the bonding driver to manage the underlying device xfrm_states are actually offloaded on. When bonding isn't used, the two pointers are the same.

This causes confusion in drivers: Which device pointer should they use? If they want to support bonding, they need to only use real_dev and never look at dev.

Furthermore, real_dev is used without proper locking from multiple code paths and changing it is dangerous. See commit [1] for example.

This patch series clears things out by removing all uses of real_dev from outside the bonding driver.
Then, the bonding driver is refactored to fix a couple of long standing races and the original bug which motivated this patch series.

[1] commit f8cde9805981 ("bonding: fix xfrm real_dev null pointer dereference")

v2 -> v3:
Added a comment with locking expectations for real_dev. Removed unnecessary bond variable from bond_ipsec_del_sa(). v1 -> v2:
Added missing kdoc for various functions.
Made bond_ipsec_del_sa() use xso.real_dev instead of curr_active_slave.

Cosmin Ratiu (6):
Cleaning up unnecessary uses of xso.real_dev:
net/mlx5: Avoid using xso.real_dev unnecessarily
xfrm: Use xdo.dev instead of xdo.real_dev
xfrm: Remove unneeded device check from validate_xmit_xfrm
Refactoring device operations to get an explicit device pointer:
xfrm: Add explicit dev to .xdo_dev_state_{add,delete,free}
Fixing a bonding xfrm state migration bug:
bonding: Mark active offloaded xfrm_states
Fixing long standing races in bonding:
bonding: Fix multiple long standing offload races

 Documentation/networking/xfrm_device.rst      |  10 +-
 drivers/net/bonding/bond_main.c               | 119 +++++++++---------
 .../net/ethernet/chelsio/cxgb4/cxgb4_main.c   |  20 +--
 .../inline_crypto/ch_ipsec/chcr_ipsec.c       |  18 ++-
 .../net/ethernet/intel/ixgbe/ixgbe_ipsec.c    |  41 +++---
 drivers/net/ethernet/intel/ixgbevf/ipsec.c    |  21 ++--
 .../marvell/octeontx2/nic/cn10k_ipsec.c       |  18 +--
 .../mellanox/mlx5/core/en_accel/ipsec.c       |  28 ++---
 .../mellanox/mlx5/core/en_accel/ipsec.h       |   1 +
 .../net/ethernet/netronome/nfp/crypto/ipsec.c |  11 +-
 drivers/net/netdevsim/ipsec.c                 |  15 ++-
 include/linux/netdevice.h                     |  10 +-
 include/net/xfrm.h                            |  11 ++
 net/xfrm/xfrm_device.c                        |  13 +-
 net/xfrm/xfrm_state.c                         |  16 +--
 15 files changed, 185 insertions(+), 167 deletions(-)
Signature · 1 line
2.45.0