From patchwork Mon Sep 25 06:06:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 131882 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 955B942633; Mon, 25 Sep 2023 08:08:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C557F40DFD; Mon, 25 Sep 2023 08:07:55 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2111.outbound.protection.outlook.com [40.107.100.111]) by mails.dpdk.org (Postfix) with ESMTP id 05D1D40DDC for ; Mon, 25 Sep 2023 08:07:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A0hoh+Ox+uuZYpcJcmWs3iUqSmhm8M0TZJ3j3lDTyvjlzN7rqVCBaBC7b4htenZ+ecZoDPY/Sw/n537569CzAKKdzcMu5VEVRnvYX3xIdGpPS17SYIrRt99VpkiRWhIyOnYeRzO2SSzp493IUqsqf904QN5Y5eE+SfvE/328k7s8/kenSDU87XqqYoHdZujJvBiCjk+hDSVZPsNU1Y9Iq2f5exKJwmhX+CVvJQIHxoXPCws3UYir9qdmz1IZuYEVVgbSgBAgS1ljx2IcBEbRwpGlLOzygIKi/9XRkArWpfQANT0TwnwqmBZbZ52CYh+S3aDVRV5Fh0JCRkY3xrGNng== 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=+6+3Yk3DU9q1j1ZN/f7y+fw38q8tn1hJYDKz+Z4cEgM=; b=kEz0MetahBWH07vW6UURFyBbP//DjJqSVMOqylMmfw/BKi+ZDF+BzdpmLyzNAVgPKiXV/sfi7KC1/XK7bG89P9RVILWpgFeUBqKPwbjWkqgBkZpbmN/7y2AhKPnq9H8T77AECEhsaNVG1F9A5cyVh9fOM1R9RT5yyt/GBNEuZ+Mp2deQX94hFs3888HrvOuhyMIzwVBdbMWHQPiSyD/JiIPsEoivEYDLVXuauCzINCW+K6FM+VWni3emA1IJunVO+loBu97yLbHMLCj4Jn05/3zHspXiLgJcGC9KAF/ssNRWjAnToGWky6cedKmPyg4GqH4wez6XhwbRpvssg1BMdA== 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=+6+3Yk3DU9q1j1ZN/f7y+fw38q8tn1hJYDKz+Z4cEgM=; b=qtphr2j1ozb8bt+R+2iSBXf5ig+M/jP5DC7D40+eTVPZxKYz1Fbkeyl3MkuocVvzX1dnc9DMQOHN0v53fFlnWJ5IlF3md5aKNaj4+VSmDMn45BmmI9b5DVaoIV4FC32EO+Y7tMe0Ms89Ncu+3Th6OYjRvhcjdA0pPcHodIdxQ54= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by BY5PR13MB4487.namprd13.prod.outlook.com (2603:10b6:a03:1d4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Mon, 25 Sep 2023 06:07:52 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6792.026; Mon, 25 Sep 2023 06:07:52 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Shihong Wang , Chang Miao , Chaoyong He Subject: [PATCH 09/10] net/nfp: support IPsec Rx and Tx offload Date: Mon, 25 Sep 2023 14:06:43 +0800 Message-Id: <20230925060644.1458598-10-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230925060644.1458598-1-chaoyong.he@corigine.com> References: <20230925060644.1458598-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0001.namprd04.prod.outlook.com (2603:10b6:a03:1d0::11) To PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB5568:EE_|BY5PR13MB4487:EE_ X-MS-Office365-Filtering-Correlation-Id: 2141f0a5-a72f-4da6-29dc-08dbbd8dbfe9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2VJQ0AukP8ayLab9rWHJBV3H3p8E8c+cEYY3FTuy88A9NT3zSOwRbW3qqulYGPBdRsDpY3ICz24aQs/GH9bKekhP1UZ6CWgouvizyEQfoaGYpAFv080XP+jp2On+z89FEN7lohXhLJdYlEHrYYitU6F5j16dihPQrYpk8S8XPrLN3CZbOXGE1Eba+FLzzP6Xr6oTrf/LME4/FhH5gRSzMd8ix5C87i6dyNq8ZUY1Rsm2q2KG1T8R+USKVNvP5XF/bw7BQYTww2CXNZ5h7dUrouIG8yDWKkNK4E38JSbX7Amh+0v9/Xz/BxrpJjnSI3rhw1c7oulH81msHOCEdKNLvV/3Tsh8wo7HGh/6l6QfNI3a1A4+GFctDSPe7Dd6TwYfNXVva6YOInL8YXXlT+8VRTIejBnJzT/p1NQfrHENDYkF88pW7lW4lyK43BykQsPEm4/U8wJQWHITenZStb9miCGB199W2jKF2uQ789SgdnQGgJSZBqw5K/QI/QQoBtV2mhqx0NE4Mt3BEd5TS7qDA1tR+zwGWanU51FvAk+y87U2RLhnzOR+PA9FLX341SdKw9rYz75PL0Id3yv2UWZbJfgjS0mCQvy9ZrFKPxC4TI07rRiGwwVC5bu7j4KXKheiqgaqXyt4DsN2AQVHMuMAspCL2KZyEOWIeEfwSco6nEg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(346002)(396003)(376002)(136003)(39830400003)(230922051799003)(1800799009)(186009)(451199024)(6512007)(6486002)(6506007)(6666004)(52116002)(83380400001)(86362001)(38350700002)(38100700002)(36756003)(107886003)(1076003)(2616005)(26005)(44832011)(2906002)(30864003)(8936002)(8676002)(4326008)(41300700001)(66556008)(54906003)(66946007)(6916009)(316002)(66476007)(5660300002)(478600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wofXgMjj6T/OpwFxiwuUtGxBt+cdG8Tb0lVoFZX0nTPudWS45MHcYVpFk81PJ30euNTXDQXCLzO07nT86tVkxcFn2Uca0ibAtMo/LfY4fwbEo8DVBIUx5zdkeHPjw2nmG1YdWvuLu+UnAcAJClWFda279+yCOUPQXjc+8li22KimgEFgw6syC2NoIX8c9UXJ1pdayMO0q12FjlVc3uaK/xTRkn4+1X/qot0/osrmi653hjbu5VM7Fy6oA6uyxuo1mSQajOw6hiT7icoei+d+Jky2RhQZZpJeJLMX/eruA7G6V9g0BimGvjU5mDn2UMELctrB1cWJfDaPtzz/nOGD2V79drd7yhPtfRh6TFDQXradIjEV0L1cDTIl3dQAF6UcddwynwF6gq4rJrSK0BNwFpUw45qOpNvLG/Cv0A87bTmW0VxgXYBPURb/wE5vofcUrapD1UCYU4tbnnc8jHVlZzELbNF6XenZ7CebWZMDF53Uo2OaJ0R35oeJ9WicXZpGVdC5J5EzkkUs5c4Ple9cCqAPAFgMyoyryEtY9ekxn2nLQ9LjFs1WFluztalJW+yJd+yMS1ubpaO1N1BFDsMBDKIkps5gc/TgUsOZ1mrbaZgPavFgbv9wtm1ABkfqypvizSCBYkJRNZ0xsK1HX3yOY4t6pDq1sr/qFvTiFcCgiM+/QWa+LLKD7UwghSB0tagfVNd6dvG9LTrNfwB7m/pox4rIl4TzgT1pbcJJZrROaKxR5tdP0ftjdPahOE9FNyAGUenOBol17QSiQ0dm3jO2XC8HoR+Yn/zn2zkqj51Jb0Kq8lwJD7wElAf69Rltj63NVQ5xE8Kj5StdZe9khM+FiGVISXg46SYvCeBV7vW7Pm5a7YsCSJjm3jLRxbSjbaJTlkKXxWji79C8ARHJGUP+Mzp1Y6wLE9Qkcy3ZLWopRJSveQ6MKp0efwwAHqbmjmz9yISowMPsHG8XoJKE58bBKiyMUs1TIillhsP4ZR3GLDoYLK+/bcsRWG4ZbXcgmbGFRjfH9asw/Z1guBJ+4v5KIsgFaZDdAxWO67cMyFHqVl3eKYmSnBX81H1qnFGdbOqPGcXn5phaLGAxNgcwIYDHRsYIT+YKC4hB7vlTEslRPCTNaJQjPZ9NM02BTPbYH1b0kmSNsapU/GNXOSty9hcr1Zc81fB9q6u96dnpmZFyfxIDDM5aNZavpGCBrORgxsddzYu43vD/g/23PF2IDjzqAxRhm5W4aUka8ToJt64dif7Dayp1fu/f/pl8Dx8AVVn4cStNhIDaJ2x2NRBzR9QBBwhn5X5z9YiSb77Nr0rmUK3lw/m/M9gkDYzH+RqYNKoZhceSniekMAKeoIfNqpV1lAP624wgxi57k0aMMWV/sgY480og8Xv+3KjPf2x/KOnJ/YQiDzapDYx9jsEyGBGQLwBtS4suXUy/8t1CswlEGABq5/wZD+d13ZSntXG7uy9cdtZzt8QcVwX9oXmm0Osz7yMqNsIngBBeMo291uJb4vyyHQ/6fJXuAtNXqiPFsAgmluNOG0QLuVWj2k0tYkruae3UOk6jjHEikcPCxq3oQ6NCgPuzixyN24ckMV7YNN/9IfphQycB4YGtVC9vi9jNZA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2141f0a5-a72f-4da6-29dc-08dbbd8dbfe9 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB5568.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2023 06:07:52.4056 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cDfdKYyPG5wuQpdkDBvdnVGl7KKHcTFnw+YTeu0fb18/aD18BBjSXgr2f1WRf3SSkZCmfv+s2eHTwPS+2Zbr2eYSwJTubiwKnu5FSK4eYH4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR13MB4487 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Shihong Wang The Rx path checks the ipsec metadata and base on the crypto status sets ol_flags in the rte_mbuf. The Tx path write IPsec message to mbuf metadata based on mbuf dynamic field. Signed-off-by: Shihong Wang Signed-off-by: Chang Miao Reviewed-by: Chaoyong He --- doc/guides/nics/nfp.rst | 31 +++++++++++++ drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 24 ++++++++++ drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 24 ++++++++++ drivers/net/nfp/nfp_ctrl.h | 1 + drivers/net/nfp/nfp_ipsec.c | 42 +++++++++++++++++ drivers/net/nfp/nfp_ipsec.h | 6 +++ drivers/net/nfp/nfp_rxtx.c | 74 ++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_rxtx.h | 5 ++ 8 files changed, 207 insertions(+) diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 456a22dcbc..fee1860f4a 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -348,6 +348,18 @@ Metadata with L2 (1W/4B) The vlan[0] is the innermost VLAN The vlan[1] is the QinQ info +NFP_NET_META_IPSEC +The IPsec type requires 4 bit. +The SA index value is 32 bit which need 1 data field. +:: + + ---------------------------------------------------------------- + 3 2 1 0 + 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | sa_idx | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + TX ~~ @@ -363,3 +375,22 @@ NFP_NET_META_VLAN ^ ^ NOTE: | TCI | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +NFP_NET_META_IPSEC +The IPsec type requires 12 bit, because it requires three data fields. +:: + + ---------------------------------------------------------------- + 3 2 1 0 + 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | sa_idx | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | nfp_ipsec_force_seq_low | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | nfp_ipsec_force_seq_hi | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + The sa_idx is 32 bit which need 1 data field. + The nfp_ipsec_force_seq_low & nfp_ipsec_force_seq_hi is Anti-re-anti-count, + which is 64 bit need two data fields. diff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c index ab0747fc16..64928254d8 100644 --- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c +++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c @@ -147,10 +147,13 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, char *meta; uint8_t layer = 0; uint32_t meta_info; + uint32_t cap_extend; struct nfp_net_hw *hw; uint8_t vlan_layer = 0; + uint8_t ipsec_layer = 0; hw = txq->hw; + cap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1); if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 && (hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) { @@ -160,6 +163,18 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, meta_data->header |= NFP_NET_META_VLAN; } + if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 && + (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) { + uint32_t ipsec_type = NFP_NET_META_IPSEC | + NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE | + NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE); + if (meta_data->length == 0) + meta_data->length = NFP_NET_META_FIELD_SIZE; + uint8_t ipsec_offset = meta_data->length - NFP_NET_META_FIELD_SIZE; + meta_data->header |= (ipsec_type << ipsec_offset); + meta_data->length += 3 * NFP_NET_META_FIELD_SIZE; + } + if (meta_data->length == 0) return; @@ -180,6 +195,15 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data, nfp_net_set_meta_vlan(meta_data, pkt, layer); vlan_layer++; break; + case NFP_NET_META_IPSEC: + if (ipsec_layer > 2) { + PMD_DRV_LOG(ERR, "At most 3 layers of ipsec is supported for now."); + return; + } + + nfp_net_set_meta_ipsec(meta_data, txq, pkt, layer, ipsec_layer); + ipsec_layer++; + break; default: PMD_DRV_LOG(ERR, "The metadata type not supported"); return; diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c index a85734f121..d4bd5edb0a 100644 --- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c +++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c @@ -177,13 +177,16 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, char *meta; uint8_t layer = 0; uint32_t meta_type; + uint32_t cap_extend; struct nfp_net_hw *hw; uint32_t header_offset; uint8_t vlan_layer = 0; + uint8_t ipsec_layer = 0; struct nfp_net_meta_raw meta_data; memset(&meta_data, 0, sizeof(meta_data)); hw = txq->hw; + cap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1); if ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 && (hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) { @@ -193,6 +196,18 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, meta_data.header |= NFP_NET_META_VLAN; } + if ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 && + (cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) { + uint32_t ipsec_type = NFP_NET_META_IPSEC | + NFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE | + NFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE); + if (meta_data.length == 0) + meta_data.length = NFP_NET_META_FIELD_SIZE; + uint8_t ipsec_offset = meta_data.length - NFP_NET_META_FIELD_SIZE; + meta_data.header |= (ipsec_type << ipsec_offset); + meta_data.length += 3 * NFP_NET_META_FIELD_SIZE; + } + if (meta_data.length == 0) return; @@ -215,6 +230,15 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt, nfp_net_set_meta_vlan(&meta_data, pkt, layer); vlan_layer++; break; + case NFP_NET_META_IPSEC: + if (ipsec_layer > 2) { + PMD_DRV_LOG(ERR, "At most 3 layers of ipsec is supported for now."); + return; + } + + nfp_net_set_meta_ipsec(&meta_data, txq, pkt, layer, ipsec_layer); + ipsec_layer++; + break; default: PMD_DRV_LOG(ERR, "The metadata type not supported"); return; diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h index 361739a4b9..3488df6ba8 100644 --- a/drivers/net/nfp/nfp_ctrl.h +++ b/drivers/net/nfp/nfp_ctrl.h @@ -39,6 +39,7 @@ #define NFP_NET_META_HASH 1 /* next field carries hash type */ #define NFP_NET_META_VLAN 4 #define NFP_NET_META_PORTID 5 +#define NFP_NET_META_IPSEC 9 #define NFP_META_PORT_ID_CTRL ~0U diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c index eb5b1d88d5..b11b1c9df3 100644 --- a/drivers/net/nfp/nfp_ipsec.c +++ b/drivers/net/nfp/nfp_ipsec.c @@ -1161,6 +1161,47 @@ nfp_crypto_update_session(void *device __rte_unused, return 0; } +static int +nfp_security_set_pkt_metadata(void *device, + struct rte_security_session *session, + struct rte_mbuf *m, + void *params) +{ + int offset; + uint64_t *sqn; + struct nfp_net_hw *hw; + struct rte_eth_dev *eth_dev; + struct nfp_ipsec_session *priv_session; + + sqn = params; + eth_dev = device; + priv_session = SECURITY_GET_SESS_PRIV(session); + hw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); + + if (priv_session->ipsec.direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) { + struct nfp_tx_ipsec_desc_msg *desc_md; + + offset = hw->ipsec_data->pkt_dynfield_offset; + desc_md = RTE_MBUF_DYNFIELD(m, offset, struct nfp_tx_ipsec_desc_msg *); + + if (priv_session->msg.ctrl_word.ext_seq != 0 && sqn != NULL) { + desc_md->esn.low = rte_cpu_to_be_32(*sqn); + desc_md->esn.hi = rte_cpu_to_be_32(*sqn >> 32); + } else if (priv_session->msg.ctrl_word.ext_seq != 0) { + desc_md->esn.low = rte_cpu_to_be_32(priv_session->ipsec.esn.low); + desc_md->esn.hi = rte_cpu_to_be_32(priv_session->ipsec.esn.hi); + } else { + desc_md->esn.low = rte_cpu_to_be_32(priv_session->ipsec.esn.value); + desc_md->esn.hi = 0; + } + + desc_md->enc = 1; + desc_md->sa_idx = rte_cpu_to_be_32(priv_session->sa_index); + } + + return 0; +} + /** * Get discards packet statistics for each SA * @@ -1255,6 +1296,7 @@ static const struct rte_security_ops nfp_security_ops = { .session_update = nfp_crypto_update_session, .session_get_size = nfp_security_session_get_size, .session_stats_get = nfp_security_session_get_stats, + .set_pkt_metadata = nfp_security_set_pkt_metadata, .capabilities_get = nfp_crypto_capabilities_get, }; diff --git a/drivers/net/nfp/nfp_ipsec.h b/drivers/net/nfp/nfp_ipsec.h index 531bc60c5a..cacb05f13e 100644 --- a/drivers/net/nfp/nfp_ipsec.h +++ b/drivers/net/nfp/nfp_ipsec.h @@ -163,6 +163,12 @@ struct nfp_net_ipsec_data { struct nfp_ipsec_session *sa_entries[NFP_NET_IPSEC_MAX_SA_CNT]; }; +enum nfp_ipsec_meta_layer { + NFP_IPSEC_META_SAIDX, /**< Order of SA index in metadata */ + NFP_IPSEC_META_SEQLOW, /**< Order of Sequence Number (low 32bits) in metadata */ + NFP_IPSEC_META_SEQHI, /**< Order of Sequence Number (high 32bits) in metadata */ +}; + int nfp_ipsec_init(struct rte_eth_dev *dev); void nfp_ipsec_uninit(struct rte_eth_dev *dev); diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index e74aba7439..66a5d6cb3a 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -8,11 +8,13 @@ #include "nfp_rxtx.h" #include +#include #include "nfd3/nfp_nfd3.h" #include "nfdk/nfp_nfdk.h" #include "flower/nfp_flower.h" +#include "nfp_ipsec.h" #include "nfp_logs.h" /* Maximum number of supported VLANs in parsed form packet metadata. */ @@ -25,8 +27,10 @@ * read-only after it have been recorded during parsing by nfp_net_parse_meta(). * * @port_id: Port id value + * @sa_idx: IPsec SA index * @hash: RSS hash value * @hash_type: RSS hash type + * @ipsec_type: IPsec type * @vlan_layer: The layers of VLAN info which are passed from nic. * Only this number of entries of the @vlan array are valid. * @@ -44,8 +48,10 @@ */ struct nfp_meta_parsed { uint32_t port_id; + uint32_t sa_idx; uint32_t hash; uint8_t hash_type; + uint8_t ipsec_type; uint8_t vlan_layer; struct { uint8_t offload; @@ -304,6 +310,10 @@ nfp_net_parse_chained_meta(uint8_t *meta_base, meta->vlan[meta->vlan_layer].tpid = NFP_NET_META_TPID(vlan_info); ++meta->vlan_layer; break; + case NFP_NET_META_IPSEC: + meta->sa_idx = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset); + meta->ipsec_type = meta_info & NFP_NET_META_FIELD_MASK; + break; default: /* Unsupported metadata can be a performance issue */ return false; @@ -429,6 +439,39 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta, mb->ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED; } +/* + * Set mbuf IPsec Offload features based on metadata info. + * + * The IPsec Offload features is prepended to the mbuf ol_flags. + * Extract and decode metadata info and set the mbuf ol_flags. + */ +static void +nfp_net_parse_meta_ipsec(struct nfp_meta_parsed *meta, + struct nfp_net_rxq *rxq, + struct rte_mbuf *mbuf) +{ + int offset; + uint32_t sa_idx; + struct nfp_net_hw *hw; + struct nfp_tx_ipsec_desc_msg *desc_md; + + hw = rxq->hw; + sa_idx = meta->sa_idx; + + if (meta->ipsec_type != NFP_NET_META_IPSEC) + return; + + if (sa_idx >= NFP_NET_IPSEC_MAX_SA_CNT) { + mbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED; + } else { + mbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD; + offset = hw->ipsec_data->pkt_dynfield_offset; + desc_md = RTE_MBUF_DYNFIELD(mbuf, offset, struct nfp_tx_ipsec_desc_msg *); + desc_md->sa_idx = sa_idx; + desc_md->enc = 0; + } +} + /* nfp_net_parse_meta() - Parse the metadata from packet */ static void nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, @@ -453,6 +496,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, nfp_net_parse_meta_hash(meta, rxq, mb); nfp_net_parse_meta_vlan(meta, rxds, rxq, mb); nfp_net_parse_meta_qinq(meta, rxq, mb); + nfp_net_parse_meta_ipsec(meta, rxq, mb); } else { PMD_RX_LOG(DEBUG, "RX chained metadata format is wrong!"); } @@ -1035,6 +1079,36 @@ nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, meta_data->data[layer] = rte_cpu_to_be_32(tpid << 16 | vlan_tci); } +void +nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, + struct nfp_net_txq *txq, + struct rte_mbuf *pkt, + uint8_t layer, + uint8_t ipsec_layer) +{ + int offset; + struct nfp_net_hw *hw; + struct nfp_tx_ipsec_desc_msg *desc_md; + + hw = txq->hw; + offset = hw->ipsec_data->pkt_dynfield_offset; + desc_md = RTE_MBUF_DYNFIELD(pkt, offset, struct nfp_tx_ipsec_desc_msg *); + + switch (ipsec_layer) { + case NFP_IPSEC_META_SAIDX: + meta_data->data[layer] = desc_md->sa_idx; + break; + case NFP_IPSEC_META_SEQLOW: + meta_data->data[layer] = desc_md->esn.low; + break; + case NFP_IPSEC_META_SEQHI: + meta_data->data[layer] = desc_md->esn.hi; + break; + default: + break; + } +} + int nfp_net_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 4e8558074e..3c7138f7d6 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -257,5 +257,10 @@ int nfp_net_tx_free_bufs(struct nfp_net_txq *txq); void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data, struct rte_mbuf *pkt, uint8_t layer); +void nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data, + struct nfp_net_txq *txq, + struct rte_mbuf *pkt, + uint8_t layer, + uint8_t ipsec_layer); #endif /* _NFP_RXTX_H_ */