From patchwork Fri Oct 7 02:18:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117511 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 6779AA0093; Fri, 7 Oct 2022 04:19:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B55942B6E; Fri, 7 Oct 2022 04:19:24 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2130.outbound.protection.outlook.com [40.107.220.130]) by mails.dpdk.org (Postfix) with ESMTP id 7623242B77 for ; Fri, 7 Oct 2022 04:19:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FsYsKfupmLD8LgjeEOkuV5BAWLzcIeJYbGQf2rZz+NqqYQB50cXFN9WFZQxl7JQd78HScvAM10iReUKHwZQCJPXwEbMF5DY2PXSrk78Wzl0t/P73rh5vl+9Y6m9BIjYEz7iPaYjhsS9xsfqVUSgmRR46zBqt6BGcFwWrioAER+Nj6Ojf8toydrGe8uV3rXL+DenCRwF+zlTkJXST4/uOANpqFoQiG4fNpYVVodeImAv4I6NgZCFmvEQs0g2ABX0dE9o263GdJ2E3f3UtLLa6BbLCKI87F5ErC8qFsvBVXmBPfrYBhgt3wI3NTzmA+gs7j+2x3lFhD5/7VQ8TlinJTA== 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=vQxoK17Cakl986Mvma50vnfKL6cx+npds47dwk5ZqDo=; b=nkIM6GOD+e4r/aBy1W59ROy9oyYC6CTVapb06sPuV4fykEkFJSEs/cJ8QwPRvCHF8+HPluyQKFTHMBzg8bboPGNvm8a1WbPNRYqCqxEJdk6Y1YufIq/KnM0+1K03fnIugGrhLwQMwgFARhMGwBkZ6S0lXNVEqMJ2ajJMjpXUbe5umQXAW5V3qifoCTmAR+qtUGts3wejMf1Fyl3hrbtUGwKofGqj4o7u2NfTNR5qx4lUhTsu+7fi5shLHPkthwLxjbEcoJE8o1/L289i+r1AfLYG6zkTCTfHTALk3grTfinm4y0AfX7pVggrxjmZPUI6xssSIHO9SKGCfkSuG9ORpQ== 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=vQxoK17Cakl986Mvma50vnfKL6cx+npds47dwk5ZqDo=; b=IfBdl/koIR3VNzr8od4bxzvrNZyEjpR1VB7fhOX9zcTtJi0oWWvuCL9+BK2DlhJF9WYwZY+7c4L9Oly1xxdlbsrshLuFpOFZCNWCdy9bf24ymAV1tT/1ysMeNmtzh19N4HNBBwpaD1ImWVuGZjTIGa3yrYKykhTvg14IwKGRINs= 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 SA1PR13MB5465.namprd13.prod.outlook.com (2603:10b6:806:230::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10; Fri, 7 Oct 2022 02:19:20 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773%4]) with mapi id 15.20.5723.010; Fri, 7 Oct 2022 02:19:20 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 06/24] net/nfp: add the offload support of VLAN item Date: Fri, 7 Oct 2022 10:18:28 +0800 Message-Id: <1665109126-16201-7-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> References: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5465:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c31d18f-f328-4e4e-fe2d-08daa80a57e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H87P39LnlLoYplEpRxdBLkgIK49G8mm09i9+uipA53Kx5sdTdfbeRfsNNpT5qJ2vDXqPIA/vjsvW/jeDzyVGbNyJfGFCx1IBoS+Z3TaVRUplJ832fQvqNTKmQtFIPghVdrP8AYPIdyQhuzi/QprLEpV4K7kCiRmWPURda+vLAtxdqTKh/RfMEEBaWMzX6WbDVpAh8obGszcolv/X0Yx0JOfpVoUmMCUbZaWRc+qV40om+GJdFqRxkygQSm9szt5oZLWbXMXuhl7nIGRocWOZgv/sQ+ACmBPDkwMsK1rrhFW65z7dJgzhQywfwd2jW2ansIDHvKz5we4oC7FqL/Utlo+jygoWVgqQrlrTsprczU6kpXnPmWhDLhOGUCFxipt3Y7ok7YIJhsQ3+hdKeh8UdYDEVKEwTukCLzd1fWo5QNpnk7Dj05270uxg6DDOGpwSOVqq12UZ+Vb3zeuH4zvRlXd/8L4e8Px5BHhxyymXisZ9GzftijuyuaL0sE6qhiLbBZq0RLboq+oITliZgJA7/FIDaKhBD175lqJpU1iPqj9V12KB5tDyHM8bpZ6DpcXz65gQIeriTUnuSkXKcrEenIxHhGn47CgWKyKzhbjnXf/RwUkqZ4fZpY962ITpX3IxGnKmsbolMas9gpWi/6f7WxhrlK70fKY4taUzRFR+utJjMttz0sp1yblmVi9LrDkB8F9XaaPedLD047SVc+n1PYxTMXaPSb7kRfN/5UUSLtUGELaTZJXYgk/R6WZq7CY+ 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)(39830400003)(366004)(136003)(346002)(376002)(396003)(451199015)(36756003)(86362001)(66946007)(44832011)(38350700002)(38100700002)(8936002)(6486002)(6916009)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(5660300002)(66476007)(66556008)(2906002)(186003)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Jl2nc1VAWQ8DShvAH2v9iCH+Yw/t?= =?utf-8?q?LFEzQCMh7IqR67dPa/lT4LEwFedwHwsozBw9j3eN33XIszmpRbvhOZhR/oZprQWQB?= =?utf-8?q?gFRK/WKfxP8zxTWoG2btxRpzubA+Y827fxTtqBEJM79kPQH9dvqcyxNalwVhHoTSt?= =?utf-8?q?H/by4pq5bX9bcRX2fUSzvftOQPDkXOsJRU8CdqMYJAcIxoihcSCF6Vz4P91VornyN?= =?utf-8?q?P1Al4+Xlm/jWMdcPTxurxs6lCnNVbk/7Mn0hVYRj06W4KsaAMCYYLdnR/EucknKKS?= =?utf-8?q?gph/wzwZad4ofsZ+ZXJGmI8zpk+E9MwuvuhEMNfeUZBt/vdcRmaJhCsR2EsoWKEx4?= =?utf-8?q?0RqgqcjIp6qV7lApln6hyky74hUffz6tbo9u5qy2lbDTj+G8C7zGwE11OQoKws/F7?= =?utf-8?q?u5veV716aBqBG8mjCE7neodF3hHHYhLIwzsKFi9LFYQqw/p/7sDXimJwJ8s2Ji3uF?= =?utf-8?q?AUIOb51t4HWstWFNzPVv085UDagHER3xf7thNTZwEZnEOuJu7hngkCZHZfCL/UfyA?= =?utf-8?q?WwZsLGC6MB6mcN3EHNCR/QUe3ZZXtQBT4io0/ZG8dFGyMlFAfx2+hGvwO5fo0jdc9?= =?utf-8?q?+lOgLMPECLW3J0rL2jXJESM68lgO4od4Zo/pNkAUB5lWHr5iWup1LK7bM1PaAmPbP?= =?utf-8?q?RGRG++jdPhKa0u7fyMhy1L+IsK6W7+eS2tyITirY9gSmDEvgpdFDNYCmxtwcc0EiS?= =?utf-8?q?L3Xjlo7xpPwfKFyKwxkT+xjlYzRbi2ZGFBDm8n4s0bMvgVCvQq8+H6Ndj7ggQVN6a?= =?utf-8?q?iuP7fbUYpN2gV1PGSnTzd/gUrfSbt8nCCHG+4VyvU1fVdVRWUFZGqj1yDGatZmqNK?= =?utf-8?q?4TCckxRedlDP0jyv3kpQ1O4SE+mOBk8Ua64OK8en9PAyDccdvh3RZD89pPxMcpasU?= =?utf-8?q?6N8aGjmRmzeM0iLJ7cjJCJmbGSLmdsRrnCksoORmAmeY4IKfm3vQqfRhhSax141ql?= =?utf-8?q?X/dPojFUgycRfuZNQMnOC2Qql1vZnjkmF4YCf7UyEGdJXXtQ7GlW7HizGqQy61jhc?= =?utf-8?q?oXSviV6RTQmLBAJ8oNRLviWufJ5aqvzteGvsszzU9eXFZWKfPWgSYxpkZvcNbZTVh?= =?utf-8?q?HtPjSP9dIZFGHA2YIAXPIP/SUSBI8zu9yZjUsg8meSzrg1tSTn1bJMN6xuJjlsPjc?= =?utf-8?q?spAxgUBODPwfho8o3A5/lgllrPnUSwZbe9zje7biia+QSGq1+yxnr6a4qm6OBuQ2i?= =?utf-8?q?88HMPaR9p2itQ6di1PcFs9g/YjxOUVAtpKOxkAHtIj35eio1ztFn7NPJEHgzBhaY9?= =?utf-8?q?7kyAcPsV9DN/aK+6P+C0x9CFOSNra9ylQ4mdSE9udZBwY/KuFBFstJYPGBjvn7igR?= =?utf-8?q?3KCCLtDcIr6FvWrBwvrU7K288EowZYvzoj8tU/XfHZe2i86Rb5hExeBgCJKMMPUxE?= =?utf-8?q?eeBHJ2r2NkEkhhHpI+SjKVV2WiYTXX6XEHzBV8hB4zcqNVzgIShs8lxUWDLahihFW?= =?utf-8?q?7IOdg36aKXY+xZ8uzB+lMrj4pHNa/bw/I7I0vpL3BVTa4xxNp0b3N0JyjLDai1kdT?= =?utf-8?q?Fc0gOqol/um4vgmDqcRV2HJvGJb53NeLjA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c31d18f-f328-4e4e-fe2d-08daa80a57e9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 02:19:20.7562 (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: +9FZaCwfX89QqQiTli78Xh9MvRfymP7/5FKKHCTY7eM211+wWqA2L7qcN4pf1pJbZtlAsTxZ/Tan4yAufOuMBq8ljBx0vCpDqKhAf4LlR7w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5465 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 e36a711..5163264 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -108,6 +108,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. */