Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132174/?format=api
{ "id": 132174, "url": "http://patchwork.dpdk.org/api/patches/132174/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230929020810.1219391-9-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230929020810.1219391-9-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230929020810.1219391-9-chaoyong.he@corigine.com", "date": "2023-09-29T02:08:09", "name": "[v3,8/9] net/nfp: support IPsec Rx and Tx offload", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "fd30b28e70b0764e54388e227e68d995636f0e1f", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230929020810.1219391-9-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29689, "url": "http://patchwork.dpdk.org/api/series/29689/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29689", "date": "2023-09-29T02:08:01", "name": "add the support of ipsec offload", "version": 3, "mbox": "http://patchwork.dpdk.org/series/29689/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132174/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/132174/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BD3D642668;\n\tFri, 29 Sep 2023 04:09:37 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 08FD540A8B;\n\tFri, 29 Sep 2023 04:08:53 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2103.outbound.protection.outlook.com [40.107.220.103])\n by mails.dpdk.org (Postfix) with ESMTP id 03BAE402EE\n for <dev@dpdk.org>; Fri, 29 Sep 2023 04:08:51 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by CO3PR13MB5687.namprd13.prod.outlook.com (2603:10b6:303:17a::17)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.19; Fri, 29 Sep\n 2023 02:08:49 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::28c0:63e2:ecd1:9314]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::28c0:63e2:ecd1:9314%4]) with mapi id 15.20.6813.027; Fri, 29 Sep 2023\n 02:08:49 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=jQVER+rQ75irziX9flHkKCgyS+r5wF89TyXRz6PxnachcoZUovSn0eYmGashbJ2qnno9y8OzUuCURDBJ1V39TZ4RXVBQ6jNrVF+IXUs03VYQY06TnJX3nrWhFjpQvWzpShawlmbKKqC7LNv1XjSQRJinB+S5dqsAITSabrv0WNjkGePzPTc4ccNQOVKeVQ4M6UbACytKBmamD9GJrOsF0L/5/IRipvFhb74IgpddChQ7XHoO3RS3+7zV5SEL+AXtCtbj/l3cJKOey4ScyvZ+Srxvh6BSkG0OM8sgwARbskgYnQg2X6SFzPFumjfQwbHQLar+joCr0+Zo5z5MOsTyIg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=FkpSVVw1+k7HsRCGkHUOYtnnSOG2Vk+IX5nnw/JnEq4=;\n b=l98oBA6X0hFGbZpkNKGQQ/nzrP2G/tLge8NA8Hh5VlcO3REq0+uKeAYl+3S1lbnQdtdI6tYLorSPFnpg2NED1hEAqhSrZ4lKroKmG9et3eAnYWp3FB2FUpLV801/cIO0RnorOf8lhqvs4oFJtoTzO3rv4IYUdZ3NsmhZY/HWNcPizIjTm3sv1fs2oMLDo7aZNoQqGn0ef2/GIRrRyvIQRa4ZzHiHp2jtZViyS01UBpXsNz0G47CgxieIIuJzKYDMhRyMkhikPgCjLPGlLefq5GdfZWTKS/cF8TEI/cc3xpRcWMRb0Wm9XwmBI+SMxaFqPvnJqdrHPcZsX49l24Osvw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=FkpSVVw1+k7HsRCGkHUOYtnnSOG2Vk+IX5nnw/JnEq4=;\n b=RZ4U+cguSkjjSYOfot3Xan1JkorHqmcLvdjiN0+sk9FxVEoKVSxxAi175wpL+8TP6F0T5Vr9bKiVLOt0yRPCDJZgGezBFKIM2nNtAwJi5h3UMCTQDA4+Z/l2tg5weqmaPTIV6b+iVxw7JQKAuENZ8lr3i6wdxU16RUQPI5wN+Nc=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, Shihong Wang <shihong.wang@corigine.com>,\n Chang Miao <chang.miao@corigine.com>,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH v3 8/9] net/nfp: support IPsec Rx and Tx offload", "Date": "Fri, 29 Sep 2023 10:08:09 +0800", "Message-Id": "<20230929020810.1219391-9-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230929020810.1219391-1-chaoyong.he@corigine.com>", "References": "<20230926024959.207098-1-chaoyong.he@corigine.com>\n <20230929020810.1219391-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "PH8PR07CA0028.namprd07.prod.outlook.com\n (2603:10b6:510:2cf::23) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|CO3PR13MB5687:EE_", "X-MS-Office365-Filtering-Correlation-Id": "a825edbe-3f6a-45d0-8554-08dbc09104ec", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n m6Ie4t6LTk5aJSA2ZNepeiCfX/erfN047+DvS0jqjK3x6CRzXPQEPn5Blw43ADoCknJ63ynTzeq5hVRcvSqzKf/Th9OKHKxhAW9RoHwHKSNmrz/rvASu73nZgaoczIRFy4Hf6COvEsjZDpvUurqitQui27K1aiHPE5GI2I1CEccrgqf1IZrZO2nj9ez9le80EEGnzuXsgQ8qC56j04vROurtGpaYyhKy7CplfV1E4fR2P9rFJwJPl6CBjOqqI5xr0pUu0bet2C0svjx7xk3jtaFLtjYdp1qIsvTWzv44npc3i1M7fv0vMCcEW6fWJ9TJVTm3QlgINZ6unTW26uGllCU2rjwQU2gGO9k2GZz2Mju6yrGEq/MmG9se32UKX8/rxThzzmVwNU++vTJZWDPcfBrAtq/nBw9rBoKrDJC2HcDTi4mpAuq+s8OxmV1OpykZ6x+NcIwoAKRNgGKLs7tttImYZcbq24H/Ybnd5vndH/fJBeanbIH4ls3yMzWuuKwW0UlOSiihiGDyQK1MmuWb/PDvagSGkU/lXfo2+epmbHmA5xbFOaKMFlDpPUuYV38rDoJ1uow6o8wF8GD4UZGxEmrILyK4yqOnCtrrmVI+Go+j8QB/7Y8Gae31TOtT6BWgn9UnvTwRFAniRPliX51p7Op12HuatAzwLBR2ClVMooY=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(346002)(366004)(396003)(376002)(39830400003)(136003)(230922051799003)(451199024)(1800799009)(64100799003)(186009)(30864003)(2906002)(6916009)(316002)(54906003)(66946007)(66556008)(66476007)(44832011)(8936002)(8676002)(4326008)(41300700001)(5660300002)(2616005)(83380400001)(107886003)(1076003)(26005)(36756003)(86362001)(38100700002)(38350700002)(52116002)(6666004)(478600001)(6486002)(6512007)(6506007);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n ztr89HDfornT+iVJMCzGEwneYnx5ytbs+wjGG2gVRUKjTkYlbQ+jbbi2PGXktfPEasKgUhTr+qedHFmKbCpIPViCtcPRikP7/NwGaRIemb7ncuWr0F35dvWUTp6D7N7uteKzbR0Go/ost1QqWS622EYt9LTvK5wKl7ehigFAKI5rTN8W4emtTGsjkgurJPV7vHjLhpKzCQQJsMglW9sHltFK8bPljCCQdj9vhfG+WIh+K2Fc0TVIqoHBr6QbFkifJVT+DQ1pkX6Ge0HS0m83DcQnXSX1JPK/jcmO4jQmXUSuGrckGBBoRjVnThJ0lLWtiy9uAvsTJ16CA7vvT8nvrzSo+3SB8QsaaAW5yUR6/Fx1WXfAxxZmVv8+DnBhee/7mflqV8x6s98A9fMphoUbt/4/PUNhgBvgDKF7gN8XlL0XgLWlo7qmys4PewPjnZ6GsW+FDgqgF3kSCjCKoQfarvDD9I+Ay2lzYlQonEN2TjvLO/YuLOlCcqLEvZWHLIS4N9KhSwo3v9uPdSiBEbkZeHIaQS38ec3bS6U+6BFAkuO5NMcjEmKdqWWf5wYQAFaFPTe9uhQqAfrPqyO9gwKBAaDR0jXwa55Ns+AVN7H/hXlHFndkyNFmOCRMtE1efbGYY4+iRc04tmGgmFiftMFhjCMpg0izpHUpH+J6u/9ulYPzlFvArwr2qsR52BBpoBtkTFKoXFUCQMuGRE8bLdQTXIzd4I0Fga6miaQBYtT3hEDls2gfIWvPTwHXQnjZ67stGyJ9AttmgMU8kPKW2UTBEm52iXeGNRmAQg4wM+hFNdlOTd4Nh5oTpTLFZqJAGy5/NXDrYGc/5u9w2RH8XR0hfran5m2BbJ1ctbk9jhDZQ8wrf9NlECKcy9htX6N6xFq4aaUVP8v+j5MZby/ILdjPrAn9tNwvM7MXmXOYDcCpcV11ZsIeLoED96Dtq+UJnRdgZkXT7Db3bMQRNREa8o7mKneJNUAGOv8+S+MKhFUFpkQPtKd1+4l3bUQR1LScO96pSbWUXtHvT6BiwMfO61zpC2y2y2f6F01N7wQRP8d/WW0c541rCNDi1XtDAE+wXwihHwX7WS85OttaPIQPwGd4Jc+AzrYd6bPXJATX2RM6HKvO59tjhunRy1NoL851eMGmIv3fxht/U9KnrSoJHqgddKpiiWMeNXMp6wnrd46XGTwL9M2zmWXdkwcqrFlfGf3/wj0FYeVwHIcIXtMs3GQVoDlWaV7YhUa+ib693hpxvRDgt9ySd4lXWa25khHqgLSelt8g8EPw1VYYSh+evxiMfvGDeWDgJFxiynct4EdzrLQgsM4n/thSiDdpq3ZXwF0MlG0bkUPBFHW8lOrTUnduD03lCDNYjSI+iEvl7fsSdmaUGcrSMONL+BxVQXDRyYpr/2EacSMalnAUYcAqnWxH27Nc6gDMKj5EG0Li6DqYUcrGPg4XftW5ytq+w+hEIkHYysKgHL4hKJE4vZdZVdCzAei6p1DGF/r+uA6BGxq+eeT/eOlNV7G7a3SS8FMla+ajQw+05C8bl8ulcSRxQjG03KQEl0sGjFWWn3wPAvXXrHLTq75F2C7MQgHKVCFM/4fh7Oqesyy33h5vgWvOca+5zA==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n a825edbe-3f6a-45d0-8554-08dbc09104ec", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "29 Sep 2023 02:08:49.1287 (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": "\n zP4lT2GFw/UopN1/KZZRWl/VyxlKl8wMFRifSX4F8COdJqsOzJ2vzqqcyuqqWMiTWunRUrBttO0gAc5bseKGm9qs4MEq5TWH+on/zQKR1fY=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CO3PR13MB5687", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Shihong Wang <shihong.wang@corigine.com>\n\nThe Rx path checks the ipsec metadata and base on the\ncrypto status sets ol_flags in the rte_mbuf.\n\nThe Tx path write IPsec message to mbuf metadata based\non mbuf dynamic field.\n\nSigned-off-by: Shihong Wang <shihong.wang@corigine.com>\nSigned-off-by: Chang Miao <chang.miao@corigine.com>\nReviewed-by: Chaoyong He <chaoyong.he@corigine.com>\n---\n doc/guides/nics/nfp.rst | 31 +++++++++++++\n drivers/net/nfp/nfd3/nfp_nfd3_dp.c | 24 ++++++++++\n drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 24 ++++++++++\n drivers/net/nfp/nfp_ctrl.h | 1 +\n drivers/net/nfp/nfp_ipsec.c | 42 +++++++++++++++++\n drivers/net/nfp/nfp_ipsec.h | 6 +++\n drivers/net/nfp/nfp_rxtx.c | 74 ++++++++++++++++++++++++++++++\n drivers/net/nfp/nfp_rxtx.h | 5 ++\n 8 files changed, 207 insertions(+)", "diff": "diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst\nindex 456a22dcbc..fee1860f4a 100644\n--- a/doc/guides/nics/nfp.rst\n+++ b/doc/guides/nics/nfp.rst\n@@ -348,6 +348,18 @@ Metadata with L2 (1W/4B)\n The vlan[0] is the innermost VLAN\n The vlan[1] is the QinQ info\n \n+NFP_NET_META_IPSEC\n+The IPsec type requires 4 bit.\n+The SA index value is 32 bit which need 1 data field.\n+::\n+\n+ ----------------------------------------------------------------\n+ 3 2 1 0\n+ 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\n+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ | sa_idx |\n+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+\n TX\n ~~\n \n@@ -363,3 +375,22 @@ NFP_NET_META_VLAN\n ^ ^\n NOTE: | TCI |\n +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+\n+NFP_NET_META_IPSEC\n+The IPsec type requires 12 bit, because it requires three data fields.\n+::\n+\n+ ----------------------------------------------------------------\n+ 3 2 1 0\n+ 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\n+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ | sa_idx |\n+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ | nfp_ipsec_force_seq_low |\n+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ | nfp_ipsec_force_seq_hi |\n+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+\n+ The sa_idx is 32 bit which need 1 data field.\n+ The nfp_ipsec_force_seq_low & nfp_ipsec_force_seq_hi is Anti-re-anti-count,\n+ which is 64 bit need two data fields.\ndiff --git a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\nindex ab0747fc16..64928254d8 100644\n--- a/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n+++ b/drivers/net/nfp/nfd3/nfp_nfd3_dp.c\n@@ -147,10 +147,13 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data,\n \tchar *meta;\n \tuint8_t layer = 0;\n \tuint32_t meta_info;\n+\tuint32_t cap_extend;\n \tstruct nfp_net_hw *hw;\n \tuint8_t vlan_layer = 0;\n+\tuint8_t ipsec_layer = 0;\n \n \thw = txq->hw;\n+\tcap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1);\n \n \tif ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&\n \t\t\t(hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {\n@@ -160,6 +163,18 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data,\n \t\tmeta_data->header |= NFP_NET_META_VLAN;\n \t}\n \n+\tif ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 &&\n+\t\t\t(cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) {\n+\t\tuint32_t ipsec_type = NFP_NET_META_IPSEC |\n+\t\t\t\tNFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE |\n+\t\t\t\tNFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE);\n+\t\tif (meta_data->length == 0)\n+\t\t\tmeta_data->length = NFP_NET_META_FIELD_SIZE;\n+\t\tuint8_t ipsec_offset = meta_data->length - NFP_NET_META_FIELD_SIZE;\n+\t\tmeta_data->header |= (ipsec_type << ipsec_offset);\n+\t\tmeta_data->length += 3 * NFP_NET_META_FIELD_SIZE;\n+\t}\n+\n \tif (meta_data->length == 0)\n \t\treturn;\n \n@@ -180,6 +195,15 @@ nfp_net_nfd3_set_meta_data(struct nfp_net_meta_raw *meta_data,\n \t\t\tnfp_net_set_meta_vlan(meta_data, pkt, layer);\n \t\t\tvlan_layer++;\n \t\t\tbreak;\n+\t\tcase NFP_NET_META_IPSEC:\n+\t\t\tif (ipsec_layer > 2) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"At most 3 layers of ipsec is supported for now.\");\n+\t\t\t\treturn;\n+\t\t\t}\n+\n+\t\t\tnfp_net_set_meta_ipsec(meta_data, txq, pkt, layer, ipsec_layer);\n+\t\t\tipsec_layer++;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tPMD_DRV_LOG(ERR, \"The metadata type not supported\");\n \t\t\treturn;\ndiff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\nindex a85734f121..d4bd5edb0a 100644\n--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c\n@@ -177,13 +177,16 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,\n \tchar *meta;\n \tuint8_t layer = 0;\n \tuint32_t meta_type;\n+\tuint32_t cap_extend;\n \tstruct nfp_net_hw *hw;\n \tuint32_t header_offset;\n \tuint8_t vlan_layer = 0;\n+\tuint8_t ipsec_layer = 0;\n \tstruct nfp_net_meta_raw meta_data;\n \n \tmemset(&meta_data, 0, sizeof(meta_data));\n \thw = txq->hw;\n+\tcap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1);\n \n \tif ((pkt->ol_flags & RTE_MBUF_F_TX_VLAN) != 0 &&\n \t\t\t(hw->ctrl & NFP_NET_CFG_CTRL_TXVLAN_V2) != 0) {\n@@ -193,6 +196,18 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,\n \t\tmeta_data.header |= NFP_NET_META_VLAN;\n \t}\n \n+\tif ((pkt->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD) != 0 &&\n+\t\t\t(cap_extend & NFP_NET_CFG_CTRL_IPSEC) != 0) {\n+\t\tuint32_t ipsec_type = NFP_NET_META_IPSEC |\n+\t\t\t\tNFP_NET_META_IPSEC << NFP_NET_META_FIELD_SIZE |\n+\t\t\t\tNFP_NET_META_IPSEC << (2 * NFP_NET_META_FIELD_SIZE);\n+\t\tif (meta_data.length == 0)\n+\t\t\tmeta_data.length = NFP_NET_META_FIELD_SIZE;\n+\t\tuint8_t ipsec_offset = meta_data.length - NFP_NET_META_FIELD_SIZE;\n+\t\tmeta_data.header |= (ipsec_type << ipsec_offset);\n+\t\tmeta_data.length += 3 * NFP_NET_META_FIELD_SIZE;\n+\t}\n+\n \tif (meta_data.length == 0)\n \t\treturn;\n \n@@ -215,6 +230,15 @@ nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,\n \t\t\tnfp_net_set_meta_vlan(&meta_data, pkt, layer);\n \t\t\tvlan_layer++;\n \t\t\tbreak;\n+\t\tcase NFP_NET_META_IPSEC:\n+\t\t\tif (ipsec_layer > 2) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"At most 3 layers of ipsec is supported for now.\");\n+\t\t\t\treturn;\n+\t\t\t}\n+\n+\t\t\tnfp_net_set_meta_ipsec(&meta_data, txq, pkt, layer, ipsec_layer);\n+\t\t\tipsec_layer++;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tPMD_DRV_LOG(ERR, \"The metadata type not supported\");\n \t\t\treturn;\ndiff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h\nindex 99890a33a1..55073c3cea 100644\n--- a/drivers/net/nfp/nfp_ctrl.h\n+++ b/drivers/net/nfp/nfp_ctrl.h\n@@ -39,6 +39,7 @@\n #define NFP_NET_META_HASH 1 /* next field carries hash type */\n #define NFP_NET_META_VLAN 4\n #define NFP_NET_META_PORTID 5\n+#define NFP_NET_META_IPSEC 9\n \n #define NFP_META_PORT_ID_CTRL ~0U\n \ndiff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c\nindex 33c77f0b74..d1d593f18c 100644\n--- a/drivers/net/nfp/nfp_ipsec.c\n+++ b/drivers/net/nfp/nfp_ipsec.c\n@@ -1148,6 +1148,47 @@ nfp_crypto_update_session(void *device __rte_unused,\n \treturn 0;\n }\n \n+static int\n+nfp_security_set_pkt_metadata(void *device,\n+\t\tstruct rte_security_session *session,\n+\t\tstruct rte_mbuf *m,\n+\t\tvoid *params)\n+{\n+\tint offset;\n+\tuint64_t *sqn;\n+\tstruct nfp_net_hw *hw;\n+\tstruct rte_eth_dev *eth_dev;\n+\tstruct nfp_ipsec_session *priv_session;\n+\n+\tsqn = params;\n+\teth_dev = device;\n+\tpriv_session = SECURITY_GET_SESS_PRIV(session);\n+\thw = NFP_NET_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);\n+\n+\tif (priv_session->ipsec.direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {\n+\t\tstruct nfp_tx_ipsec_desc_msg *desc_md;\n+\n+\t\toffset = hw->ipsec_data->pkt_dynfield_offset;\n+\t\tdesc_md = RTE_MBUF_DYNFIELD(m, offset, struct nfp_tx_ipsec_desc_msg *);\n+\n+\t\tif (priv_session->msg.ctrl_word.ext_seq != 0 && sqn != NULL) {\n+\t\t\tdesc_md->esn.low = rte_cpu_to_be_32(*sqn);\n+\t\t\tdesc_md->esn.hi = rte_cpu_to_be_32(*sqn >> 32);\n+\t\t} else if (priv_session->msg.ctrl_word.ext_seq != 0) {\n+\t\t\tdesc_md->esn.low = rte_cpu_to_be_32(priv_session->ipsec.esn.low);\n+\t\t\tdesc_md->esn.hi = rte_cpu_to_be_32(priv_session->ipsec.esn.hi);\n+\t\t} else {\n+\t\t\tdesc_md->esn.low = rte_cpu_to_be_32(priv_session->ipsec.esn.value);\n+\t\t\tdesc_md->esn.hi = 0;\n+\t\t}\n+\n+\t\tdesc_md->enc = 1;\n+\t\tdesc_md->sa_idx = rte_cpu_to_be_32(priv_session->sa_index);\n+\t}\n+\n+\treturn 0;\n+}\n+\n /**\n * Get discards packet statistics for each SA\n *\n@@ -1242,6 +1283,7 @@ static const struct rte_security_ops nfp_security_ops = {\n \t.session_update = nfp_crypto_update_session,\n \t.session_get_size = nfp_security_session_get_size,\n \t.session_stats_get = nfp_security_session_get_stats,\n+\t.set_pkt_metadata = nfp_security_set_pkt_metadata,\n \t.capabilities_get = nfp_crypto_capabilities_get,\n };\n \ndiff --git a/drivers/net/nfp/nfp_ipsec.h b/drivers/net/nfp/nfp_ipsec.h\nindex 06792199c6..aaebb80fe1 100644\n--- a/drivers/net/nfp/nfp_ipsec.h\n+++ b/drivers/net/nfp/nfp_ipsec.h\n@@ -168,6 +168,12 @@ struct nfp_net_ipsec_data {\n \tstruct nfp_ipsec_session *sa_entries[NFP_NET_IPSEC_MAX_SA_CNT];\n };\n \n+enum nfp_ipsec_meta_layer {\n+\tNFP_IPSEC_META_SAIDX, /**< Order of SA index in metadata */\n+\tNFP_IPSEC_META_SEQLOW, /**< Order of Sequence Number (low 32bits) in metadata */\n+\tNFP_IPSEC_META_SEQHI, /**< Order of Sequence Number (high 32bits) in metadata */\n+};\n+\n int nfp_ipsec_init(struct rte_eth_dev *dev);\n void nfp_ipsec_uninit(struct rte_eth_dev *dev);\n \ndiff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c\nindex e74aba7439..66a5d6cb3a 100644\n--- a/drivers/net/nfp/nfp_rxtx.c\n+++ b/drivers/net/nfp/nfp_rxtx.c\n@@ -8,11 +8,13 @@\n #include \"nfp_rxtx.h\"\n \n #include <ethdev_pci.h>\n+#include <rte_security.h>\n \n #include \"nfd3/nfp_nfd3.h\"\n #include \"nfdk/nfp_nfdk.h\"\n #include \"flower/nfp_flower.h\"\n \n+#include \"nfp_ipsec.h\"\n #include \"nfp_logs.h\"\n \n /* Maximum number of supported VLANs in parsed form packet metadata. */\n@@ -25,8 +27,10 @@\n * read-only after it have been recorded during parsing by nfp_net_parse_meta().\n *\n * @port_id: Port id value\n+ * @sa_idx: IPsec SA index\n * @hash: RSS hash value\n * @hash_type: RSS hash type\n+ * @ipsec_type: IPsec type\n * @vlan_layer: The layers of VLAN info which are passed from nic.\n * Only this number of entries of the @vlan array are valid.\n *\n@@ -44,8 +48,10 @@\n */\n struct nfp_meta_parsed {\n \tuint32_t port_id;\n+\tuint32_t sa_idx;\n \tuint32_t hash;\n \tuint8_t hash_type;\n+\tuint8_t ipsec_type;\n \tuint8_t vlan_layer;\n \tstruct {\n \t\tuint8_t offload;\n@@ -304,6 +310,10 @@ nfp_net_parse_chained_meta(uint8_t *meta_base,\n \t\t\tmeta->vlan[meta->vlan_layer].tpid = NFP_NET_META_TPID(vlan_info);\n \t\t\t++meta->vlan_layer;\n \t\t\tbreak;\n+\t\tcase NFP_NET_META_IPSEC:\n+\t\t\tmeta->sa_idx = rte_be_to_cpu_32(*(rte_be32_t *)meta_offset);\n+\t\t\tmeta->ipsec_type = meta_info & NFP_NET_META_FIELD_MASK;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\t/* Unsupported metadata can be a performance issue */\n \t\t\treturn false;\n@@ -429,6 +439,39 @@ nfp_net_parse_meta_qinq(const struct nfp_meta_parsed *meta,\n \tmb->ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED;\n }\n \n+/*\n+ * Set mbuf IPsec Offload features based on metadata info.\n+ *\n+ * The IPsec Offload features is prepended to the mbuf ol_flags.\n+ * Extract and decode metadata info and set the mbuf ol_flags.\n+ */\n+static void\n+nfp_net_parse_meta_ipsec(struct nfp_meta_parsed *meta,\n+\t\tstruct nfp_net_rxq *rxq,\n+\t\tstruct rte_mbuf *mbuf)\n+{\n+\tint offset;\n+\tuint32_t sa_idx;\n+\tstruct nfp_net_hw *hw;\n+\tstruct nfp_tx_ipsec_desc_msg *desc_md;\n+\n+\thw = rxq->hw;\n+\tsa_idx = meta->sa_idx;\n+\n+\tif (meta->ipsec_type != NFP_NET_META_IPSEC)\n+\t\treturn;\n+\n+\tif (sa_idx >= NFP_NET_IPSEC_MAX_SA_CNT) {\n+\t\tmbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED;\n+\t} else {\n+\t\tmbuf->ol_flags |= RTE_MBUF_F_RX_SEC_OFFLOAD;\n+\t\toffset = hw->ipsec_data->pkt_dynfield_offset;\n+\t\tdesc_md = RTE_MBUF_DYNFIELD(mbuf, offset, struct nfp_tx_ipsec_desc_msg *);\n+\t\tdesc_md->sa_idx = sa_idx;\n+\t\tdesc_md->enc = 0;\n+\t}\n+}\n+\n /* nfp_net_parse_meta() - Parse the metadata from packet */\n static void\n nfp_net_parse_meta(struct nfp_net_rx_desc *rxds,\n@@ -453,6 +496,7 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds,\n \t\t\tnfp_net_parse_meta_hash(meta, rxq, mb);\n \t\t\tnfp_net_parse_meta_vlan(meta, rxds, rxq, mb);\n \t\t\tnfp_net_parse_meta_qinq(meta, rxq, mb);\n+\t\t\tnfp_net_parse_meta_ipsec(meta, rxq, mb);\n \t\t} else {\n \t\t\tPMD_RX_LOG(DEBUG, \"RX chained metadata format is wrong!\");\n \t\t}\n@@ -1035,6 +1079,36 @@ nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data,\n \tmeta_data->data[layer] = rte_cpu_to_be_32(tpid << 16 | vlan_tci);\n }\n \n+void\n+nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data,\n+\t\tstruct nfp_net_txq *txq,\n+\t\tstruct rte_mbuf *pkt,\n+\t\tuint8_t layer,\n+\t\tuint8_t ipsec_layer)\n+{\n+\tint offset;\n+\tstruct nfp_net_hw *hw;\n+\tstruct nfp_tx_ipsec_desc_msg *desc_md;\n+\n+\thw = txq->hw;\n+\toffset = hw->ipsec_data->pkt_dynfield_offset;\n+\tdesc_md = RTE_MBUF_DYNFIELD(pkt, offset, struct nfp_tx_ipsec_desc_msg *);\n+\n+\tswitch (ipsec_layer) {\n+\tcase NFP_IPSEC_META_SAIDX:\n+\t\tmeta_data->data[layer] = desc_md->sa_idx;\n+\t\tbreak;\n+\tcase NFP_IPSEC_META_SEQLOW:\n+\t\tmeta_data->data[layer] = desc_md->esn.low;\n+\t\tbreak;\n+\tcase NFP_IPSEC_META_SEQHI:\n+\t\tmeta_data->data[layer] = desc_md->esn.hi;\n+\t\tbreak;\n+\tdefault:\n+\t\tbreak;\n+\t}\n+}\n+\n int\n nfp_net_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tuint16_t queue_idx,\ndiff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h\nindex 4e8558074e..3c7138f7d6 100644\n--- a/drivers/net/nfp/nfp_rxtx.h\n+++ b/drivers/net/nfp/nfp_rxtx.h\n@@ -257,5 +257,10 @@ int nfp_net_tx_free_bufs(struct nfp_net_txq *txq);\n void nfp_net_set_meta_vlan(struct nfp_net_meta_raw *meta_data,\n \t\tstruct rte_mbuf *pkt,\n \t\tuint8_t layer);\n+void nfp_net_set_meta_ipsec(struct nfp_net_meta_raw *meta_data,\n+\t\tstruct nfp_net_txq *txq,\n+\t\tstruct rte_mbuf *pkt,\n+\t\tuint8_t layer,\n+\t\tuint8_t ipsec_layer);\n \n #endif /* _NFP_RXTX_H_ */\n", "prefixes": [ "v3", "8/9" ] }