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 19C2FA0A02; Thu, 20 Oct 2022 04:21:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D69D42C74; Thu, 20 Oct 2022 04:21:09 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2113.outbound.protection.outlook.com [40.107.101.113]) by mails.dpdk.org (Postfix) with ESMTP id 020FA42C60 for ; Thu, 20 Oct 2022 04:21:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MKoemq2yY7ZAzJtBNSNBTfjbao4J8qZrJkAYgeWIhVuFj05I1TjdbHmnbDtnE/emxhU2Nw56xYT+l3KkdsMceA+IJFsGUNJDWAL/wmn9SzFwFC5skXXnyDWFIRT0JVtPK9ObaTwGfPweksA9B7eERDpTwMTYJc6KBLybWo3fD6xjlY9qTwkE0ATxG9h++UYUMBATsE0cHytGlyP1oLMLWu84jnRarYAHnjPKTc0FK4PFaZzcsCAPiJ0+8QXCzaNTU/hcR2FHMOuEiJkCgiOn3o1t+d28/a95mEM2fOpRM3LJlmWpdZeZpyRFqjJ+yYEim6fb0tyPRChsbAWTMdnUtg== 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=S5rzSMZ+C8QekkJ9Nv+toeoVmWT6eoBUR6pL6sAXqhI=; b=OjE4G8Mh8EQ22Ct6UU+xbqop7m7JXO8+9hnGATnWQ2XqnORHPLm3TITYwX53AEplB0oWqKO6pfOyglcpxfjnp9nATRGdXpgeofC9BOsddJDDSHdkkkOn7EWQchcNHz0lpvDXcX1GNYwE1UlSNRQ61UwKUitj5obbohzpHYXmHnd9SKVxJTnyp9v9ZtF7NsiklBiR+XGitWDba2RiZrJ0sWsjFkobzyD0fF3VNQVwp7RxlTVXZQyrz8seWT4bOM0/U6+cKvGeBNgfYpc+rtscaYdMaBzdz51in4Pu8AcY6fQTWeEx0dbLO/BSDsTYGcxPQYy6fwSbSrQkXQYja6tejQ== 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=S5rzSMZ+C8QekkJ9Nv+toeoVmWT6eoBUR6pL6sAXqhI=; b=VIqeqs8AEZVHYUqJDf1x9pY7ZTIpIFo/O3OjYiZZaUVimuoeAKZ3tq27wsYQnhEUmLfUvsEr1Ve7h4n82DvxSVuGNknX6ZUVzlNjDlVRrVOR6eLUdkrEX0vsRTeVSNDKGhNDB1GHrMtOQu13eNJOB9ra4fZAuHmuMDWgNClSxd0= 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:04 +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:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v5 05/25] net/nfp: support basic flow items Date: Thu, 20 Oct 2022 10:19:31 +0800 Message-Id: <1666232391-29152-6-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> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 4ad8f2cb-daca-4e72-446d-08dab241bd13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g9FqpF/ji4a486HIBYzFq+LlYzquuG4pYJA1DN+d3yN7DqSMCBNz2l3fOBf+avRIY6OJlzcIrvr0GtcDruePW0fEzFe8vnTdh13vCwLtYKJp/bjtuXJ4LLnrQG3gu4tTk/gMIQbT/qT0Ga8/wTEnkF2XEYFImF/WhsOtZMw+2+w2Ld7Wl5MmfpFLVL0n9L9iZhkPkCnApDVfkd18VGduwPnGaXcUniCmYKeNbw/V/XEG9bwPY3yKwfsglNyY9XpV7nURDRQ7K+pP3davdo91l1BzDcIjgZCv24UBj6HCQAvmjcULbpNG8Cg5I1pCky3G/fjQgkebf1ZWJVV5O4zBlUDbbEHdilB9Qm1jQ91swmdgFUjlvXjmEfUnYJG55Hc2XSzB+S7ZxmMhK0uSz5f0vqeNrQ48XeAMWl8xqQS8b+7jYf3ejWKKeXxTMEokFffaQLTstirLBGdwnm+9cHRfHdg2XoYKHSebgsoIppo5EDsuYOKdFi01aJQ6wLtnMz7p3fbmnJ7NrxUg1S0XD8/NJFwwezgMx6N31Xyw/2gz+fOYQiPSx39XAYsoMFRScVl7fvmE80jOz3h6/48koA8wps5tuOsFgDreh+pVLBHhm1uf2VTsjnLIw0jXzvXkpxeClqFSR4qQCXkOrQYG+WRlF8bZKpaO35ZZ8/IyXAJdigOl9ZyMp5GyvIWTUIcbj6wkmKLKXlQVvixW/2ylMGaaZtaezXwICBRQCFKd/o3s6epkjB/rIJsVFez2XUejz8L8gd32HP6cobscghrjLXLVdq+zjjuHVCWhJ/dGWzK18PRcelwJ2ggr3SNowRyhBM3D 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)(66574015)(44832011)(86362001)(30864003)(83380400001)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?KzlNdlZRR2s2MGNtdEE2d2N6QzVPbHI2b2FZMU83eW5ETGpxanFVTElYaThr?= =?utf-8?B?QzdER21ESWFKUzJtRlJkVWdLUENvYzBXYktqa1VKNVFyUzdZZDZGbk9WR21F?= =?utf-8?B?bXBWdXBvS3FkSEdRQ0oxQjlRTnNwQkI2YllKM0tVekRtZTVQNStBSUNqVDBZ?= =?utf-8?B?enllN1FFUS9jdGI3bnh6MjNzRmdSS0V1RWVtU2c4eHo2QWhlOGZZVStUZXVP?= =?utf-8?B?Wmx3eW5GODVXaVVIV3A0cFIyRXIxQzBFTzdjTFlBeVF5OFVMTXlRbkh3UTl0?= =?utf-8?B?VXJCcFFCZ04xeDRBckltWUw1WnFxQkkxb0xJOGFCaHp3S1JFemF4MUtrODFK?= =?utf-8?B?QzNXa1lJd3RQVmV4ZlAxVEpMRU4zeGg1TGlEOU14VkZ3c242V1RmQTVsT1By?= =?utf-8?B?bHo3eXVwTlU3NmNOQ0xBZklmZk95Qzhyd0JHNTNDYllQMVR5cFppTFRuUC9m?= =?utf-8?B?VUhIWE9pellOSCs5dC9udm1obnNVWjBLOTlKYThRK1R3TEFoenlvNlRSWWZT?= =?utf-8?B?SlNwR2V6U0NGQWtzeDNiUzhxVVVYY0hVcEVxUzhoYllEK3Evb2x1VDdPQUQ4?= =?utf-8?B?N0JtOGh3MXlTUGRMeHFPRHh4L1lGVkJIVE1vWklhT1E1S1VxNkQ5dzBiQ3d4?= =?utf-8?B?bmZvWjFpVll4RDhZNzZIeWhoTjFjeElSbk1WbXpJR2xSMkxRYTNaOEdhcnNq?= =?utf-8?B?aWxFTnZzL1hNRHZDV0p0Tks0STVrU3ZqK2xHd1NkUFRzMXM0TWtWWGw2Wjkz?= =?utf-8?B?eXV3S0Y2U3N1YzhaSlYzOHhYWEF0dDY4NndQeEpxV0ZTeG5EbmNBb1hPdHpW?= =?utf-8?B?bzZKQVhoUkhzWm5nZmJmQVRGRWtnakFIZmJ6MTZUYzNULzdTVk4vN0lQLzRO?= =?utf-8?B?TUJZQUErUEVaTVl1bUk1YS9veVFkbHYvRHpoZE1sMU81VHNSSmtSTXBsQ2hK?= =?utf-8?B?Y3JIZmhtOGtRUmNucGNVWFMxenJsYmNZVWNYSkUrUThJb3lyTUNwWUNZdkJI?= =?utf-8?B?WmhNSEdNeTNMUnFSa3RxSTJkdGJTWHpiTXZ6Rmt5cGZrL0dGWWprbmxDTDN4?= =?utf-8?B?eDVyTlQ4S0U4TlYwMVZMTzY0bHpaci8xTVdDNFpmdmZwMEtzb0ViSGYrczBH?= =?utf-8?B?SnVxYzUwSFdEaTBBR2x3RGRjdjdsK2sveFBzTXdBd2tRNks1L2huQkdYK3E2?= =?utf-8?B?b2RJMFF2clBYMVh0ZnRJUEpkanZkellxeUgvTEdEbWVCbDhiOW1STitHU2ZX?= =?utf-8?B?WFlza3lqUTdsRlVxSDk4S0M3NEM0blhqay9VOEJ6RkE2TVY0UFJxekl0STIr?= =?utf-8?B?NTk3MzRRVUV2SGNWSEpZeEN6NzdNKzZsbWczcnNnQ0kwbWlmN3NiU09RVkx0?= =?utf-8?B?TjNxQW9HbWRXbDd5eUpDZFpqZFpTTHVIU1o0ZjlCQ3JLRmUyZTNrOXlPL2xQ?= =?utf-8?B?OWFhM2hTU01GQ0VORFVmTFdNV0haMEFtWDh2R2ZPdTJWYWtlNTFVRVArYjcy?= =?utf-8?B?VmMrTjBFK1JjSk5venBMOEhUMllSaDBrQ3BDamhXZDhJaEZ2UHo4SDdKNlJB?= =?utf-8?B?bGl4TUhKWGhzMHNPTlppb1JGZ0k5bUp0TXdKZ3F1T0NCQmc2R2crQmtOazRT?= =?utf-8?B?cmk5NGZSV21VNVZDUWpNZVFhYnJHdWhqL3BsT1FvWFU3Rm5XWk13L0ZuL2pv?= =?utf-8?B?WEZLNmRpNlozSVFkZTZ3Q0MvemNKSHlTKzhhT2Fob2RWS1RNT1JITldjUmpI?= =?utf-8?B?TlhlOUwxWFJBaVU1dktFRjRUdFpNUE96czBlUnZoSU42d293TWFvcUFIcUNu?= =?utf-8?B?Sk1YenhMVU9aNDljV0VqYzRtak1iaVJOeVQzN0k0aktCbnFTLzNtUXB5TDI3?= =?utf-8?B?NTJ5YS9xbkcwalVXbGR3VDZQbkpZNXhTTjh0QlJnVDk1WkFOektkNDkvN0h3?= =?utf-8?B?VythSWs1YUpJUFlicFpaemRPUlg1dlFBMkdxemN1eldLejB5Q2lZYWhScTVp?= =?utf-8?B?Q2ZuVWtnSm1UenhoR2Q4bDRCbHkrdE1MUEpmTCtzMEw3RC9ZSGlzR2hVZ0FV?= =?utf-8?B?c2ZvaHduR2JKQ3N3Y2xRUUoxdnZ1WGUvQUIvNUg3OWpUamlNdlNud0xhL0h6?= =?utf-8?B?L0g2SjJFUFo0K0diTWlkeVIwbzZoUm5wemRMeFJmRjNVR1JQSjd6Ylh1dGJ0?= =?utf-8?B?N2c9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad8f2cb-daca-4e72-446d-08dab241bd13 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:04.2683 (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: 5Wc0SVj1/jAPlIH76p6s4S0ihA/8RqkEhu0lzXcwKw5HVC0BEo9NtGKDX3W2p0Arec0rR+mYu0tJDhpD8svj2KvnXPqS2/W2/ty/fbkfInQ= 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 offload support of very basic items: ethernet and port id. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 4 + doc/guides/rel_notes/release_22_11.rst | 2 + drivers/net/nfp/flower/nfp_flower_cmsg.h | 20 +++ drivers/net/nfp/nfp_flow.c | 252 ++++++++++++++++++++++++++++++- 4 files changed, 277 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index f7a0362..4460cf0 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -25,3 +25,7 @@ Linux = Y Multiprocess aware = Y x86-64 = Y Usage doc = Y + +[rte_flow items] +eth = Y +port_id = Y diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index a3700bb..6d421a2 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -163,6 +163,8 @@ New Features * Added the control message interactive channels between PMD and firmware. * Added the support of representor port. + Add the support of rte_flow pattern items. + * **Updated NXP dpaa2 driver.** * Added support for flow action REPRESENTED_PORT. diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 6045bb0..75a3b91 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -233,6 +233,26 @@ struct nfp_flower_in_port { rte_be32_t in_port; }; +/* + * L2 details (4W/16B) + * 3 2 1 + * 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 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | mac_addr_dst, 31 - 0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | mac_addr_dst, 47 - 32 | mac_addr_src, 15 - 0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | mac_addr_src, 47 - 16 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | mpls outermost label | TC |B| reserved |q| + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_mac_mpls { + uint8_t mac_dst[6]; + uint8_t mac_src[6]; + rte_be32_t mpls_lse; +}; + int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower); int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower, struct nfp_flower_representor *repr); diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index eb1e42c..1af0acd 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -19,6 +19,30 @@ #include "nfpcore/nfp_mip.h" #include "nfpcore/nfp_rtsym.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_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 unsigned int mask_sz; + /* Merge a pattern item into a flow rule handle. */ + int (*merge)(struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask); + /* List of possible subsequent items. */ + const enum rte_flow_item_type *const next_item; +}; + struct nfp_mask_id_entry { uint32_t hash_key; uint32_t ref_cnt; @@ -464,12 +488,36 @@ struct nfp_mask_id_entry { static int nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[], - __rte_unused struct nfp_fl_key_ls *key_ls) + struct nfp_fl_key_ls *key_ls) { + struct rte_eth_dev *ethdev; const struct rte_flow_item *item; + struct nfp_flower_representor *representor; + const struct rte_flow_item_port_id *port_id; 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"); + /* + * eth is set with no specific params. + * NFP does not need this. + */ + if (item->spec == NULL) + continue; + key_ls->key_layer |= NFP_FLOWER_LAYER_MAC; + key_ls->key_size += sizeof(struct nfp_flower_mac_mpls); + break; + case RTE_FLOW_ITEM_TYPE_PORT_ID: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_PORT_ID detected"); + port_id = item->spec; + if (port_id->id >= RTE_MAX_ETHPORTS) + return -ERANGE; + ethdev = &rte_eth_devices[port_id->id]; + representor = (struct nfp_flower_representor *) + ethdev->data->dev_private; + key_ls->port = rte_cpu_to_be_32(representor->port_id); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -529,6 +577,202 @@ struct nfp_mask_id_entry { return ret; } +static int +nfp_flow_merge_eth(__rte_unused struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + struct nfp_flower_mac_mpls *eth; + const struct rte_flow_item_eth *spec; + const struct rte_flow_item_eth *mask; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge eth: no item->spec!"); + goto eth_end; + } + + mask = item->mask ? item->mask : proc->mask_default; + eth = (void *)*mbuf_off; + + if (is_mask) { + memcpy(eth->mac_src, mask->src.addr_bytes, RTE_ETHER_ADDR_LEN); + memcpy(eth->mac_dst, mask->dst.addr_bytes, RTE_ETHER_ADDR_LEN); + } else { + memcpy(eth->mac_src, spec->src.addr_bytes, RTE_ETHER_ADDR_LEN); + memcpy(eth->mac_dst, spec->dst.addr_bytes, RTE_ETHER_ADDR_LEN); + } + + eth->mpls_lse = 0; + +eth_end: + *mbuf_off += sizeof(struct nfp_flower_mac_mpls); + + 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] = { + .mask_support = &(const struct rte_flow_item_eth){ + .hdr = { + .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .src_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", + .ether_type = RTE_BE16(0xffff), + }, + .has_vlan = 1, + }, + .mask_default = &rte_flow_item_eth_mask, + .mask_sz = sizeof(struct rte_flow_item_eth), + .merge = nfp_flow_merge_eth, + }, +}; + +static int +nfp_flow_item_check(const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc) +{ + int ret = 0; + unsigned int i; + 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 ? + (const uint8_t *)item->mask : + (const uint8_t *)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 && (((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_flow_compile_item_proc(const struct rte_flow_item items[], + struct rte_flow *nfp_flow, + char **mbuf_off_exact, + char **mbuf_off_mask) +{ + int i; + int ret = 0; + const struct rte_flow_item *item; + const struct nfp_flow_item_proc *proc_list; + + proc_list = nfp_flow_item_proc_list; + for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { + const struct nfp_flow_item_proc *proc = NULL; + + for (i = 0; proc_list->next_item && proc_list->next_item[i]; ++i) { + if (proc_list->next_item[i] == item->type) { + proc = &nfp_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_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, mbuf_off_exact, item, + proc, false); + if (ret != 0) { + PMD_DRV_LOG(ERR, "nfp flow item %d exact merge failed", item->type); + break; + } + + ret = proc->merge(nfp_flow, mbuf_off_mask, item, + proc, true); + if (ret != 0) { + PMD_DRV_LOG(ERR, "nfp flow item %d mask merge failed", item->type); + break; + } + + proc_list = proc; + } + + return ret; +} + +static int +nfp_flow_compile_items(__rte_unused struct nfp_flower_representor *representor, + const struct rte_flow_item items[], + struct rte_flow *nfp_flow) +{ + int ret; + char *mbuf_off_mask; + char *mbuf_off_exact; + + mbuf_off_exact = nfp_flow->payload.unmasked_data + + sizeof(struct nfp_flower_meta_tci) + + sizeof(struct nfp_flower_in_port); + mbuf_off_mask = nfp_flow->payload.mask_data + + sizeof(struct nfp_flower_meta_tci) + + sizeof(struct nfp_flower_in_port); + + /* Go over items */ + ret = nfp_flow_compile_item_proc(items, nfp_flow, + &mbuf_off_exact, &mbuf_off_mask); + if (ret != 0) { + PMD_DRV_LOG(ERR, "nfp flow item compile failed."); + return -EINVAL; + } + + return 0; +} + static struct rte_flow * nfp_flow_process(struct nfp_flower_representor *representor, const struct rte_flow_item items[], @@ -573,6 +817,12 @@ struct nfp_mask_id_entry { nfp_flow_compile_metadata(priv, nfp_flow, &key_layer, stats_ctx); + ret = nfp_flow_compile_items(representor, items, nfp_flow); + if (ret != 0) { + PMD_DRV_LOG(ERR, "nfp flow item process failed."); + goto free_flow; + } + nfp_flow_meta = nfp_flow->payload.meta; mask_data = nfp_flow->payload.mask_data; mask_len = key_layer.key_size; -- 1.8.3.1