From patchwork Fri Nov 3 06:26:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133811 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 C92DC43275; Fri, 3 Nov 2023 07:27:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57A7E42DE0; Fri, 3 Nov 2023 07:26:42 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2132.outbound.protection.outlook.com [40.107.93.132]) by mails.dpdk.org (Postfix) with ESMTP id 4AD0D402E9 for ; Fri, 3 Nov 2023 07:26:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ju/ZiaYkI38QIyQUUWL3CCG8NHPYf+Lz2z6DlOy1QoBpVSwAXNQ0xcsiAJtDdr+qNN3jkOF5Y+MXagJivKV0QwccQX1EZijpfic4cg5ygNw1khKHnEPjo5OZWu0cpLLQcLBv6X3TGTOfpWNtCp1+QDT3tCdGNrb414C43BkjGCf5IB/EDlwY1gzCoOi3Yom54eOkz28+C3rhh3gllKAuls2QWGYD19r2z3+lKBurJJpD0SOr7ubbLgjxAh3iqmuXyUtVLo8pWqQRI2p+4mG8LdpYHoHVs5MtGjCVIKAPEbT3/hKmYf6n9DxcDw1dHtLazn1gtwVcVj+m1o2w5T3Sug== 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=Oo8EH65+7oBYBjTBhR9VJl2tF+sLqc07bEhhgfrrYd4=; b=VPy9E08buJ2RkQhOz1FYsG5nRiNV+RxAuqhhjnpkypKVrj5iWfIWEcHChk5i9QPWzclD5g98NRjLAJfhC3gdxkKNTpFFNBEdnZnAvqUbtcgwj16iZeJg6qann5EJcscPOwLpdBBDuWlpERfVSYEQvUfgB825pXJUV4aVq+iNsNoDK4UTsLQpS+E2O65Al+ieh7HFHoka1Ji68EAmApKM6zyk/WHlrpoLkiJSy4WHH8w+wlGCtiFuJdBsKMICcakyvC3SDvZPlyyO/8ByOk+jpO8MGmF9C2Owc7/LpbGgrkPG7YM8exU//XJUQz0+3yzK++VXAljIyvRRkoeZr0oPJw== 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=Oo8EH65+7oBYBjTBhR9VJl2tF+sLqc07bEhhgfrrYd4=; b=wY1EM3fmaw5wWGqebfCSI5+3XSkht8xmOr+VgfU9R3qAfC03hP9yON673QWIb0gp/VKZkT8QdmCBL/PE8PE+hydrtUbdawDbtp3eMOCFZ/QG8GyUgmQlCziLPHMp+UuS5L8eQWXMh4xXPt/fcO4Z2reamALqmpy204MA0oR5hL0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by MN2PR13MB4102.namprd13.prod.outlook.com (2603:10b6:208:262::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6954.24; Fri, 3 Nov 2023 06:26:38 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6954.021; Fri, 3 Nov 2023 06:26:38 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 05/11] net/nfp: support Ethernet flow item Date: Fri, 3 Nov 2023 14:26:00 +0800 Message-Id: <20231103062606.2632012-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231103062606.2632012-1-chaoyong.he@corigine.com> References: <20231103062606.2632012-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR02CA0044.namprd02.prod.outlook.com (2603:10b6:a03:54::21) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MN2PR13MB4102:EE_ X-MS-Office365-Filtering-Correlation-Id: 22607007-6e70-4839-8fbb-08dbdc35d5c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fux63JrNy1dqAIUXK4Lu1jXeWbFsSC1IS6wr8iEhV3Cjr0BtVOQetBYKQC6mw0lrBSkGek8ddukJfq4UmEpwlAv4sAsap2pRrgnyxSA1EqTr+zBBut5yrdlCCymqptIoOYX8AZZtkPmfnL3Gc0Db53FwEqoDZt3PCuVUVUPh8k1feXha5l2CWm7KZ33xdEdSKlrFibaF2g6DD+0Rwa6Jz177fYAvxcYYMoKh8n1jPClyIUObHMWOqVmeYR/Oiu05sHCtfh3qe0s5cbYn9heaWbfsq8WetTpe+PpOZ94LDFE2kQcxqWhdX9WaO++l+7rrnrrBIkLSPRrzErK74pujXK7NcOsdujCqOAG3uxaRiMrGshjohchkHGiiaXY2k5z3/VRW+NT+T3pBOYacScIpxRJp59XtvDTwdycN1cZ/aeiyTeXMJohyKyNhovQsOko8k5g/tOhr61qoZIVeJ7QENOVet2PSVCNj05yy9tW3ydE/+CQ0uVrwgGeKZF43901xPQdJ+Bpd9ZZNV+b3lDTPQp9o350VZZ9sLC8J2JG9/gWCri+gW0Qwq7A9MrTG2XIHCjKPAbpjgymP8e32Z6FMZO6/xGJ2oK1/yXGmpcilZhntofIvNeP974mchjYphffzN3O1MoRTarb3ixFUldNtqRBJGNa+MyplRoFk3JQHI9Y= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39840400004)(346002)(396003)(366004)(136003)(376002)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(316002)(6916009)(54906003)(66476007)(66556008)(66946007)(6666004)(6486002)(478600001)(52116002)(6506007)(5660300002)(38350700005)(41300700001)(36756003)(2906002)(86362001)(4326008)(8676002)(8936002)(44832011)(107886003)(1076003)(2616005)(26005)(83380400001)(38100700002)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ePpI+yi/DgsAF7rowtMSY/iFrdJ8RrluvoISVNTg2eEfgbnbBuKujPDVl8qEHdnW8sghZHwQDWJapLIFHzfuiv1kXNAIM9/g+8WNFgpUCaYVnd2oUbUDsfFlbSq4/2MR30eelc5B8IKSyxFQIxDjfUsLL2iar+XType37BxXxhOS4peiEE0ClG2G5oN2nJTHnGfEd86yrMazaSDCKEmRZUC7041sekOdoEkHeWI2AZSlxmm0/ot5125BYTK3ZrVZodHm/TxpmGffjvi0FU9XT5BYGLYBrrMiATePfOM61cuLdAMZ/NMZ6JT8Nu/QF33D9/IJT0NuBTEY9m0/IYXiylzSLxQQ4QV9UGMCzMsD6w8chaG5azWgcNFe5B55cGy5GUJ5/xSr8jO8rswjYK72j+89fGoxd6vYg1a30wRaZnVVLaOo//XYTt6YrJ+UXbQ0JIqJXYZS4vZXqLa3wqdcZZt7wDQojl1jVGbGA22EHQYPCJAW3BNjf+gMkFrPtLxr1Qvu0PF3OUzOFdgDd4oAQfo81Hrc4pQdXbNp4svLXbWSsl3elrc392U7/j3WoC15BfhNkPcTO32e6vo4s/mQCmS52qYuyuPXzHOfhYV1dvo5+Xo4SJ3vD8ZXAPM3smfFwHzMrgsheihjkTgRAH2nkC+Ej2N0w9HhIHezNBXBANA7cYqGOJvdDmf+/DUvV8L78eDk+yWAofzgol4x+tJH2LEqOCtcvPDA9BVEaZdoHWd9mVpYoMi56XqXNIfPgJX7Yn+DQUXh4u/cuiQe8YqafBKsugbCH6oVRgU8Q6oYW6bVywzm1AmzkvDAnbSFZRd6pszTlRGU6H9jLyn3wPDjl5pzkKhvoeKE1ou++xA944WdyAXtw7bsPooZKopWyKcegAgitMSY5OfDV9+Y6OswJ5Tyah3qFDL4RY1HsXikB6ko2htslGFsBqrL4KZjn34D74Gan08VhMFLl7Qk13FgMMFiFwNbAdZSK4+iy2N1/aWe//j4QWFU7kpjpnDeSVOXieDjK6tIkzO4bX+27cUec4p43l40RpgU/k8Wi6oHjsq8fOFtPTJNne3MkH76zX3lk33s/9aroaIZBwtEbGsuDMaJL6CN1YuFgpxEp8IOM2KxwHF04uXEBgKnPUWP4FXp7/NIHPdhumnnP0yhYx/pK/CX0P+T3SstDTSBm13rhI3zqxvXC8T3CgiA8Vi2SvkAAkAGup1My9Z1YfcZVpFbTK5Av+6vx0rmIo9h6gwD24DECNWTHQPSYXihRpo1td4+MsY4R1eyqD6AHd3IPKzRpOQTshIftAy7J2r7q27Xsf2RaUMwDq9kjB4Ho2pC/OQoEy00iSyM38ieBca/UULZgkPVVbS6+M9iIB1EXeKbaTs8iF9DrSPYr5jeZeCHlbICDuTf/Mbk6s783/S9Y4STZobx6dBGBnKr6zVdvBMQXKszAf+uWCaxysV3oF0nR0KB0Kq4cN1A8Mh6U3AUwvCZhMIhEm2bJN4NVKIdSB0xkaL+qnDTRwyiK3fLncgIWRUSUN1dz2VkP6uWsebTbuOlOeihU67/NwQ/QTxZlOWAVrIbCqBGCIpkG96vLMUDpFEvhzPM2DFD06Oey1cQRpOMZg== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22607007-6e70-4839-8fbb-08dbdc35d5c4 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2023 06:26:38.3707 (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: w24xMYLvfytkWV3GYaiD0FzaJteBfHYIiX13epwYWv+5pM5q+C/t0BbYgOb9JcSSF+MpO4gHhGhehi/Qvcx2dxiR56ilScSWF8KQWsCgAlE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR13MB4102 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 Add the corresponding data structure and logics, to support the offload of ethernet item. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_cmsg.h | 13 +++ drivers/net/nfp/nfp_net_flow.c | 169 +++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) diff --git a/drivers/net/nfp/nfp_net_cmsg.h b/drivers/net/nfp/nfp_net_cmsg.h index b526feaff2..a95f4ef831 100644 --- a/drivers/net/nfp/nfp_net_cmsg.h +++ b/drivers/net/nfp/nfp_net_cmsg.h @@ -8,6 +8,19 @@ #include "nfp_net_common.h" +/** + * Match EtherType data + * Bit 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 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 + * Word +-------------------------------+-------------------------------+ + * 0 | | Ethtype | + * +-----------------+-------------+-------------------------------+ + */ +struct nfp_net_cmsg_match_eth { + uint16_t ether_type; + uint16_t spare; +}; + #define NFP_NET_CMSG_ACTION_DROP (0x1 << 0) /* Drop action */ #define NFP_NET_CMSG_ACTION_QUEUE (0x1 << 1) /* Queue action */ #define NFP_NET_CMSG_ACTION_MARK (0x1 << 2) /* Mark action */ diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index 88386a31f0..4ef4aafb16 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -13,6 +13,28 @@ #include "nfp_logs.h" #include "nfp_net_cmsg.h" +/* Static initializer for a list of subsequent item types */ +#define NEXT_ITEM(...) \ + ((const enum rte_flow_item_type []){ \ + __VA_ARGS__, RTE_FLOW_ITEM_TYPE_END, \ + }) + +/* Process structure associated with a flow item */ +struct nfp_net_flow_item_proc { + /* Bit-mask for fields supported by this PMD. */ + const void *mask_support; + /* Bit-mask to use when @p item->mask is not provided. */ + const void *mask_default; + /* Size in bytes for @p mask_support and @p mask_default. */ + const uint32_t mask_sz; + /* Merge a pattern item into a flow rule handle. */ + int (*merge)(struct rte_flow *nfp_flow, + const struct rte_flow_item *item, + const struct nfp_net_flow_item_proc *proc); + /* List of possible subsequent items. */ + const enum rte_flow_item_type *const next_item; +}; + static int nfp_net_flow_table_add(struct nfp_net_priv *priv, struct rte_flow *nfp_flow) @@ -162,6 +184,10 @@ nfp_net_flow_calculate_items(const struct rte_flow_item items[], for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { switch (item->type) { + case RTE_FLOW_ITEM_TYPE_ETH: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_ETH detected"); + *match_len = sizeof(struct nfp_net_cmsg_match_eth); + return 0; default: PMD_DRV_LOG(ERR, "Can't calculate match length"); *match_len = 0; @@ -172,6 +198,143 @@ nfp_net_flow_calculate_items(const struct rte_flow_item items[], return -EINVAL; } +static int +nfp_net_flow_merge_eth(__rte_unused struct rte_flow *nfp_flow, + const struct rte_flow_item *item, + __rte_unused const struct nfp_net_flow_item_proc *proc) +{ + struct nfp_net_cmsg_match_eth *eth; + const struct rte_flow_item_eth *spec; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(ERR, "NFP flow merge eth: no item->spec!"); + return -EINVAL; + } + + nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_ETHTYPE; + + eth = (struct nfp_net_cmsg_match_eth *)nfp_flow->payload.match_data; + eth->ether_type = rte_be_to_cpu_16(spec->type); + + return 0; +} + +/* Graph of supported items and associated process function */ +static const struct nfp_net_flow_item_proc nfp_net_flow_item_proc_list[] = { + [RTE_FLOW_ITEM_TYPE_END] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH), + }, + [RTE_FLOW_ITEM_TYPE_ETH] = { + .merge = nfp_net_flow_merge_eth, + }, +}; + +static int +nfp_net_flow_item_check(const struct rte_flow_item *item, + const struct nfp_net_flow_item_proc *proc) +{ + uint32_t i; + int ret = 0; + const uint8_t *mask; + + /* item->last and item->mask cannot exist without item->spec. */ + if (item->spec == NULL) { + if (item->mask || item->last) { + PMD_DRV_LOG(ERR, "'mask' or 'last' field provided" + " without a corresponding 'spec'."); + return -EINVAL; + } + + /* No spec, no mask, no problem. */ + return 0; + } + + mask = (item->mask != NULL) ? item->mask : proc->mask_default; + + /* + * Single-pass check to make sure that: + * - Mask is supported, no bits are set outside proc->mask_support. + * - Both item->spec and item->last are included in mask. + */ + for (i = 0; i != proc->mask_sz; ++i) { + if (mask[i] == 0) + continue; + + if ((mask[i] | ((const uint8_t *)proc->mask_support)[i]) != + ((const uint8_t *)proc->mask_support)[i]) { + PMD_DRV_LOG(ERR, "Unsupported field found in 'mask'."); + ret = -EINVAL; + break; + } + + if (item->last != NULL && + (((const uint8_t *)item->spec)[i] & mask[i]) != + (((const uint8_t *)item->last)[i] & mask[i])) { + PMD_DRV_LOG(ERR, "Range between 'spec' and 'last'" + " is larger than 'mask'."); + ret = -ERANGE; + break; + } + } + + return ret; +} + +static int +nfp_net_flow_compile_items(const struct rte_flow_item items[], + struct rte_flow *nfp_flow) +{ + uint32_t i; + int ret = 0; + const struct rte_flow_item *item; + const struct nfp_net_flow_item_proc *proc_list; + + proc_list = nfp_net_flow_item_proc_list; + + for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { + const struct nfp_net_flow_item_proc *proc = NULL; + + for (i = 0; (proc_list->next_item != NULL) && + (proc_list->next_item[i] != RTE_FLOW_ITEM_TYPE_END); ++i) { + if (proc_list->next_item[i] == item->type) { + proc = &nfp_net_flow_item_proc_list[item->type]; + break; + } + } + + if (proc == NULL) { + PMD_DRV_LOG(ERR, "No next item provided for %d", item->type); + ret = -ENOTSUP; + break; + } + + /* Perform basic sanity checks */ + ret = nfp_net_flow_item_check(item, proc); + if (ret != 0) { + PMD_DRV_LOG(ERR, "NFP flow item %d check failed", item->type); + ret = -EINVAL; + break; + } + + if (proc->merge == NULL) { + PMD_DRV_LOG(ERR, "NFP flow item %d no proc function", item->type); + ret = -ENOTSUP; + break; + } + + ret = proc->merge(nfp_flow, item, proc); + if (ret != 0) { + PMD_DRV_LOG(ERR, "NFP flow item %d exact merge failed", item->type); + break; + } + + proc_list = proc; + } + + return ret; +} + static void nfp_net_flow_process_priority(__rte_unused struct rte_flow *nfp_flow, uint32_t match_len) @@ -218,6 +381,12 @@ nfp_net_flow_setup(struct rte_eth_dev *dev, return NULL; } + ret = nfp_net_flow_compile_items(items, nfp_flow); + if (ret != 0) { + PMD_DRV_LOG(ERR, "NFP flow item process failed."); + goto free_flow; + } + /* Calculate and store the hash_key for later use */ hash_data = nfp_flow->payload.match_data; nfp_flow->hash_key = rte_jhash(hash_data, match_len + action_len,