From patchwork Sun Aug 13 06:47:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 13351989 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47B6BC001B0 for ; Sun, 13 Aug 2023 06:48:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229520AbjHMGsQ (ORCPT ); Sun, 13 Aug 2023 02:48:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjHMGsP (ORCPT ); Sun, 13 Aug 2023 02:48:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C05BCE54 for ; Sat, 12 Aug 2023 23:48:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 476EE61A0F for ; Sun, 13 Aug 2023 06:48:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCE72C433C8; Sun, 13 Aug 2023 06:48:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691909296; bh=uX9muo9eioloiBiJllRvsD3ZrmxKmdYL1irOWHKtj5M=; h=From:To:Cc:Subject:Date:From; b=qJnlNnNboafrW1p0Alv9Vu4CmUupCbSJnpjslwShCgb7xz4UOJskrTe5mHRKQqeY8 AF0W8E4eXJdYg7/fa34zDddozuCFC3GUW1wk7YxB1DdmF9EZeICLHuYrm9bre35Qp2 iv4iGjBvPqyd0qZWn4JwFAPQAdhwaoOk7W9TQhDzDpVXQv8IDLYX5oNyP3a3OMO45p xQ6La7qBMKYxRk5OJJe6N93FwjAd5NgE8rhBEPolArZ11fLl4egnPyHptxknFX+VRC 82zVwoGjzzfzI225NHnHryNCTi4yciskDq2uQSDFr8xq8XiM5uBvcE03D5LWje4ytZ ii0ahF/MdhViw== From: Leon Romanovsky To: Jason Gunthorpe , Jakub Kicinski Cc: "David S . Miller" , Eric Dumazet , linux-rdma@vger.kernel.org, Maor Gottlieb , Mark Zhang , netdev@vger.kernel.org, Paolo Abeni , Patrisious Haddad , Raed Salem , Saeed Mahameed , Simon Horman Subject: [GIT PULL] Please pull mlx5 MACsec RoCEv2 support Date: Sun, 13 Aug 2023 09:47:03 +0300 Message-ID: <20230813064703.574082-1-leon@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.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 the resolution is to take both hunks. +++ b/include/linux/mlx5/driver.h @@@ -805,6 -806,11 +805,14 @@@ struct mlx5_core_dev u32 vsc_addr; struct mlx5_hv_vhca *hv_vhca; struct mlx5_thermal *thermal; + u64 num_block_tc; + u64 num_block_ipsec; + #ifdef CONFIG_MLX5_MACSEC + struct mlx5_macsec_fs *macsec_fs; + #endif }; struct mlx5_db { ---------------------------------------------------------------- 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 2d297d20ace8c544bcc74a2ed5f3536add3a7a69: RDMA/mlx5: Handles RoCE MACsec steering rules addition and deletion (2023-08-13 09:25:10 +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 | 15 + 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, 3121 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 diff --cc include/linux/mlx5/driver.h index 25d0528f9219,3ec8155c405d..000000000000 --- a/include/linux/mlx5/driver.h