From patchwork Mon Oct 10 06:08:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117768 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 98D43A0544; Mon, 10 Oct 2022 08:10:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C67442B77; Mon, 10 Oct 2022 08:09:34 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2105.outbound.protection.outlook.com [40.107.96.105]) by mails.dpdk.org (Postfix) with ESMTP id 7765142802 for ; Mon, 10 Oct 2022 08:09:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lU6Nq/2O9a5TJU0WzD1cKkMN8UgINjKeIyWar0Qt9UHUT5uPtWxsbImrNF+O3z4H5/0PhofBpg5O2qYlD7iY8F2RDoHx/2CT5XVEULNBBsBRdoh+ctHfQxFOAl5cuA7sGK27pMKzVYhoe7avUzPkFh6ggAp67juyHXzPCpLGyq1GqXppGQgXWrFvbwpIY7d9qXCs8Q9Ti88iyZzRyMJg5uCp+srxEzDiDDLHyn7mtyePShlbo2fjaYECiQ3L0kVinKfNkqANj5iWhw7RRaZgdu2seiqjRtKgYOhdbgeQznyAMM+fYdxm5jNmL8lQk1T0ULKe6kOeCqtfYIauZfLm7A== 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=7LkIFtusCPbFwt2HyDgUgwXIpX/U1OnWwMAj82998IY=; b=b3Wn4fZTWOLMIpN+kgteY8k6T/A/Dl8votZ8TqVxXRvYRYk+FDjGNA1VbFcnJ9f7pKoUKkhQ4IPqLtBb/8fig++0EIJR9OE7flE5QETqrHHoQocR+ICYlxneKTUOmpT00TU4y2TClhfYvb9w4RR2y3QSlhTF5aSL+5p/91wL0gsxa+yWw6Plz8CVa95O/Z6NyG7MkqK4umW74yGYDxFwKru2bwCQT2g34a2ikmyKBkBUqsgPM82+7xImrXx7u9QR8UkiPFk13DmqE5iak/MiEoS/fHh7QTMX4qwjZd1MmOZnxRV7SQUyVuhxXFPHUhKHFGI/U7mmKsQ0w6HKmI1u/Q== 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=7LkIFtusCPbFwt2HyDgUgwXIpX/U1OnWwMAj82998IY=; b=UP36SKbvdxAtijwoSIrpLv8mKJS7ycC4G4ebU43XPeHdmq7tSdGxVAvu+M1mKfiazLwcXNP3dvjH2JoBKnxmByVBwAn852/LRIo8mg1gX27QPQH4CwLMYqtagyooAYA3rlUR+ENZO6/UZ+PXnwQnOBsgvUWeeimbBL1BLpDX4iQ= 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 SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct 2022 06:09:31 +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; Mon, 10 Oct 2022 06:09:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 06/24] net/nfp: add the offload support of VLAN item Date: Mon, 10 Oct 2022 14:08:44 +0800 Message-Id: <1665382142-21684-7-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> References: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0051.apcprd01.prod.exchangelabs.com (2603:1096:4:193::6) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: 488e88c5-236c-464d-61f7-08daaa85feff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1OpyddesqtxnFX7u29F7WhKbhmgG9ng8H6pYZXgchvrWrteRIxewkhe/HvmFVltJUbV3uegYFDfq63ioA2oLGXhOenvCgVI1uRH/FjZf331eYHe0Pdm9AoypYXPPSPVSzzIh8LR/HZDcCpjSuSt9OBXvAWbHYLYq5Q4Tlm5WojIEU3GBQV24PfPWrw//k36r1wW63o39hbM+bRpp2R/8ZmKLmgDk+qzGsIyNUHeJpiO21fGb+JMnVncGMr7gXVb5L94NB7EcjcIX9WiVxVqq+lAd8Am2MYgtBbuBFpLdCqhjWgnpFGFlpo3iIjJ7IXW4y/HgsdS8uHT00QcZaNmcr0DywDaPZ/xnIWO54zj0OGanAxzr6pUBViead7CEpk/MPfxnWSDTFgq7IaeGmB7y3KLMzA9TBjv+KVEGFm1ijkmrkJIOqoIAF3+U44o/Tb0uXsz6g8GZSW9+QSEuspojTw37YkKUvdNUOp8mRPOo99wphPnDKEz4oLNR5cYIVfiEVChlJM60rHtZOFWE0tgJ/kX7GGuApaRHCsVqt2dKSX2tF/9Ax7gLhNbC20d2ZYFFq4jppzfsJfvOm7CISZB/pX5Aumozbd9HNd70I40DjdMrRdX4lqRbq07uTLmw0pxBp9hBymzA3OrZn1sW6SarRno6UcJqXTG7hFbpC3LxtoE+TyS93reno08yhBsF4EmEjVB08UaT8xfnF0lgXIHGmf6vEBkQOSDL6Jb+7nrxMCTGhBPRLrA9XxPAPuzwd4cr9x2wWtUaWpDldwsGSM3vsECNar+NmD8mRY1BAlrgfVBBkGGx9edFqXRgIKyhLrHZ 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)(366004)(396003)(346002)(376002)(136003)(39830400003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(8936002)(8676002)(4326008)(5660300002)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?YxXnCJr78EemIHnZ5vAHw212F+lu?= =?utf-8?q?u/jFdjsxOxvlM4QwtlS9cxsMFbaodgGoX+l6sT1KohWH3nH+CsQSA8u3dYNNS/uNm?= =?utf-8?q?5js9x1fkXrD7fD8lsiCfhob+CXXX9vJ7hTNtj35PunmN7cb/1IrPFhZcaL1he46JJ?= =?utf-8?q?xBngkSMb7AxAtlOXW+1rEGzgEjG2NxIxsUhxE/TB6m9rFQpAzs9NcD7KQNy5P0aYn?= =?utf-8?q?9q6qUcXJO1XfbMvYGNHMHHf07I32HcVhmyyfdYBHXd+5EsjZ6xpkQxrrknogJRDl/?= =?utf-8?q?Xmp80N7ac514dQD7akPaDbRRCuyL4/NfX+edyUHMLraJgDz+7Cd+2vSkV6Qtu3CBR?= =?utf-8?q?WzwpGsQEx8dvGZwrEGTcgzrwsyD3norXIm6A+DoKVEK5R/GK8s0HLzOiuLPFhYhMe?= =?utf-8?q?JHMsNkoF3x2e6YIUcrjylWhvVotbum67+I/g9IpGIZ95BpS6qOPpNHVHC6us1Tn4m?= =?utf-8?q?zTnkCghFFddLpiaVNa6qOxBuM7fvhNWQDkwV8fd4/TkDXYzaT2PASNsehW9Py/W+P?= =?utf-8?q?M+kQKtjIATIqZIHm5p6DvfKiye5fUBYQIX0uDAyVz1k4LQic0Ar+HiZulw987fxhv?= =?utf-8?q?xNLW9IRd9yxEAUtOC++6L9u4JmrKUW1Ko9rN9dGUsOwdadV1LsTWoFy1rfYK3Wrwm?= =?utf-8?q?PIqKiK5W/3UsWVO7jQHoQEdKPSIFNEOld4Jp1s9S7135hznfFrD3yNvJ4QOxyOhbU?= =?utf-8?q?zn4plRp3X0Yu60eZ1meLgj5Ir2Wzi21aD+kZ3FFGrYH/NMcXi3iwoUfNijcOKmXC0?= =?utf-8?q?jXehCciLFhRkvgTmYrKc2ByH+9jnBIKOAaRhAlT1xyEkwKvtLsTKcLvPbvxm0ofEh?= =?utf-8?q?SrPKvO+taUUAMKO5FZmHgrppK/XgQeyAnT8CO9ok8VExi4qR8Z8O9tZ1biGawHQ09?= =?utf-8?q?mgM+qkbv8F82yVxt1S3xK9qKhV7zPxneiby9+X0XYCmt00wh0M2Ox+iOPNMqghy+H?= =?utf-8?q?ZkObBn/YFhRiSkRSLy3+GpiZTTFwTZUsUdMvoiU0PNy9TSSbUWho2f85xD6YdwS82?= =?utf-8?q?40rMGeRDVqQRABgELtD4UrS5LAQMgmaxZz7C+R+fT6CuNPa+jKCA/ykyJn2mWPHoa?= =?utf-8?q?CU562ay/FvMXQqLf8vasZmqp7i8xAzYRQwAt16lYErMom1WqHl6K8e7Wpsm52JhM+?= =?utf-8?q?Sf0SGh9aa8XwRbzcZnCi/7MheQ2iOUKCCP50kA5xGOBoXv0l8WsQDVIAlaMvYYnYs?= =?utf-8?q?ovG4PQxCKQsAUtjA/2W/7afTB/0QG7Aaa/IsDVfWbQIpWi/o15N2wX8+Ia/Cs29GQ?= =?utf-8?q?WSRSZiZnpkfSrqi0TNI7SZiCOibq3LJUllPDwLFxIxiIpmXwFCeyMgGRhQQkvb/mS?= =?utf-8?q?Sq30TO8U7St+H2yxmetbJkiqJ74peYXDa5g3j58Oh8IoJedEliSug6khscisyLDIH?= =?utf-8?q?jrn3Mi9KEbsroNgmn+kcqjl+OUQG5EFyLKKIBztwlB+tuz1UN0JEWseTlvorLL7Jr?= =?utf-8?q?TGUmt7G8C9vnnbuOd3ccyW40pGnRK6qxBRrEIdnPpLha+gVvlhgG+Vc+QB2NbbucL?= =?utf-8?q?Km98ifFgB4nktI2zjZQ3Im7z84iDdDxEMg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 488e88c5-236c-464d-61f7-08daaa85feff X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 06:09:31.4992 (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: 6L1v2NEU2Li96Dk46+gEoSQ/TJFv9iPov1BYUe3jTmupZy18P4kMf35aiBEnALgOf60mTh8vCeWtT32auw0l8jc81WWfykS2xzBMEtqejHk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5296 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 + doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/nfp_flow.c | 46 ++++++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_flow.h | 2 ++ 4 files changed, 50 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 194fe64..f0ecae2 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/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index ac0223f..9160cc6 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -154,6 +154,7 @@ New Features Add the support of rte_flow pattern items as follow: * Ethernet + * Single VLAN Add the support of rte_flow actions as follow: diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index ec021f0..b063b96 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -530,6 +530,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; @@ -641,12 +645,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", @@ -659,6 +693,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 f1fbada..f6bd3e4 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. */