From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7F85FA0560; Tue, 18 Oct 2022 05:13:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A20942B6C; Tue, 18 Oct 2022 05:13:06 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2091.outbound.protection.outlook.com [40.107.101.91]) by mails.dpdk.org (Postfix) with ESMTP id A90AD427EA for ; Tue, 18 Oct 2022 05:13:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KbkDyhiHboGCFOmwDJpbm7fDJwD+4sx1NhRNMChX4YboLq4AqADjfJuaAsiz54p/GBeOfNlhiHS2djd1tOnd5qoEytXzLwoEr8v/gWBKduG+mxjRaxxiHxbR7jlrDD3FWP36xjPMhYiXPFSAdIzXWbtsNCxG273NJslO8mKhQyJ44kr5rlgAQtrqNJ6mTq1yg96Kd7YP0jMFj9U24X+gNR3Jo90pb1Nyq3XTetmnZe1hHvNMO+SFMJySDKS7Kcrwh4CwzpuvPkwUM5sbI6wrChDdjZkWLlFGTLuA0Y0u/hSptLLjTZqHTOn0B+Dv/wv1qrfStNFRXrERLl9lN3YBWg== 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=nwllnYfMydzDUKYScRQZiePmfeFfmurJuzBv5iaFATw=; b=mEI7EXk0Ro6nr02kh45IvbSbTLXKRkt9XTSJhWMKVmtvgiVbzDQX2W9cspFLQVS8m8fTEt0Nl5BomP25jKUhVY5hTsQ1kw7EPDYWoelIogvHthPEG7ZkL/ypLO3TYur/styjthoOi4L5Javl+h2GVazFxc3ms/htHUN6d5jDzxCQk5y3eVbiXISFL5mnpPBuWXbWGU3BsjXXnvHBmVE+y3IgVmZ2gI+SMjO/T0g4YQzaATxVIEheY2bWTv/cQ3TVsAyWYZtWmjwWdZBcdrriQSMd1SJ1oIjxhpLOpif+f0HC5DSBLc6999TjciRdIs1r0z/l6++pDBv/lEXKbjSs/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=nwllnYfMydzDUKYScRQZiePmfeFfmurJuzBv5iaFATw=; b=KRt97Kbe4ijbE081xvy+Saddtf5/l00FqF0fNgCbzjlgF4z5/mUp4LRpN3D/lO8TnPfmnw6gOqzkqWYG3xnI9LeSfyyzRYZJTOg8M7xm3YqGYOhl++WcXnx7syG53t4wo1S543RvljzXNwGEoUOIb+1ZbWPPyHa2jHEA8okHWW4= 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 DM6PR13MB3788.namprd13.prod.outlook.com (2603:10b6:5:242::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 18 Oct 2022 03:13:03 +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; Tue, 18 Oct 2022 03:13:03 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 07/25] net/nfp: add the offload support of VLAN item Date: Tue, 18 Oct 2022 11:12:14 +0800 Message-Id: <1666062752-33689-8-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> References: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI1PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:1f7::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3788:EE_ X-MS-Office365-Filtering-Correlation-Id: fb403bf5-ac48-454d-9a51-08dab0b6ab0c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yJynxb/f4CI3IUW3VJZ3pyJ1AJ3+Ee45qLD85ZeghnvktWB2hEI0lklLnSIr0jBS3UKbpxO5AAB94pBFeodVknCTJl/1SU1bneMJvZozFWBz7iibmjvGe4RWiUNuv5inhqWuozzQ2iAdKguahlvbaLC+vQ9uWntUKQYndFndxtZhFCc8d+5OgfaicYv5ZaCPEzTfTr4OkKeIIzLyRbZ3KCnndtsHISiAhS4huIaxeFDHbpb7lklYGTlloV/KNCcec4aRLazkK3loTKl16/5OSzf8g+BiLW5GRZf/3P6RtBw7xMDhR/nbdBml6oofBY2Piie1/xmPT5GTexMev5o8jngcBFAVe3J6xQSFRLOFCx3K06DGR6w9UEd9K9+89EBUZ6bdwu6TXLLJqibsIqcJwkqGN8AUpDqOaAlTbF7jFoG6Bo4PRQm+fMeUF4yYi1xuL7+LJYnYRGDHPn6AbrLk8otr3FRYmg0eHzbkoIlY0MnJQ/Ai3PXHKkUYc0M31YOB/rKQ1GdN/eF1RAhBTDjUbOPrlwlPC57R77N4h314KSFtIdqABB9kqX9HUuSG4Ue/4wzScYRvUYU+Hj3aKDMFFn+wghOmdNtnHPcuZjoHfltbV7Y9sDJ3drXzdWkhsyXhHbKwfQeClpt8FgsrvZvoSZcJ01y15BtPHV/h+BkM2GswzV0ECyqU8wwdKy6dPQOJ3zNsqLrSoAdYBZPd5wATL4v8GVkxMOggNAerSeXE/yLNGB/XZhwPzutsnWSfSJq7hWki2zeJORm2RTFJ+p60UA== 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)(346002)(39830400003)(136003)(366004)(376002)(396003)(451199015)(2616005)(41300700001)(6666004)(26005)(6512007)(107886003)(186003)(316002)(52116002)(83380400001)(5660300002)(6506007)(8676002)(44832011)(2906002)(6916009)(8936002)(66476007)(66946007)(478600001)(6486002)(4326008)(66556008)(86362001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cEkzYSsxM2N2ekwvSjR1dndNcUJ2emVEek1JVEdtaTBlVnFTK2xpM1h0d3Zr?= =?utf-8?B?KzhLaGVFeVpTL05QalBmT0E4WnVFZGV4aGdKVEtBTEhTMjNqbGttVDdCaGN5?= =?utf-8?B?NWJGc0hveGkyZ1MyY2NjcDdPeWtVazRsaFFPYmRuNGVneG9TMmhGbHpQVUpw?= =?utf-8?B?ZlI5N3RrMXlqaWVQOFVUWjAyZkRNYW4rSCt1eUdQUllOOEplWkxrNFRkajYw?= =?utf-8?B?L0ZGcUt3cVVBV2J3TUVWRUFkZ0I0Q0E5UjNKbGhXZkdpTTNRSnd0MXZzY0Vp?= =?utf-8?B?ZTVmUXdJaTZVanUveVNIVTJKWTN2aGlJWGoyMzVvZzJzaWc4a292LzVNQjdB?= =?utf-8?B?L0NZbHZOVk1NdDlsdll4clhkb2h3UW9TTytZekdySkY1T3NMWFJlSkF4WjMw?= =?utf-8?B?WEdOWVRoVVRhSDJOU1R5dmtCbThzdUxtdU1XUTZ0eGEwNWxyY1ZIVTZOTlZm?= =?utf-8?B?cm5JemRzc3FMclp4SUxpdlpqVTc2cUhCSzV6L0piQ1F6SHJNVzVKdDgvQ1lv?= =?utf-8?B?M3I5eDRvUVFnVWE2Y1R0NloxSk13MHdEbi8yUzgvVkdDOEJpMjBCK1lIaWFO?= =?utf-8?B?Q2lYTXUzYStKbGM3QlRjaFdFLzVNQ1BmQVRxWlZNMTZ3dUhPdm9PcWlld3lY?= =?utf-8?B?MXZPbnlHZDc2aW9lb2ZQRHFCZDU3V1JwN2NuYmlsdy9yS1p6S1NzdzJhdFA1?= =?utf-8?B?S0NKNVFYWDR1TXBNaUMyOWlwRnNDamhraFl4aXJaaGUvQlJsMm9mU0RqckZY?= =?utf-8?B?RkJGV2ZSRCtLUGpCRCtrK1JkWXdNS1pZd2dJZ1p6bERxazduM0EwdVRpM25U?= =?utf-8?B?ZzE5SlJDM1N6dm1kZTUrRFgzSGFOczc2aHJ3eXhuK2IxellNQ0tpVUZLZEVr?= =?utf-8?B?SGV2TXAyN3EyTlQvOVk1U0xGQnpOWTVSdnZueTdudFV6eWRLM0JtZHNudHgz?= =?utf-8?B?dTRjaFF5NzVCSXFCQkl5YzQwdXJqK1BDQk4wRTRXZEEzZEJnR2FFTXl4RHQz?= =?utf-8?B?aEhjTmMybHdIM2taSWpuMklXWGt2ZnpyN0RaQlNreGFoZmIvTCswMWRQcmVU?= =?utf-8?B?RVZFQk1aWkxVeXlWdkIzbjl5TkJSZ2tiazdJM0YweE80SWhoWXFYVnpuMUcw?= =?utf-8?B?aEg4ekFQZmZFZ0g2NkRPcjI1Y0lUbmVJKzFSQjZXemNCS3ppT0NSb0Z4RTZF?= =?utf-8?B?K1JTNDVzaGdSZ0RIczdDdUVWQkxPcEVaQTBBRWlRbUpERTNqUThTbFY1Nmhx?= =?utf-8?B?S2FXV0hQeHNFUFNQbTVDVWs5K3NCaGVVc29paXU3Q0k5VGVLWDFNZWxtc3pQ?= =?utf-8?B?eVQ4VFpLdTd4cGNlWWMrVFgxZC9nUFk1YTRSLzcrQWIxTSthSzZER1NjTWRo?= =?utf-8?B?TmR2a1QvYWhpRzZTdys1VHpwMmRyWERqbDBjd1ZKQnozY1NoemJ0dnFqelNK?= =?utf-8?B?d25sbFN6MGE2Ti9YVytUc1RhWVRFT0oyUWpJVFVyeUxVaExRYk1EVmJOM1NH?= =?utf-8?B?aUcxUUtRMXdCRGt6MUNYYTF4NElDeFIyNkdMZXJYUWpUeEQ0R3AwSEhxSWw3?= =?utf-8?B?eVNmZjVJK0Rsc2Z3alA0T0FpUEhCUTlpU1EvZlBmVzdRdkNDaFA1WEFWRWxk?= =?utf-8?B?Um9NcmJBMlhsU2VIa1R4VDh0cVUvSHZNeXVrWlI4TlVrdVpZaXBkcXJSYlo5?= =?utf-8?B?VnVvOG9vWjI5TXhWYmxIYW50eHVrMlcwNjhXZnlKTExpVStvcmVNYm9PeWJa?= =?utf-8?B?aFpmdDhEdkx4Ui9CeVFiR3dJSW56UTFDRUxFaXgvWXFOSGVLNFY2TEJXRDlJ?= =?utf-8?B?dU5DckRlQ1NyWnFVR1ovRWZYL3RhVzFlRGo4NElUTVVjbzlvOGlKK0pUcmlN?= =?utf-8?B?NTNMeVNoZG5aZ2t4d3BTbmV3UkhWMUg1bWp3SFJiRHNyYkhMMVFQL08zYWFG?= =?utf-8?B?WksySFRkMm5QUjB5OWc1OU1UeTBXOU95a1NyZXVvNWNIUm50c2lhblJjcXpm?= =?utf-8?B?S2haWElDaGdEekN6L3lqR1ZGZGdRb3plY1A4bWh6THBSbk9xK3ZTb05paGRw?= =?utf-8?B?YVUweHFKRWlFMDlYWmxDMXVhMWNXa0RvRk41MkNheG42bjJVRHVqZGgyUG9L?= =?utf-8?B?b3hhWHRMOU9ZYkk4dk0vSlA2ZzVhVElUSHRpOVA4ekQwaVhJMzNoRkFxUWVJ?= =?utf-8?B?TkE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb403bf5-ac48-454d-9a51-08dab0b6ab0c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 03:13:02.9737 (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: 5PA8fvYd6Hoo5y3r0JbU1aOrYzjF/TtNnX5wh3kKwsg4Od1I/sgmYPllHSgI/M8bfK/HQDV2lHSnRVXuI68tmYJD8t0lD2oa89MfsMAttYI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3788 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 d98cb66..fe6cf11 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -166,6 +166,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 b444ba3..361fee2 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. */ -- 1.8.3.1