From patchwork Wed Sep 7 09:47:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 12968736 X-Patchwork-Delegate: kuba@kernel.org 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 6EC3BC54EE9 for ; Wed, 7 Sep 2022 09:48:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229751AbiIGJsg (ORCPT ); Wed, 7 Sep 2022 05:48:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229560AbiIGJsd (ORCPT ); Wed, 7 Sep 2022 05:48:33 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2105.outbound.protection.outlook.com [40.107.237.105]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C2C29C210 for ; Wed, 7 Sep 2022 02:48:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AMk8XDeUbG49uGTlcIwhT0SafMIdnWNGfP7cU+v5mi8cck1wV5GNGiMuxU3g4klMyeR+9uVNMuTAJfeeDSdqFz4zJmN87oCkuwk6aRfhR6NcrRIej+cREOvsa164S7o3DbrhxvnqG6GKE60wVEqyAV3CfYTT4P5o/JTph9We4wA7Evkl3XiWCQiwWY+0e2makua8M5+7oeU1/G/58QWesR5R6lSGRab5SxnS4GSTnUoJRKr93l6GeSTTqM26vFdfOtM/3fod9zbk5ZMBarRtf2Tls1xU+Kc/3lr7DwIcreOmmGqyG2fCITZXFkruwSjapb5OxN3B3xtCvf1mfrNhfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xlAdpUiLQVJxQmQi30b7N8yuPmyj6yOsax88BqrRaZk=; b=WNLl/P4aUiZsdSuC9/qN7HkmNtxtVqYVPIGR4BEz1/d79YH6T9YBhaNe3N9k2QSXFneHJVS4Y+SS5apiz3O+klJCsdynL+OWG2W9uKZ7XNs5reCvP7wlnTQSw3QDvoaLyNSPl/+AybNU1Ku3GX3IWflGR+rFR6B2uMwUeradGC8Yak8vt+R0i0utqUcRFpsJ+u3nUJXAdd5YJITYADf0caTnHFvca0dkcyhO2UMreeCmLwlOYmB0HbRFXmwknjMk8ycWPQr/XJ5dvFOl89rHyUmsAUm89T2j/odz5ZXz9rMTxH6e8iQVq/L9micDvwkC6Oe/aWcEj94NE6voJuvL9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xlAdpUiLQVJxQmQi30b7N8yuPmyj6yOsax88BqrRaZk=; b=Q6tlVrlcnIxRKfzz/AoFlQLkXkMp6Wl1zAXW+QKCbbxh1G08d8kCKLrJGNv/NuQumFp1pjgisoj08TU1Y/QZkurRFIBgPmSrmXkVw5yII+j/Mqy725mYjF76E+6s7tA8uuUs6cUwrOxPHJxhl1pMApk/5Muma7h0C9xWYWe6qxI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by PH0PR13MB5876.namprd13.prod.outlook.com (2603:10b6:510:168::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.5; Wed, 7 Sep 2022 09:48:26 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a1e6:3e37:b3f3:7576]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::a1e6:3e37:b3f3:7576%9]) with mapi id 15.20.5612.014; Wed, 7 Sep 2022 09:48:26 +0000 From: Simon Horman To: David Miller , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, oss-drivers@corigine.com Subject: [PATCH net-next 2/3] nfp: add framework to support ipsec offloading Date: Wed, 7 Sep 2022 11:47:57 +0200 Message-Id: <20220907094758.35571-3-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220907094758.35571-1-simon.horman@corigine.com> References: <20220907094758.35571-1-simon.horman@corigine.com> X-ClientProxiedBy: AM0PR04CA0093.eurprd04.prod.outlook.com (2603:10a6:208:be::34) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|PH0PR13MB5876:EE_ X-MS-Office365-Filtering-Correlation-Id: 4362d212-7139-4f48-9499-08da90b61c59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ccpDzDHXPpX+FY3am1+rrUBU7bnpkmktALUdKExShiNWtYtbesbuo3KIeBCJl+Amborv+6b/avoE5neuJoJZpPR0Xdlet8YlP1zrBpeRRqna9G1Fl/iEXIm3bsTEms1EC5x9nELENaXxWqcY60MLdX5XbKld5mQDxCnkcG6KOC/KDN58k5o5ejhoqu+I1WRXfJ41gZ9E4weHfjwkpMdm81xTIYa0KM1D1PgH2V4md6mwqAE9C+23A5HpXpobdRTweTQH2VAsDT0vpMjoMk7v1VyYW992AXdoPT/F+yzvW/B1ner+eRI0i6mF6zk0AEH4OMoixQaHL7D/lTjaTnQtJz317wiUffeulGhZuLk6i2QLEmgVzc62NQzxbmgrJ84dBa2tfFozlvHZ1GbR0etzZhnPVrfV8WTPdVOCMCMxgpOujJSscA3e2qW2brFjYMDpVVdnxC7VEMT7xty9n3/pHFknq54a6+qOBb38TzEXPqRnn7k4UnPVpefm8cp37y4Q0MhNOfolvHZhIE2qIF1x7/vL8C7fEejQ6KKo11Eq1hRlXE49q/MxJjrqnmuzJsy5bpXFZgrJYZKdKoYnsjgTKxxNQ7k68BwoyRwG3ZYtiYkCnK5Os3FfwoAY0fzMM2aubjSUfOJnFCH/XhowWgnOkvUlmcGk6N6zFUHAouHJG/w/O503mvoDyzeE91oieDTmzkwLp1iNXktvE0n9TW59A80+M/N3bVWpLIyiSNx1+Stxj+ufHFzNIj8IcPmVPVA7LhXB/hPzLWql+XYKSTqdsg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR13MB4842.namprd13.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(396003)(376002)(366004)(346002)(39840400004)(136003)(36756003)(66556008)(66946007)(4326008)(110136005)(316002)(8936002)(8676002)(5660300002)(30864003)(478600001)(44832011)(2906002)(66476007)(6486002)(6506007)(52116002)(1076003)(83380400001)(2616005)(6512007)(6666004)(186003)(107886003)(86362001)(41300700001)(38100700002)(309714004);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oLqmTlu3ZSqszz2LEO8tbgbyaujvDeNMv9J2xMTxukv9tzzsQ24LhqafySXS2bWfWZKkhBS/QfEgQcOf9Ehp7ORWqEq043BE+CgK3SOAx9HVZaMyfvLVjIqbCWl3PQzRNiRU5wFT6UHD63CgN5hyA6MJxVdoFm+vMXtcmZk0pguZhb2Y46GcxvwFvWQvbGlF/rPLhppQrcYhq9QkR2o7VCqi5tjS1OS0zYdKGF+Ge2kA5/AEbmoDfWo0Ejy9qxyV0B/FeeYPd10fe9h6fGxI+rUKQ7an3cJVBFMwEspf4bpbJ7agd/HmIdaVwIouo1vLFpYAePZ/cTuXyKb3QoWbDorWxUtdS8m4gkS7JRagxBWBkSPFjmJvjU8OGcwDNjuLMRxyafhzd0GkmYcgJOgiY/bMRCArWhzghli6IHJg8fDDTtTnOFr7BrQ9ggaO4bC42aQj/uQLpB/Gd6tcu219+eFf/Jzy5sHEEKn6WhDqJL1IWlAlwmgffQy3Fd6CuX1/tGEGiRlvLyHZa/gvZPgOfEgbbov71SxunNz9luhzCpDu0MBDpbY0wxg7s9axniADxfA1mbF944HGAxziwS3ysqNlDcBL91vYfXuwq/3xBRLbh/ItgqzfDBEUup5hW/lELSufCMX07l2bJtXXZJCXzZrlghwySPiPJi/1p+j5CpvSuzQo4NsiARkX2txtteGdufhFZS9hPM4g7Ec9kVuwGKS+/TLRq6Tp4vGu44LLLt72SCOvoT3hTueIOctF1FBBj6EiJNEnh0nr1lpQU/x2UnfieREl/nmm5AcV0lLPG8j2hvQMChj374gRFo8OXjuoAXmbrXtvHbRLY7RHQjJiQufjeNy4a6Ugr2G/g5eNY694Z+86aQV8Ulbu8zzHCwJhbiBBXrju2xgm+WZ6O5WxpMLVUSiMRhpA+apDtlO0nKy8T21FNZzzbA6rAXRhYsv+12JT6wbFUYBcHcaNBPc/dF+dcnC5gEi0V1YWAIpcWhZ/Q1Vz7C9sgEx6S0ukkOpdwLGESg/VfwB9cvxcF1eQ5X7VIcROsR0FNfzDE4ucLj9yU4XihFIqDWPCG4+nnmvj3JglOegQxzZyxvCXITJ11Ls6lIRtPySAMAb4DOgJqSp9HLC5DUrU03F3k1FdFlTf3OR4il62+qKHobOzRhuHwZnvsIp9JRqMouwL4nb/aOnsBak9ja3ZKi3i8pwZInM6/VwApLbAnkREMBMtU5CQk7/XKxgd9tHFoXGUc3UDmXKtUsUxi7iXfLFFgADaXe8x8hVMncXOo+VNvz+vK3Ov1nqWqSAC1gOpmTL4Hszu0TTM0l80ClrWZ1TDUzjP2oPclwlZ5v0PmDfrSD+CWqZf2y5x0+SO/mWGnn7CfCI/u0bVlkpBCcZKNBPBbg5V8sTGTlQQI8scbGV3/KSAFyxP03jL2XTgw6IaEoGy8VmIGuvaxeEgTyaPKbuD1Ija7YMtKLtjRUJ0jNdjzO2Myrw++qRYnVReC5+KFViLfrV9EB0uHuRiwnnhbgEZOpH9v3CjUMYlPQXDb39/eCUIXE53Eczgaw98aZb9J17EIcTm61CqjSm+t/s4GOuYiT3YleW7PHNCflTgqFLaoAMPKgzpEXS6bD6Zn8827XJbgkKbFFMmifrWu7Lqqwl1Er//T7XuQab0KoH5GlGNeFjeOLcSjg== X-OriginatorOrg: corigine.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5876 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Huanhuan Wang A new metadata type and config structure are introduced to interact with firmware to support ipsec offloading. This feature relies on specific firmware that supports ipsec encrypt/decrypt by advertising related capability bit. The xfrm callbacks which interact with upper layer are implemented in the following patch. Based on initial work of Norm Bagley . Signed-off-by: Huanhuan Wang Reviewed-by: Louis Peens Signed-off-by: Simon Horman --- drivers/net/ethernet/netronome/Kconfig | 11 + drivers/net/ethernet/netronome/nfp/Makefile | 6 + .../ethernet/netronome/nfp/crypto/crypto.h | 35 +++ .../net/ethernet/netronome/nfp/crypto/ipsec.c | 216 ++++++++++++++++++ drivers/net/ethernet/netronome/nfp/nfd3/dp.c | 43 +++- .../net/ethernet/netronome/nfp/nfd3/ipsec.c | 19 ++ .../net/ethernet/netronome/nfp/nfd3/nfd3.h | 8 + drivers/net/ethernet/netronome/nfp/nfp_net.h | 9 + .../ethernet/netronome/nfp/nfp_net_common.c | 10 +- .../net/ethernet/netronome/nfp/nfp_net_ctrl.h | 4 + 10 files changed, 354 insertions(+), 7 deletions(-) create mode 100644 drivers/net/ethernet/netronome/nfp/crypto/ipsec.c create mode 100644 drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c diff --git a/drivers/net/ethernet/netronome/Kconfig b/drivers/net/ethernet/netronome/Kconfig index 8844d1ac053a..7f669d39e471 100644 --- a/drivers/net/ethernet/netronome/Kconfig +++ b/drivers/net/ethernet/netronome/Kconfig @@ -54,6 +54,17 @@ config NFP_APP_ABM_NIC functionality. Code will be built into the nfp.ko driver. +config NFP_NET_IPSEC + bool "NFP Ipsec offload support" + depends on NFP + depends on XFRM_OFFLOAD + default y + help + Enable driver support Ipsec offload on NFP NIC. Say Y, if + you are planning to make use of Ipsec offload. + NOTE that Ipsec offload on NFP Nic requires specific FW to + work. + config NFP_DEBUG bool "Debug support for Netronome(R) NFP4000/NFP6000 NIC drivers" depends on NFP diff --git a/drivers/net/ethernet/netronome/nfp/Makefile b/drivers/net/ethernet/netronome/nfp/Makefile index 9c0861d03634..3d33b2838e0d 100644 --- a/drivers/net/ethernet/netronome/nfp/Makefile +++ b/drivers/net/ethernet/netronome/nfp/Makefile @@ -80,4 +80,10 @@ nfp-objs += \ abm/main.o endif +ifeq ($(CONFIG_NFP_NET_IPSEC),y) +nfp-objs += \ + crypto/ipsec.o \ + nfd3/ipsec.o +endif + nfp-$(CONFIG_NFP_DEBUG) += nfp_net_debugfs.o diff --git a/drivers/net/ethernet/netronome/nfp/crypto/crypto.h b/drivers/net/ethernet/netronome/nfp/crypto/crypto.h index bffe58bb2f27..a27a378e3ebe 100644 --- a/drivers/net/ethernet/netronome/nfp/crypto/crypto.h +++ b/drivers/net/ethernet/netronome/nfp/crypto/crypto.h @@ -39,4 +39,39 @@ nfp_net_tls_rx_resync_req(struct net_device *netdev, } #endif +/* Ipsec related structures and functions */ +struct nfp_ipsec_offload { + u32 seq_hi; + u32 seq_low; + u32 handle; +}; + +#ifndef CONFIG_NFP_NET_IPSEC +static inline int nfp_net_ipsec_init(struct nfp_net *nn) +{ + return 0; +} + +static inline void nfp_net_ipsec_clean(struct nfp_net *nn) +{ +} + +static inline bool nfp_net_ipsec_tx_prep(struct nfp_net_dp *dp, struct sk_buff *skb, + struct nfp_ipsec_offload *offload_info) +{ + return false; +} + +static inline int nfp_net_ipsec_rx(struct nfp_meta_parsed *meta, struct sk_buff *skb) +{ + return 0; +} +#else +int nfp_net_ipsec_init(struct nfp_net *nn); +void nfp_net_ipsec_clean(struct nfp_net *nn); +bool nfp_net_ipsec_tx_prep(struct nfp_net_dp *dp, struct sk_buff *skb, + struct nfp_ipsec_offload *offload_info); +int nfp_net_ipsec_rx(struct nfp_meta_parsed *meta, struct sk_buff *skb); +#endif + #endif diff --git a/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c b/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c new file mode 100644 index 000000000000..658fcba8e733 --- /dev/null +++ b/drivers/net/ethernet/netronome/nfp/crypto/ipsec.c @@ -0,0 +1,216 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +/* Copyright (C) 2018 Netronome Systems, Inc */ +/* Copyright (C) 2021 Corigine, Inc */ + +#include +#include +#include +#include +#include +#include +#include + +#include "../nfp_net_ctrl.h" +#include "../nfp_net.h" +#include "crypto.h" + +#define NFP_NET_IPSEC_MAX_SA_CNT (16 * 1024) /* Firmware support a maximum of 16K sa offload */ +#define OFFLOAD_HANDLE_ERROR 0xffffffff + +/* IPSEC_CFG_MSSG_ADD_SA */ +struct nfp_ipsec_cfg_add_sa { + u32 ciph_key[8]; /* Cipher Key */ + union { + u32 auth_key[16]; /* Authentication Key */ + struct nfp_ipsec_aesgcm { /* AES-GCM-ESP fields */ + u32 salt; /* Initialized with sa */ + u32 iv[2]; /* Firmware use only */ + u32 cntr; + u32 zeros[4]; /* Init to 0 with sa */ + u32 len_a[2]; /* Firmware use only */ + u32 len_c[2]; + u32 spare0[4]; + } aesgcm_fields; + }; + struct sa_ctrl_word { + uint32_t hash :4; /* From nfp_ipsec_sa_hash_type */ + uint32_t cimode :4; /* From nfp_ipsec_sa_cipher_mode */ + uint32_t cipher :4; /* From nfp_ipsec_sa_cipher */ + uint32_t mode :2; /* From nfp_ipsec_sa_mode */ + uint32_t proto :2; /* From nfp_ipsec_sa_prot */ + uint32_t dir :1; /* Sa direction */ + uint32_t ena_arw:1; /* Anti-Replay Window */ + uint32_t ext_seq:1; /* 64-bit Sequence Num */ + uint32_t ext_arw:1; /* 64b Anti-Replay Window */ + uint32_t spare2 :9; /* Must be set to 0 */ + uint32_t encap_dsbl:1; /* Encap/decap disable */ + uint32_t gen_seq:1; /* Firmware Generate Seq */ + uint32_t spare8 :1; /* Must be set to 0 */ + } ctrl_word; + u32 spi; /* SPI Value */ + uint32_t pmtu_limit :16; /* PMTU Limit */ + uint32_t spare3 :1; + uint32_t frag_check :1; /* Stateful fragment checking flag */ + uint32_t bypass_DSCP:1; /* Bypass DSCP Flag */ + uint32_t df_ctrl :2; /* DF Control bits */ + uint32_t ipv6 :1; /* Outbound IPv6 addr format */ + uint32_t udp_enable :1; /* Add/Remove UDP header for NAT */ + uint32_t tfc_enable :1; /* Traffic Flow Confidentiality */ + uint32_t spare4 :8; + u32 soft_lifetime_byte_count; + u32 hard_lifetime_byte_count; + u32 src_ip[4]; /* Src IP addr */ + u32 dst_ip[4]; /* Dst IP addr */ + uint32_t natt_dst_port :16; /* NAT-T UDP Header dst port */ + uint32_t natt_src_port :16; /* NAT-T UDP Header src port */ + u32 soft_lifetime_time_limit; + u32 hard_lifetime_time_limit; + u32 sa_creation_time_lo_32; /* Ucode fills this in */ + u32 sa_creation_time_hi_32; /* Ucode fills this in */ + uint32_t reserved0 :16; + uint32_t tfc_padding :16; /* Traffic Flow Confidential Pad */ +}; + +struct nfp_net_ipsec_sa_data { + struct nfp_ipsec_cfg_add_sa nfp_sa; + struct xfrm_state *x; + int invalidated; +}; + +struct nfp_net_ipsec_data { + struct nfp_net_ipsec_sa_data sa_entries[NFP_NET_IPSEC_MAX_SA_CNT]; + unsigned int sa_free_stack[NFP_NET_IPSEC_MAX_SA_CNT]; + unsigned int sa_free_cnt; + struct mutex lock; /* Protects nfp_net_ipsec_data struct */ +}; + +static int nfp_net_xfrm_add_state(struct xfrm_state *x) +{ + return -EOPNOTSUPP; +} + +static void nfp_net_xfrm_del_state(struct xfrm_state *x) +{ +} + +static void nfp_net_xfrm_free_state(struct xfrm_state *x) +{ +} + +static bool nfp_net_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *x) +{ + return false; +} + +static const struct xfrmdev_ops nfp_net_ipsec_xfrmdev_ops = { + .xdo_dev_state_add = nfp_net_xfrm_add_state, + .xdo_dev_state_delete = nfp_net_xfrm_del_state, + .xdo_dev_state_free = nfp_net_xfrm_free_state, + .xdo_dev_offload_ok = nfp_net_ipsec_offload_ok, +}; + +int nfp_net_ipsec_init(struct nfp_net *nn) +{ + if (nn->cap_w1 & NFP_NET_CFG_CTRL_IPSEC) { + struct nfp_net_ipsec_data *ipd; + int i; + + nn->dp.netdev->xfrmdev_ops = &nfp_net_ipsec_xfrmdev_ops; + + ipd = kzalloc(sizeof(*ipd), GFP_KERNEL); + if (!ipd) + return -ENOMEM; + + for (i = 0; i < NFP_NET_IPSEC_MAX_SA_CNT; i++) + ipd->sa_free_stack[i] = NFP_NET_IPSEC_MAX_SA_CNT - i - 1; + + ipd->sa_free_cnt = NFP_NET_IPSEC_MAX_SA_CNT; + mutex_init(&ipd->lock); + nn->ipsec_data = ipd; + } + + return 0; +} + +void nfp_net_ipsec_clean(struct nfp_net *nn) +{ + if (!nn->ipsec_data) + return; + + mutex_destroy(&nn->ipsec_data->lock); + kfree(nn->ipsec_data); + nn->ipsec_data = NULL; +} + +bool nfp_net_ipsec_tx_prep(struct nfp_net_dp *dp, struct sk_buff *skb, + struct nfp_ipsec_offload *offload_info) +{ + struct xfrm_offload *xo = xfrm_offload(skb); + struct xfrm_state *x; + + if (!xo) + return false; + + x = xfrm_input_state(skb); + if (!x) + return false; + + if (x->xso.offload_handle == OFFLOAD_HANDLE_ERROR) { + nn_dp_warn(dp, "Invalid xfrm offload handle\n"); + return false; + } + + offload_info->seq_hi = xo->seq.hi; + offload_info->seq_low = xo->seq.low; + offload_info->handle = x->xso.offload_handle; + + return true; +} + +int nfp_net_ipsec_rx(struct nfp_meta_parsed *meta, struct sk_buff *skb) +{ + struct nfp_net_ipsec_sa_data *sa_data; + struct net_device *netdev = skb->dev; + struct nfp_net_ipsec_data *ipd; + struct xfrm_offload *xo; + struct nfp_net_dp *dp; + struct xfrm_state *x; + struct sec_path *sp; + struct nfp_net *nn; + int saidx; + + nn = netdev_priv(netdev); + ipd = nn->ipsec_data; + dp = &nn->dp; + + if (meta->ipsec_saidx == 0) + return 0; /* No offload took place */ + + saidx = meta->ipsec_saidx - 1; + if (saidx > NFP_NET_IPSEC_MAX_SA_CNT || saidx < 0) { + nn_dp_warn(dp, "Invalid SAIDX from NIC %d\n", saidx); + return -EINVAL; + } + + sa_data = &ipd->sa_entries[saidx]; + if (!sa_data->x) { + nn_dp_warn(dp, "Unused SAIDX from NIC %d\n", saidx); + return -EINVAL; + } + + x = sa_data->x; + xfrm_state_hold(x); + sp = secpath_set(skb); + if (unlikely(!sp)) { + nn_dp_warn(dp, "Failed to alloc secpath for RX offload\n"); + return -ENOMEM; + } + + sp->xvec[sp->len++] = x; + sp->olen++; + xo = xfrm_offload(skb); + xo->flags = CRYPTO_DONE; + xo->status = CRYPTO_SUCCESS; + + return 0; +} diff --git a/drivers/net/ethernet/netronome/nfp/nfd3/dp.c b/drivers/net/ethernet/netronome/nfp/nfd3/dp.c index 448c1c1afaee..db53e0392923 100644 --- a/drivers/net/ethernet/netronome/nfp/nfd3/dp.c +++ b/drivers/net/ethernet/netronome/nfp/nfd3/dp.c @@ -167,14 +167,18 @@ nfp_nfd3_tx_csum(struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec, u64_stats_update_end(&r_vec->tx_sync); } -static int nfp_nfd3_prep_tx_meta(struct nfp_net_dp *dp, struct sk_buff *skb, u64 tls_handle) +static int nfp_nfd3_prep_tx_meta(struct nfp_net_dp *dp, struct sk_buff *skb, + u64 tls_handle, bool *ipsec) { struct metadata_dst *md_dst = skb_metadata_dst(skb); + struct nfp_ipsec_offload offload_info; unsigned char *data; bool vlan_insert; u32 meta_id = 0; int md_bytes; + *ipsec = nfp_net_ipsec_tx_prep(dp, skb, &offload_info); + if (unlikely(md_dst || tls_handle)) { if (unlikely(md_dst && md_dst->type != METADATA_HW_PORT_MUX)) md_dst = NULL; @@ -182,13 +186,14 @@ static int nfp_nfd3_prep_tx_meta(struct nfp_net_dp *dp, struct sk_buff *skb, u64 vlan_insert = skb_vlan_tag_present(skb) && (dp->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2); - if (!(md_dst || tls_handle || vlan_insert)) + if (!(md_dst || tls_handle || vlan_insert || *ipsec)) return 0; md_bytes = sizeof(meta_id) + !!md_dst * NFP_NET_META_PORTID_SIZE + !!tls_handle * NFP_NET_META_CONN_HANDLE_SIZE + - vlan_insert * NFP_NET_META_VLAN_SIZE; + vlan_insert * NFP_NET_META_VLAN_SIZE + + *ipsec * NFP_NET_META_IPSEC_FIELD_SIZE; /* Ipsec has 12-bytes metadata */ if (unlikely(skb_cow_head(skb, md_bytes))) return -ENOMEM; @@ -218,6 +223,19 @@ static int nfp_nfd3_prep_tx_meta(struct nfp_net_dp *dp, struct sk_buff *skb, u64 meta_id <<= NFP_NET_META_FIELD_SIZE; meta_id |= NFP_NET_META_VLAN; } + if (*ipsec) { + /* The ipsec has three consecutive 4-bit ipsec Metadate types + * so ipsec has three 4-bytes of Metadata + */ + data -= NFP_NET_META_IPSEC_SIZE; + put_unaligned_be32(offload_info.seq_hi, data); + data -= NFP_NET_META_IPSEC_SIZE; + put_unaligned_be32(offload_info.seq_low, data); + data -= NFP_NET_META_IPSEC_SIZE; + put_unaligned_be32(offload_info.handle - 1, data); + meta_id <<= NFP_NET_META_IPSEC_FIELD_SIZE; + meta_id |= NFP_NET_META_IPSEC << 8 | NFP_NET_META_IPSEC << 4 | NFP_NET_META_IPSEC; + } data -= sizeof(meta_id); put_unaligned_be32(meta_id, data); @@ -246,6 +264,7 @@ netdev_tx_t nfp_nfd3_tx(struct sk_buff *skb, struct net_device *netdev) dma_addr_t dma_addr; unsigned int fsize; u64 tls_handle = 0; + bool ipsec = false; u16 qidx; dp = &nn->dp; @@ -273,7 +292,7 @@ netdev_tx_t nfp_nfd3_tx(struct sk_buff *skb, struct net_device *netdev) return NETDEV_TX_OK; } - md_bytes = nfp_nfd3_prep_tx_meta(dp, skb, tls_handle); + md_bytes = nfp_nfd3_prep_tx_meta(dp, skb, tls_handle, &ipsec); if (unlikely(md_bytes < 0)) goto err_flush; @@ -312,6 +331,8 @@ netdev_tx_t nfp_nfd3_tx(struct sk_buff *skb, struct net_device *netdev) txd->vlan = cpu_to_le16(skb_vlan_tag_get(skb)); } + if (ipsec) + nfp_nfd3_ipsec_tx(txd, skb); /* Gather DMA */ if (nr_frags > 0) { __le64 second_half; @@ -764,6 +785,12 @@ nfp_nfd3_parse_meta(struct net_device *netdev, struct nfp_meta_parsed *meta, return false; data += sizeof(struct nfp_net_tls_resync_req); break; +#ifdef CONFIG_NFP_NET_IPSEC + case NFP_NET_META_IPSEC: + meta->ipsec_saidx = get_unaligned_be32(data) + 1; + data += 4; + break; +#endif default: return true; } @@ -876,12 +903,11 @@ static int nfp_nfd3_rx(struct nfp_net_rx_ring *rx_ring, int budget) struct nfp_net_dp *dp = &r_vec->nfp_net->dp; struct nfp_net_tx_ring *tx_ring; struct bpf_prog *xdp_prog; + int idx, pkts_polled = 0; bool xdp_tx_cmpl = false; unsigned int true_bufsz; struct sk_buff *skb; - int pkts_polled = 0; struct xdp_buff xdp; - int idx; xdp_prog = READ_ONCE(dp->xdp_prog); true_bufsz = xdp_prog ? PAGE_SIZE : dp->fl_bufsz; @@ -1081,6 +1107,11 @@ static int nfp_nfd3_rx(struct nfp_net_rx_ring *rx_ring, int budget) continue; } + if (unlikely(nfp_net_ipsec_rx(&meta, skb))) { + nfp_nfd3_rx_drop(dp, r_vec, rx_ring, NULL, skb); + continue; + } + if (meta_len_xdp) skb_metadata_set(skb, meta_len_xdp); diff --git a/drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c b/drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c new file mode 100644 index 000000000000..f0d74d6b49d0 --- /dev/null +++ b/drivers/net/ethernet/netronome/nfp/nfd3/ipsec.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +/* Copyright (C) 2018 Netronome Systems, Inc */ +/* Copyright (C) 2021 Corigine, Inc */ + +#include + +#include "../nfp_net.h" +#include "nfd3.h" + +void nfp_nfd3_ipsec_tx(struct nfp_nfd3_tx_desc *txd, struct sk_buff *skb) +{ + struct xfrm_state *x; + + x = xfrm_input_state(skb); + if (x->xso.dev && (x->xso.dev->features & NETIF_F_HW_ESP_TX_CSUM)) { + txd->flags |= NFD3_DESC_TX_CSUM | NFD3_DESC_TX_IP4_CSUM | + NFD3_DESC_TX_TCP_CSUM | NFD3_DESC_TX_UDP_CSUM; + } +} diff --git a/drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h b/drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h index 7a0df9e6c3c4..9c1c10dcbaee 100644 --- a/drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h +++ b/drivers/net/ethernet/netronome/nfp/nfd3/nfd3.h @@ -103,4 +103,12 @@ void nfp_nfd3_rx_ring_fill_freelist(struct nfp_net_dp *dp, void nfp_nfd3_xsk_tx_free(struct nfp_nfd3_tx_buf *txbuf); int nfp_nfd3_xsk_poll(struct napi_struct *napi, int budget); +#ifndef CONFIG_NFP_NET_IPSEC +static inline void nfp_nfd3_ipsec_tx(struct nfp_nfd3_tx_desc *txd, struct sk_buff *skb) +{ +} +#else +void nfp_nfd3_ipsec_tx(struct nfp_nfd3_tx_desc *txd, struct sk_buff *skb); +#endif + #endif diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h index 0c3e7e2f856d..768539f12214 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h @@ -263,6 +263,10 @@ struct nfp_meta_parsed { u8 tpid; u16 tci; } vlan; + +#ifdef CONFIG_NFP_NET_IPSEC + u32 ipsec_saidx; +#endif }; struct nfp_net_rx_hash { @@ -584,6 +588,7 @@ struct nfp_net_dp { * @qcp_cfg: Pointer to QCP queue used for configuration notification * @tx_bar: Pointer to mapped TX queues * @rx_bar: Pointer to mapped FL/RX queues + * @ipsec_data: Ipsec Sa data * @tlv_caps: Parsed TLV capabilities * @ktls_tx_conn_cnt: Number of offloaded kTLS TX connections * @ktls_rx_conn_cnt: Number of offloaded kTLS RX connections @@ -672,6 +677,10 @@ struct nfp_net { u8 __iomem *tx_bar; u8 __iomem *rx_bar; +#ifdef CONFIG_NFP_NET_IPSEC + struct nfp_net_ipsec_data *ipsec_data; +#endif + struct nfp_net_tlv_caps tlv_caps; unsigned int ktls_tx_conn_cnt; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 7e4424d626a6..040c0c2aad80 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -2565,9 +2565,13 @@ int nfp_net_init(struct nfp_net *nn) if (err) return err; - err = nfp_net_tls_init(nn); + err = nfp_net_ipsec_init(nn); if (err) goto err_clean_mbox; + + err = nfp_net_tls_init(nn); + if (err) + goto err_clean_ipsec; } nfp_net_vecs_init(nn); @@ -2576,6 +2580,9 @@ int nfp_net_init(struct nfp_net *nn) return 0; return register_netdev(nn->dp.netdev); +err_clean_ipsec: + nfp_net_ipsec_clean(nn); + err_clean_mbox: nfp_ccm_mbox_clean(nn); return err; @@ -2591,6 +2598,7 @@ void nfp_net_clean(struct nfp_net *nn) return; unregister_netdev(nn->dp.netdev); + nfp_net_ipsec_clean(nn); nfp_ccm_mbox_clean(nn); nfp_net_reconfig_wait_posted(nn); } diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h index 80346c1c266b..fff05496152d 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h @@ -45,6 +45,7 @@ #define NFP_NET_META_CSUM 6 /* checksum complete type */ #define NFP_NET_META_CONN_HANDLE 7 #define NFP_NET_META_RESYNC_INFO 8 /* RX resync info request */ +#define NFP_NET_META_IPSEC 9 /* IPSec SA index for tx and rx */ #define NFP_META_PORT_ID_CTRL ~0U @@ -52,6 +53,8 @@ #define NFP_NET_META_VLAN_SIZE 4 #define NFP_NET_META_PORTID_SIZE 4 #define NFP_NET_META_CONN_HANDLE_SIZE 8 +#define NFP_NET_META_IPSEC_SIZE 4 +#define NFP_NET_META_IPSEC_FIELD_SIZE 12 /* Hash type pre-pended when a RSS hash was computed */ #define NFP_NET_RSS_NONE 0 #define NFP_NET_RSS_IPV4 1 @@ -260,6 +263,7 @@ */ #define NFP_NET_CFG_CTRL_WORD1 0x0098 #define NFP_NET_CFG_CTRL_PKT_TYPE (0x1 << 0) /* Pkttype offload */ +#define NFP_NET_CFG_CTRL_IPSEC (0x1 << 1) /* IPSec offload */ #define NFP_NET_CFG_CAP_WORD1 0x00a4