From: Jakub Kicinski Date: Fri, 13 Oct 2023 16:35:34 +0000 (-0700) Subject: Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox... X-Git-Tag: io_uring-6.7-2023-11-10~40^2~161 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1bc60524ca1a3d350e91de083c7331de1ee22c39;p=linux-2.6-block.git Merge branch 'mlx5-next' of https://git./linux/kernel/git/mellanox/linux Leon Romanovsky says: ==================== This PR is collected from https://lore.kernel.org/all/cover.1695296682.git.leon@kernel.org This series from Patrisious extends mlx5 to support IPsec packet offload in multiport devices (MPV, see [1] for more details). These devices have single flow steering logic and two netdev interfaces, which require extra logic to manage IPsec configurations as they performed on netdevs. [1] https://lore.kernel.org/linux-rdma/20180104152544.28919-1-leon@kernel.org/ * 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux: net/mlx5: Handle IPsec steering upon master unbind/bind net/mlx5: Configure IPsec steering for ingress RoCEv2 MPV traffic net/mlx5: Configure IPsec steering for egress RoCEv2 MPV traffic net/mlx5: Add create alias flow table function to ipsec roce net/mlx5: Implement alias object allow and create functions net/mlx5: Add alias flow table bits net/mlx5: Store devcom pointer inside IPsec RoCE net/mlx5: Register mlx5e priv to devcom in MPV mode RDMA/mlx5: Send events from IB driver about device affiliation state net/mlx5: Introduce ifc bits for migration in a chunk mode ==================== Link: https://lore.kernel.org/r/20231002083832.19746-1-leon@kernel.org Signed-off-by: Jakub Kicinski --- 1bc60524ca1a3d350e91de083c7331de1ee22c39 diff --cc include/linux/mlx5/device.h index 8fbe22de16ef,26333d602a50..820bca965fb6 --- a/include/linux/mlx5/device.h +++ b/include/linux/mlx5/device.h @@@ -366,7 -366,8 +366,9 @@@ enum mlx5_driver_event MLX5_DRIVER_EVENT_UPLINK_NETDEV, MLX5_DRIVER_EVENT_MACSEC_SA_ADDED, MLX5_DRIVER_EVENT_MACSEC_SA_DELETED, + MLX5_DRIVER_EVENT_SF_PEER_DEVLINK, + MLX5_DRIVER_EVENT_AFFILIATION_DONE, + MLX5_DRIVER_EVENT_AFFILIATION_REMOVED, }; enum {