From patchwork Thu Oct 20 02:19:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118684 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 D6A07A0A02; Thu, 20 Oct 2022 04:21:46 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C79442C81; Thu, 20 Oct 2022 04:21:14 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2136.outbound.protection.outlook.com [40.107.101.136]) by mails.dpdk.org (Postfix) with ESMTP id EC24E42C78 for ; Thu, 20 Oct 2022 04:21:09 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nVwEiksWhZ8s4+GRR7VlmXJLLAxmdiYeP7E5vNDw4NyjJHaVN+wA461Dsg+1T9x2Y+23b6tZLy2cJMTj7DM0U5wNqRiYoP7WmchGg3Y4z5nOSg255X9ql/s+g/yYUZSjFF/AeByfzUKGd+Fj+SjPX1bOeE2D5LlLYhlHczDhBOwFEMZjqBG5qbSXRWquKyrYjpuPFvxsvGQzl5y6yTeCBqgTsDNUBYTOc5n3RZBzZ4lPWLIao01pwapgQrxEwawVJHvmGqOVYc19ZoH7TsPDvbThA926HEapOWc0eMjV5cP0iJ0MSdWqkNabvCwEBNYk7lPpL5oQmaq79uVDjG07IA== 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=0llgDo6/OHFHbZYTlvKWNo6KteGfs7pGvT2Fs7tkwx4=; b=T+xq3+PIe1SPwSMkhhuBGCiH0USmQWGYVIzpaxVZcgbUpARGgUnhbTbnYdm6dHQjbihYFpKveWTg7PWnVMQhfokY5PmcSO3ETcSwac0v7uYZi8Q/RJea4NCtUls03H4/9+Ll2DI8Y9VBObHW/o81tr2eADC9FgqIZzJ2B+wX030vDlyLtJD7ZvvCfrcNoBpTVaD5LP/SS8mlhxVVLUX3S50I9J/HpRQGJ5PoWw93RHMviIA4zMv1439p6a3RfoVN1qQE4fv5dUnTW/LtXRkNpZvi7OLAEPYDpS/MYni5eD1I7TrdZzMdU/BclWVzXlDq05aFTVUv7gyOTUWLSNVGeA== 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=0llgDo6/OHFHbZYTlvKWNo6KteGfs7pGvT2Fs7tkwx4=; b=D1pj/r9Mr2AoF3owWi76+oaAX8ulUBOdiTu4Blc2f7xpWqMnFRx/SkgEt7Jn9jnX5OKDch0Yoj/2OEAtiAbwH7UunsM4mBhxjozDuYbChwmeIv12jGHnzEJ3AtX61SvyDuym2dUYsX6umQShDiHE0KUQo1W2endk1azpc1mrNA8= 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 DM4PR13MB5906.namprd13.prod.outlook.com (2603:10b6:8:4c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16; Thu, 20 Oct 2022 02:21:08 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Thu, 20 Oct 2022 02:21:08 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v5 07/25] net/nfp: support VLAN flow item Date: Thu, 20 Oct 2022 10:19:33 +0800 Message-Id: <1666232391-29152-8-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> References: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR02CA0048.apcprd02.prod.outlook.com (2603:1096:4:196::23) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM4PR13MB5906:EE_ X-MS-Office365-Filtering-Correlation-Id: f0eb087d-ba4f-4003-5b09-08dab241bf60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PRphDIxQQxTbPo7tgDfZfO4yg2qQWAgCwB6lHHNYHB2k0KQ77L0Newxv1Z0IOK2WkqQNjK5lF5uAO3HUMI3C4IbRTGa+O6RiPPtk4Vp8RFPghLI1J2dBesFWrE4PC7Jwn3kOXVPi6AzRDK5vLwJZLAsMYRMObgL9I07SE9I6kzemZ+ch/fgoX8iOaFvv7Pf9OKzsm1w5Kwu5yTP3hksTDZYK9vsJYPhBHkSO+ATY6afrVTIOyp6RpPAX6y4fBNgCz9Wgs2IzElT1UuTqSkqxVnWIiqrMqCEV0wY66bu5oDu0Cso7TSGhFRuciYS8boKE+kuEh1vJsdmZ1Mx9WQZgQWH+sj5amBwHfnWuSLnGWUxS80760h7t+moNGmK0iTf5+fyUeJAy/NquMRCDE5ggB01P8mU4zDS1V8Q3F1yLJH6FV2WkoaQ2+/KiGF9meaw5myvbTpxjl/fsOJaVWPwKa3/IUeplpbbnVlrbxjck6TKYbeOaCgfflT+Pm+52EJNSncsrrW23xQ7EMckSCkeD/cZum4/Km2cQujw7FqK0/SryoOSBOdUB+KnLeBULPCv94L8C6ZR8QTLoLbsF9B7gcmMql/fY82M11orgm/5xcXL3Tr/Mw6D60J5Qidqpdsyt7RSz3KW45MYjB5cNSqvZLStJra9FNjwT8pP3jcjAArFdVVwA648p18FD54wypIH9u4OQ+W6Lx1FSJoEDbTAmj+yj9V5EE715mtZI1QM3vhGAhowXjG/vgm96faf1pat+dDZ27h0fySYRrC+GhOqX0Jjl/mi30apP8mzDgsfDG6DUBce8LQM1YnPpOJ1rKdeW 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:(13230022)(4636009)(136003)(376002)(39840400004)(346002)(396003)(366004)(451199015)(38100700002)(478600001)(38350700002)(316002)(6916009)(2906002)(186003)(66476007)(52116002)(66556008)(6666004)(66946007)(107886003)(4326008)(6506007)(2616005)(41300700001)(5660300002)(36756003)(8676002)(6486002)(8936002)(26005)(44832011)(86362001)(83380400001)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?bEiWxcrIJHaWPiP815HCqH5+V4cN?= =?utf-8?q?bAboAzK98pNarJele9nG8IVH2KSPakw1teiJ5HZU7wICB8izltIyQsvD8tdKHV5Lw?= =?utf-8?q?AJqiyKzoNJLgqVI1OMgUo+l9Nz1KzUUfON/V0t5GZWKUZVWcA6Nx54ShMKR5SviZ7?= =?utf-8?q?I86WBod7RVEZpueA5n+JkrLUiKayEn2jzib/H1EJkRI4PEYfMZhHPxtNJQjgkydNK?= =?utf-8?q?mmtNrUdUcImHlXYNmpICL53O1iM0updEknETkc/BhHOc625/mxff64/BFtujklMmT?= =?utf-8?q?fzblb3u6Eo1+x2s1wnxELWPWtQFJhaiCVLkrCPBRgeH9NULrvls7kxmopShn4F43R?= =?utf-8?q?lNQqPB+46HaU6BlFCPIkU+MN+dPCkRJzZeKEbIhiZYftqk97TfRwKPkQnR8pQKmfb?= =?utf-8?q?bydYbCcxEdh2K3EUw+aPHcGjbhcFpkqN8lnMWmEVkIYCMub9cRU2itEX1dCGgzA1S?= =?utf-8?q?92b2OW00N7epMt+6OmSC0OllJmLIINbFDXmvwEeJ1iSRre3qx434a5XcSlTWvhJD4?= =?utf-8?q?1IKbt47RHYYuFnTZP9NRw+YUe1AiFBkqFRlLntrHNH8VIGQ8zH/SH4Bf+jrSwpxLa?= =?utf-8?q?p1SyEfwl98MjYFeqhZHMGpFNfM43XmishbIjvA4G/lIWZ0KGJ47CsNncmYS6/ochv?= =?utf-8?q?cbMcCZQcXuh+Jwzl9QC/SM/QXY7CEyc2x6e0v7gTrIciLIFYw91EgA+N7A+/t6Bvw?= =?utf-8?q?pyxwm3WjoHVXZzuZQ9fuJVBOmFzixlv4W+4yLSYtyedAjk6BOrpTG34+bD4y1tzE4?= =?utf-8?q?Wiho65/sRLUYJSw2O974T5bW3fX/+d7mhNWnKtNuDmKgp/KNEuIYsJT6yCQ2K+8zm?= =?utf-8?q?cNXyHekYFo3S/QVYsko9/w2OjS6z38ONsrmj1L/xF2q6BEghZZFVUMse125qr4uz6?= =?utf-8?q?3xe4X1WcRvk1LaQUXveZmVksc8/RLXuaUqjH/90TI9Ft0WOgM+kimTuRzAW1SGjje?= =?utf-8?q?v8j0ekugNX4iuBIO1VrjCWncpZikJU9m1KZFjB7PvTyT+CGdahOSb8RH3t5zn6v3I?= =?utf-8?q?QYRxngzPMcMJ3M84zqF2D2r75o3gQOUwf1/JSc8quNMsGfBWRv6Xs50lZwS5US8g7?= =?utf-8?q?0DgNxpKI36l9aCj7R0ieufLCgC6RpxrRCDZd8rwxzcPncwKobfrMktgkzCMVcygzc?= =?utf-8?q?W4+1eozUdXcECSD2rf6K0rmvMRXttBXfzjkeZhuE19UilBFXWj4nCiEqu02lI0NtO?= =?utf-8?q?DSaytG9X6/dOxwC5O4/wfZeFXeNvzdxbdqL9RVTnPTsRgAZ0MioWShC7Y33PlkewI?= =?utf-8?q?faVDl1GTu3sNb0ihpuYtAQBN2lPDiCg7jBxPUgFR3wer0i2uuGb5E0CkTMfQks5Au?= =?utf-8?q?23MO8O1JvVgNP8vc7XVyqUpHYM3gaYCJowtnEihyvqhNAsXe8zI/cJ25ZmsXUBGpq?= =?utf-8?q?UeReEllkLlSdJ0/IuUbWBSxxdvPQYZgOFcYCbvnFQAGmoLWt8KLPbVXU2AA6tmU2L?= =?utf-8?q?LrFsGHs0N1wZJ4+p1JiJl6J2qeIE3jpftHDImGGeZp+Up2W8L1KjLC/YFpCfUCBMv?= =?utf-8?q?HSbI7RR9NrW9I4tZQSJUSLciFOklTctQaw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0eb087d-ba4f-4003-5b09-08dab241bf60 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2022 02:21:08.3008 (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: ztki8niBt7DVi4/QoFl/bFNbdUqcxtP3+0eBM/L0drh7/9iukVbKYoXnyuLPsyhoMWOD/wmaIY6LvYYNflw5ekxxwZzMWMxIQGSIwzLTAVA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR13MB5906 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 VLAN item. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + drivers/net/nfp/nfp_flow.c | 46 ++++++++++++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_flow.h | 2 ++ 3 files changed, 49 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index f91da82..b0af2a0 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -29,6 +29,7 @@ Usage doc = Y [rte_flow items] eth = Y port_id = Y +vlan = Y [rte_flow actions] count = Y diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index be522ad..107cd5b 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -518,6 +518,10 @@ struct nfp_mask_id_entry { ethdev->data->dev_private; key_ls->port = rte_cpu_to_be_32(representor->port_id); break; + case RTE_FLOW_ITEM_TYPE_VLAN: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_VLAN detected"); + key_ls->vlan = NFP_FLOWER_MASK_VLAN_CFI; + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -629,12 +633,42 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_vlan(struct rte_flow *nfp_flow, + __rte_unused char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + struct nfp_flower_meta_tci *meta_tci; + const struct rte_flow_item_vlan *spec; + const struct rte_flow_item_vlan *mask; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge vlan: no item->spec!"); + return 0; + } + + mask = item->mask ? item->mask : proc->mask_default; + if (is_mask) { + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.mask_data; + meta_tci->tci |= mask->tci; + } else { + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + meta_tci->tci |= spec->tci; + } + + return 0; +} + /* Graph of supported items and associated process function */ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { [RTE_FLOW_ITEM_TYPE_END] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH), }, [RTE_FLOW_ITEM_TYPE_ETH] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN), .mask_support = &(const struct rte_flow_item_eth){ .hdr = { .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", @@ -647,6 +681,18 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_eth), .merge = nfp_flow_merge_eth, }, + [RTE_FLOW_ITEM_TYPE_VLAN] = { + .mask_support = &(const struct rte_flow_item_vlan){ + .hdr = { + .vlan_tci = RTE_BE16(0xefff), + .eth_proto = RTE_BE16(0xffff), + }, + .has_more_vlan = 1, + }, + .mask_default = &rte_flow_item_vlan_mask, + .mask_sz = sizeof(struct rte_flow_item_vlan), + .merge = nfp_flow_merge_vlan, + }, }; static int diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index 2ad6d0a..6e5b0fa 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -25,6 +25,8 @@ #define NFP_FL_META_FLAG_MANAGE_MASK (1 << 7) +#define NFP_FLOWER_MASK_VLAN_CFI (1 << 12) + #define NFP_MASK_TABLE_ENTRIES 1024 /* The maximum action list size (in bytes) supported by the NFP. */