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 59D54A0032; Fri, 21 Oct 2022 10:03:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CD8E42BCB; Fri, 21 Oct 2022 10:02:41 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2101.outbound.protection.outlook.com [40.107.94.101]) by mails.dpdk.org (Postfix) with ESMTP id 1807242BCC for ; Fri, 21 Oct 2022 10:02:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lMVhN8ojr7ZWjn2d7ajvn5O+jH7NIgDrAiB8yAbwH8UVNUKkw0Pb3Vf9LaQ0cBlpfg1jxePmYxj9dlcFprjVg6XYVOKxB6+C4eMy73//PjoA61wC98TqLt5I4BRlAaclEDA1gqnJqiWjJ6GESiYvYfGqBvFn80D5i7X//v8hjfblzuLcz01k1Eyl9LB/JdGZfMiGlMeWHa47RETG8W2xCGWTgt+cTXjllkBhU1jU5ud1RXfClNMDOaNGuRSWC58wPG22XSPtqckvike1zeTd2PDEEfLhH5tT7uTRyUXSKRb3frge9YBaYv5IJd6ZljNvb/chQGHHILUfTYLX11+22A== 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=2mmA88IAhk9YBbXw5SrrQuCw/dLCCKuk1KUxuHegNBg=; b=Q+eaYnKRxe2pABEdzlw3DZj6iYQQJMD1zGuGCOzzO0oIRmMPaTnt8hrXiomE5LjsexZMGXb2OyOCKWj0hZaKqfbB+vJX28mcFsfF8lYOFmoqN032vHvHo1W+p+VmKLp15T7gt2FJ9m4wLBJrxeW2N0upOCbcOMOgeAcRSGYxJCBBLbEP+ofTCcahBfUOPeD+Ltd+1VGlOM6YJdaDdLLQV/PEc/Fc4D9qDSeJEcGlww8sFz9IHfW+AoLA3q/E/8+ULdSJQYdJC237f4XV56Qkm2IDs0nU0NF83yXTF/s2PLcr1+zfCGuC4IxIPvgxTCLj0ZboZehuvbamK0HRJ0QwrQ== 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=2mmA88IAhk9YBbXw5SrrQuCw/dLCCKuk1KUxuHegNBg=; b=PQR7XlcLssZaW0IRen1vo7Jowa5TNLcxekplRGpEQ2XdUR1nepWuu/ugfF+zhCsTl1zLeBtKfIFi/Ro6YiR9JDrzMx9/8333Dpnri1DpIWzZrWHKx2FKt0E1mIy6s//3sXjsszPAelMaS9O7j31cKh291iGsxLuN3euJPYBaB1g= 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 DM6PR13MB4493.namprd13.prod.outlook.com (2603:10b6:5:1b9::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.22; Fri, 21 Oct 2022 08:02:35 +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; Fri, 21 Oct 2022 08:02:35 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v6 07/27] net/nfp: support basic flow items Date: Fri, 21 Oct 2022 16:01:43 +0800 Message-Id: <1666339323-24016-8-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666339323-24016-1-git-send-email-chaoyong.he@corigine.com> References: <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> <1666339323-24016-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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_|DM6PR13MB4493:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e480c73-0ec9-41a0-6056-08dab33a9d11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1p0+tk5X1iyH0liqqI6sKdT5cb5JpiKzDj/8kWL936RVKbqitjZOucswcg4SgRWW40uWUD3bTMiw/Ir9A043LjxO5i99dTFqF7CuFby0j0kMTdIkipE6GPWUXGns4UH42thSRzXaoh7ekpBxRuQXOG1e3nUAjO3LbuIcfwxYizgb5hwC0O5QlSZHayU0uK0+IzGjTpyoxaxKxw5rsfV/FECLjyFNAT6bjoePhT6+1im2EPm1y0I3QdiQ57qtl+fvxZ4snnAMCJRw8iq+fS9ScmBnbhoYUGC3gpDIwQ5tj1UOpngDkJoH6Tc5s2cMDTrJGjiUkqfYqaUHyLaycU8bPxpnRPd8PMi6Daz2olw8sMB1jtYoZq32KmtXQB2JxidZUEwOgsqYDPKu+ffRjAlPHmDMqKm6ouC1DzyK3+644D+kNV2qAOCH2OiA2H22j2T/SI7wm18R5ypCwNg9HQVLb+4M5+ekS3P4Ogg4Ac0r2sQOCGD/fwgCzxGkYRCe1eBs7nQLIY513GKiPuKclvL3/7f6rDID2HVI6sgZZ/6ZxeYg/KZRtgeXwlGESZn3ueBHU7BTxBJO/6di3s+FZTgOPLtEPlrKhqk0NrPI9CMLPX+JL4WJkJl3xSYRBOLyqb0SQc79X7Hjw7wVB8YbbFYxiBnZqWZBcLQ1GP1a2A228XynAjP3maF8RPQm3jfVXRqU/QlftRdyIole6I7+HYHiJTsPW+jqmSr700kHlpcb5eubZQMIb+tRDufOSdNrp5k32PoMU4QAJZvPl1XrGXBabQ== 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)(366004)(136003)(396003)(376002)(39830400003)(451199015)(36756003)(30864003)(8936002)(66556008)(86362001)(41300700001)(478600001)(83380400001)(2906002)(5660300002)(186003)(6916009)(38350700002)(2616005)(4326008)(6512007)(66574015)(66476007)(52116002)(66946007)(316002)(8676002)(6666004)(6506007)(26005)(107886003)(38100700002)(6486002)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UG1lS3FEdXJtN0h3YVRHS0NUaXpQOUFuVnhDQWVNWk9rNm1KVFRNMUlaTjNy?= =?utf-8?B?R0dUWVZYM0hycEg4SmhZRVBCb0VqRVBXdWJtcXYzeitvTkZHNkpubEpNVFJm?= =?utf-8?B?dVNTaTUvUTVZcWpkRkVUVkhxTUxjUGZwSEFodzZVamptVS9EYlRYbi9qYTgy?= =?utf-8?B?RElITnJDOUNIeHJubm9qT3oxTkpIU0xCeWN4U29Vc0drSTA0VlAvSzVOTW9w?= =?utf-8?B?ZEpMamFSYVF2K1hrM1o5T0x5ZEhTUDR6eGYyT0Z1c3kyaTJidndMU1ByNHY5?= =?utf-8?B?RXNCeWZiSHk0UW9EWW5rNFBEb1NOeFllRjV1K2dESk9qRWpiaTJqK0pNQ1hN?= =?utf-8?B?NE5Ec1doNFNFd0xZZFNIZy9VMUo3WmowSzJPdmlYSXV5a0xRYTJ4anBMeDho?= =?utf-8?B?dXJkcm1VMUJncWI2ZzBKZEFIYUN1S2FCRkxjbS9wQ2tiNEIySVVjdFBiU2Ew?= =?utf-8?B?N2JrbWRBQ3pkUElyM0NEQzM5czR6emJNUGRnR3FacjY5YUdES2hWMk5yWGxa?= =?utf-8?B?dndRYzZKRFVTaVVlZUFzUUxOMndqVHRNWTg3U1dOUjJVbXRZVXFQa2dGVUFh?= =?utf-8?B?YmZOanVJRnQyY25PR1Ivc0JrYVAyZGVsT1FnRDBVRVNjM2dvRlJJSHRGeklS?= =?utf-8?B?WEFaNlBJcDlwME9ML0JqMG90SWhIUmNWN0daZjhPOFNhTmdxOUJTeWZ3SGtH?= =?utf-8?B?UEJPeHVtYmtKY3FhQ3lxNDFDTnBaVXpoV2xqMnJNbTZZeTYzU1NqUGVTTnhn?= =?utf-8?B?bm43UmtvdFJPeEFTcGVTRkF6WUxMLzFFU3grZHNya0s5eHpER1hWMTRlL1RO?= =?utf-8?B?V3ltY1JWODdGNTNOQ1ROem01OUYwZUl0R1BVbUFoRlVFRXNrblF5Y1d2STVJ?= =?utf-8?B?UnI0M1lMNWJCS21jOTFWVTg2aksySVFBQU1IaGZoMk9VMTZQMjFnRkZGQ01L?= =?utf-8?B?SVkzZG5oNmxIV2V5cUJINkcycW5PNEplU09zR0phL2RNMlNGOTBvdUZPMUFV?= =?utf-8?B?MGMzWGZoWVJVdkhXYnpRUHpOMzFSbGEvVmFqRjE4NHA0NjNjRmMyV0YrWldx?= =?utf-8?B?c2Rmd2oxK0JVR3ltTy9wbitjTGRhTWxkWmxBSVJwc1E2RGhCNWVGQkhRMFE2?= =?utf-8?B?SXhETGhraVlxaHNid3p2TXpMMERrRERxRS9ybnUzNktOL2svUEJKMmJKR2JJ?= =?utf-8?B?Z0tGSHJyN1RoS0Q3Uzd2Q1NBcVhYU2NuMlB3TWpIaUQyNUxiUm5ZVCtJM1hM?= =?utf-8?B?UVVwM21oNDJ1TllhK0gvVG9KeHZXcVhLejJiZFNlVXpTNDBXK01ESzRRdVJr?= =?utf-8?B?STF1Sk9wbUMzSWhYNXlacFdFTjl4UW9ETnN0TWxXT3g2WkZSNGlSNUF2VW9r?= =?utf-8?B?bnZ2MDgwTUlsc3pBRGI3SEwxNWdDL3ZhMVhnSFRVUHNVSnBzTFJTVFJiTFdG?= =?utf-8?B?VHhBY3Jud0pIOGkwZloxQm85UWtxdTRHMWFDdHdCUDJuT2htRFJyekNYaUVL?= =?utf-8?B?WXJRbXdFSFZXRm1ZaWpPenBjblIxOU1JVDF6cTVacHpWb3BaSTY0UEFFd1VU?= =?utf-8?B?KzJTVDBNajdKUHhUZzN3emNxeGNTQ3Jqd1NqSkVBTi8xS1hZQVZqNDlzMDc0?= =?utf-8?B?OXFNN1ZqM2Z6eEp2OWJENzJWdU5zRWR3Q0lLZzhMMjc5ZnVxeDlrS0w5NE10?= =?utf-8?B?d3hkWVRrNFBROENta3p0UzNoQzN3bzVsRS82cWg5ZnRQbWxmS3NMaCtOTllZ?= =?utf-8?B?VUhmT1RYTGFxUDBVTHJuNkFSWDVnOXJ6VGtZRXlMWnFybHZDNnR2czZHN3VZ?= =?utf-8?B?dTNFOWhWUzIrVURscXZyaHp3WEpINkxQakxBdXVHei9CR3J5TUtlRlRGVFIz?= =?utf-8?B?aitqd2hHcXlMdXl1dEhCaFJpVzlsT3R0dVpxaG9SaHB0WTRvTVpiUWNtQW9y?= =?utf-8?B?am5adG12YXUrS3ZDQmF2Z3Fncll2NzZnOGhUUVk4c2FxMEZnRmc0bG5nWEZi?= =?utf-8?B?aVRmc2hyVXJWeE5LblFuTnBKV0ptWlhPRlJMQ3pZMDY5bEZGK2s1cEFXNnZB?= =?utf-8?B?WU9taVJkZXVVbllFMjFlbEVmNDY0ZnBGQ3lEb0VGdGRtSkpNZDdkVW1MZmUy?= =?utf-8?B?MnRSS3p0em1XTXNBMHJ4MG5vQjBQRHprMmRuaU9zeXh4TUtNdmtySG9mb290?= =?utf-8?B?bWc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e480c73-0ec9-41a0-6056-08dab33a9d11 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 08:02:35.2389 (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: 1GgboBjtuBjZqLf5Soy3sT5GP4QSUzKBpft/QrDDd4Y9kozPvKD+loI485IJLGkRmwtJm3Izl0pM6JTw0sOChQyizsiknajKrizcFOGWuqc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4493 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..bab3833 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. + Added support for flow API. + * **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 e302165..ea5b359 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