| Message ID | 20230821073833.59042-1-leon@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3c5066c6b0a5e21c36809647c06710ceb1eaddba |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [GIT,PULL,v1] Please pull mlx5 MACsec RoCEv2 support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Pull request for net |
| netdev/apply | fail | Pull to net failed |
Hello: This pull request was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 21 Aug 2023 10:38:25 +0300 you wrote: > Changelog: > v1: > * Removed NULL check in first macsec patch as it is not needed. > * Added more information about potential merge conflict. > v0: https://lore.kernel.org/netdev/20230813064703.574082-1-leon@kernel.org/ > ---------------------------------------------------------------- > > [...] Here is the summary with links: - [GIT,PULL,v1] Please pull mlx5 MACsec RoCEv2 support https://git.kernel.org/netdev/net-next/c/3c5066c6b0a5 You are awesome, thank you!
diff --cc include/linux/mlx5/driver.h index c9d82e74daaa,728bcd6d184c..000000000000 --- a/include/linux/mlx5/driver.h diff --cc include/linux/mlx5/driver.h index c9d82e74daaa,728bcd6d184c..000000000000 --- a/include/linux/mlx5/driver.h
Changelog: v1: * Removed NULL check in first macsec patch as it is not needed. * Added more information about potential merge conflict. v0: https://lore.kernel.org/netdev/20230813064703.574082-1-leon@kernel.org/ ---------------------------------------------------------------- Hi, This PR is collected from https://lore.kernel.org/all/cover.1691569414.git.leon@kernel.org and contains patches to support mlx5 MACsec RoCEv2. It is based on -rc4 and such has minor conflict with net-next due to existance of IPsec packet offlosd in eswitch code and hwmon. The resolution for netdev is as follows: Before: ➜ kernel git:(net-next) git merge mlx5-next ... Unmerged paths: (use "git add/rm <file>..." as appropriate to mark resolution) deleted by them: drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c both modified: include/linux/mlx5/driver.h ➜ kernel git:(net-next) ✗ git diff +++ b/include/linux/mlx5/driver.h @@@ -806,9 -804,12 +806,18 @@@ struct mlx5_core_dev struct mlx5_rsc_dump *rsc_dump; u32 vsc_addr; struct mlx5_hv_vhca *hv_vhca; ++<<<<<<< HEAD + struct mlx5_hwmon *hwmon; + u64 num_block_tc; + u64 num_block_ipsec; ++======= + struct mlx5_thermal *thermal; + #ifdef CONFIG_MLX5_MACSEC + struct mlx5_macsec_fs *macsec_fs; + /* MACsec notifier chain to sync MACsec core and IB database */ + struct blocking_notifier_head macsec_nh; + #endif ++>>>>>>> mlx5-next }; struct mlx5_db { * Unmerged path drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c After: ➜ kernel git:(net-next) ✗ git diff +++ b/include/linux/mlx5/driver.h @@@ -806,9 -804,12 +806,14 @@@ struct mlx5_core_dev struct mlx5_rsc_dump *rsc_dump; u32 vsc_addr; struct mlx5_hv_vhca *hv_vhca; - struct mlx5_thermal *thermal; + struct mlx5_hwmon *hwmon; + u64 num_block_tc; + u64 num_block_ipsec; + #ifdef CONFIG_MLX5_MACSEC + struct mlx5_macsec_fs *macsec_fs; + /* MACsec notifier chain to sync MACsec core and IB database */ + struct blocking_notifier_head macsec_nh; + #endif }; struct mlx5_db { * Unmerged path drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c ---------------------------------------------------------------- From Patrisious: This series extends previously added MACsec offload support to cover RoCE traffic either. In order to achieve that, we need configure MACsec with offload between the two endpoints, like below: REMOTE_MAC=10:70:fd:43:71:c0 * ip addr add 1.1.1.1/16 dev eth2 * ip link set dev eth2 up * ip link add link eth2 macsec0 type macsec encrypt on * ip macsec offload macsec0 mac * ip macsec add macsec0 tx sa 0 pn 1 on key 00 dffafc8d7b9a43d5b9a3dfbbf6a30c16 * ip macsec add macsec0 rx port 1 address $REMOTE_MAC * ip macsec add macsec0 rx port 1 address $REMOTE_MAC sa 0 pn 1 on key 01 ead3664f508eb06c40ac7104cdae4ce5 * ip addr add 10.1.0.1/16 dev macsec0 * ip link set dev macsec0 up And in a similar manner on the other machine, while noting the keys order would be reversed and the MAC address of the other machine. RDMA traffic is separated through relevant GID entries and in case of IP ambiguity issue - meaning we have a physical GIDs and a MACsec GIDs with the same IP/GID, we disable our physical GID in order to force the user to only use the MACsec GID. Thanks The following changes since commit 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4: Linux 6.5-rc4 (2023-07-30 13:23:47 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next for you to fetch changes up to 58dbd6428a6819e55a3c52ec60126b5d00804a38: RDMA/mlx5: Handles RoCE MACsec steering rules addition and deletion (2023-08-20 12:35:24 +0300) ---------------------------------------------------------------- Patrisious Haddad (14): macsec: add functions to get macsec real netdevice and check offload net/mlx5e: Move MACsec flow steering operations to be used as core library net/mlx5: Remove dependency of macsec flow steering on ethernet net/mlx5e: Rename MACsec flow steering functions/parameters to suit core naming style net/mlx5e: Move MACsec flow steering and statistics database from ethernet to core net/mlx5: Remove netdevice from MACsec steering net/mlx5: Maintain fs_id xarray per MACsec device inside macsec steering RDMA/mlx5: Implement MACsec gid addition and deletion net/mlx5: Add MACsec priorities in RDMA namespaces IB/core: Reorder GID delete code for RoCE net/mlx5: Configure MACsec steering for egress RoCEv2 traffic net/mlx5: Configure MACsec steering for ingress RoCEv2 traffic net/mlx5: Add RoCE MACsec steering infrastructure in core RDMA/mlx5: Handles RoCE MACsec steering rules addition and deletion drivers/infiniband/core/cache.c | 6 +- drivers/infiniband/hw/mlx5/Makefile | 1 + drivers/infiniband/hw/mlx5/macsec.c | 364 +++ drivers/infiniband/hw/mlx5/macsec.h | 29 + drivers/infiniband/hw/mlx5/main.c | 41 +- drivers/infiniband/hw/mlx5/mlx5_ib.h | 17 + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- .../mellanox/mlx5/core/en_accel/en_accel.h | 4 +- .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 176 +- .../ethernet/mellanox/mlx5/core/en_accel/macsec.h | 26 +- .../mellanox/mlx5/core/en_accel/macsec_fs.c | 1393 ----------- .../mellanox/mlx5/core/en_accel/macsec_fs.h | 47 - .../mellanox/mlx5/core/en_accel/macsec_stats.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 37 +- .../ethernet/mellanox/mlx5/core/lib/macsec_fs.c | 2410 ++++++++++++++++++++ .../ethernet/mellanox/mlx5/core/lib/macsec_fs.h | 64 + drivers/net/macsec.c | 12 + include/linux/mlx5/device.h | 2 + include/linux/mlx5/driver.h | 51 + include/linux/mlx5/fs.h | 2 + include/linux/mlx5/macsec.h | 32 + include/net/macsec.h | 2 + 26 files changed, 3118 insertions(+), 1629 deletions(-) create mode 100644 drivers/infiniband/hw/mlx5/macsec.c create mode 100644 drivers/infiniband/hw/mlx5/macsec.h delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.h create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.h create mode 100644 include/linux/mlx5/macsec.h