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 103D4A0560; Tue, 18 Oct 2022 05:13:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 94D584281C; Tue, 18 Oct 2022 05:13:03 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2131.outbound.protection.outlook.com [40.107.101.131]) by mails.dpdk.org (Postfix) with ESMTP id A1F0B4114A for ; Tue, 18 Oct 2022 05:13:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CvqTLmiMSqt87fEIHniGnI31zBRQblT1BXWBMHlvkkcMiJWQF2738rpPGeQtOANOJ/XHPxp9Z1bsfvcqK3bVfxv8dxgJEAHJ69ycGcHKwsYWIbR7mS2xNxhUWzzreQKvJJXnvn1VaYhgwL1cP1urTLVlhqVo3MqAks0Dq7mYVPgFqWvEZ3SouHUsnVn9rQGg2GEHo79tuHrtFoXRHdeMvsC72mzKpKvzlKZF6xh/KaRn0Ruy/Gv5y86+qm/ZW49Z3kcd3b0P2biqazjQbIYWzyhwowkNvN0weQBhQkJGK9E6oJL+Zh6ytALvBcRXfiLszbNRUDLlpEvwBP68tpkwzw== 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=tl4k0HMFXLy5wb6TiAVn9jR/DCv+Zbttl0ZVTcLPxdI=; b=RRQUv2AO0UhAgpM9dKDC7UvHd9VMcZkdovlGIaxnftICX9SMHdC1cklKlCBraPGKEExvpCFpot9CeKx1oyqlMP0Z2x041d1uSg2NX4o8uZ1J/y/+rTIArv5JNy4oM/5Z6HTZ9NPZdk8Z/41h9dNSA3Nn9MHm8dngloL71P292GM6OWogZuWYPNeK2yyvFTddEn6GVVh3XhrDuCsOJx8B5ITWK/JwtjHgAGHrg0yJwxocTY36VFVoFC9ECgahnQk1bv5ZpqH1cZ3B/EatXgjxz+OOxo9f+ZtgR2ZSBHlQWjxaJmE9TVKgB0cFP91TNpa3bIdEA3mQeTFDfMbHkzQhMQ== 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=tl4k0HMFXLy5wb6TiAVn9jR/DCv+Zbttl0ZVTcLPxdI=; b=MqQntql2AqsrWoUMxOWMnQj5LH1Nq3HnwfFe6oZ98b8dmy0EDiwSjlByKObStkFjrapwdg7y5DcVrZWWmPkVaJl8msZZTc8aalL0zb+gwDuaNPuI3QZUK2mKirC+Dgjjxxow1ZgFDZoEbfG+fQuFS/mmEhH1XberOvblEtNB978= 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:12:59 +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:12:59 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 05/25] net/nfp: add the offload support of basic items Date: Tue, 18 Oct 2022 11:12:12 +0800 Message-Id: <1666062752-33689-6-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: 20283c6b-2bfd-47cc-0d58-08dab0b6a8d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: heCpMrBd9htNOz9WvonoS5GfNlBbzdv7tZZQGIST5FBBsfpq/f2MIc/iFEY9wgVLigl01NF60binIfkpxV6M3/70e/2ZcMHFlPtz+d8gbjPT8zQfH930ry6JEnjPL7YhUM3xmUO70OeqmHSkFwsKXCrJOoxiVyPD4N6jiUoLMiFVHQJKxooxaS4x++byf8kUS1mqN1Zf9FuH7yHIbN/K8PVWr1RZ0gFHEf86y9XStVeYG6ZSMy5uVSJvP7DvfJXkNOFQgg2A9m68lmFlp5h7xgKyLojnyaK2VZjz7iIEcaVnZSNJZ168D6l9+v6m8O4+gtFC8MWxT4jMp++WIq8W0FrfZSubImfFYTpjlLB3RxFucsS0XPTOPNJ6+psFl6tt/jMtW1bFTB9m/4pdifR9h8TLuUzEAe4yKj0skwvh+OHIG9ooAZvMcwe39/HP4p/LPWjjA1Bhd23/Svu0Il4A0GMU1RIrjWGLCF2ZH/D94X/+FIjGXRFAtvmRrn7pgNOFE2zbeX/9h1JtiPBSUALnfLo3h9jxBtQWXO8+QmgAkeMeu8Eb2HhvdXxOLJyZERSmEC4qk2qPvTCRv8uxIFWsCJCKHkczFvGpHM1mvz3vMaQis/X6ORNNc9OPxOOZtCrWMfeM5d1dLsmwDIuaFQhU9eH0gG/XKkKuT9iRXWJlBVmBIwIxgN77Wtmeoav3lxcYBSxIfXaJJ+6zVt95I7uBLdoGpC1fiG4z34tIVCtUJYfAeKqM8TpRBxp1JplN6JOyUACYDuxeyNEaztxOsUsslg== 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)(30864003)(83380400001)(66574015)(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?MGRYNm5xMHFLQUpNT0hyTUxaZFhrd3BJMjhEWExzV2FmR0t4aW1naXZnanVX?= =?utf-8?B?Wk5jNUF6T0JvS2piR1J2QXFZZ01jUjVuUkpldDZzZDFvS1ZVRlVqZjdPNmJ5?= =?utf-8?B?ZG5qV0E3SmdxaDVmaXBsUVpaMU1wTnRyZjAwb0hMVmROR0FxRkdWMXRQeEZO?= =?utf-8?B?ckZ0ZS9DY0dBakVEd2R1K2NwUXM0L2JWcFFnQVlncDBNRnJMMjNyN0dKOG83?= =?utf-8?B?NjVuK015Z3d4ZmZQSitlbHFkTEtMeUlzYkNrWmNEQ1dNNk5Tb0dtazZhc1BX?= =?utf-8?B?L3RzdjFyNkwzOFBsVHpSYkgwNC9JT2tXZGkvdkd0Mk92ejJobWNWZW94dGda?= =?utf-8?B?STEvYnJKZUZlMUtZTC9KME9oWVdFZ1Q1VWw2Mi80a0RpS3RqTW4vUUlta0Nh?= =?utf-8?B?bXdnVmZtbGxiWlJVSVdBK2xGV0pxOVlyRlVGeXh1Y0NqYlljalhlcXl2MGR2?= =?utf-8?B?ZEp4WmQ4bytrVjE4MkJoQUpnWXBNeklZd3BBRUZJS1M5RTB4KzI0Z1B5VS8z?= =?utf-8?B?NmJjWU1CbDE2S0xGN3FveG00MHZtRlhneFh5a1huTHhHVDZ6QzFtc0tKZlUr?= =?utf-8?B?Qk14ek10TytqU3hjQ0p2M0RGMVQvYmMvbHlBN0wwdE1oa1ZJSWpQcDB4V2Zh?= =?utf-8?B?R1pDOFIrQmlvK3IwTmN5NGFybW5jdEcwdnl4ZndxNms4bmpweVlGQ3ZkVTl5?= =?utf-8?B?QUNvK0I4RmR6TktzY2J4cnh4M0MxZU1ENXdvaXVpRGF5Ymg2M2hWMHQ2Ym9J?= =?utf-8?B?WWp6c1FucTYwQVFsY1FoQzgzUFdTZXlmZ1k4R2FBWkRGenhNNFlxM1g3OXNY?= =?utf-8?B?YUZGL2lkdjdRSU5kV3Y5bjJDMGpBT09nQk1wMEVzaDhJOTVsUnlIMGdXOUph?= =?utf-8?B?aG9xSkhzVVNpS0M2dlZNcHMxMm00MXN3eXMwOVhRSGx2VG9OeG5aaktqa0VZ?= =?utf-8?B?NVpiSzFnMGNmbXJ4RjYrNUN6dFFwY0FsM21oZFpZQk1iRGh0VTBxcTMydGlC?= =?utf-8?B?NGdpVGxHRWJoWFB2dFpORS9Zc0JHdmJXNU1SblZwVzhDazZGZ0FacFB6ZXEz?= =?utf-8?B?NW1HRTRpeHg3bSsyM2Y1UlZzWlBSUlluVTltQ2NDK3ZNMUR2ZElQMjJXalJT?= =?utf-8?B?REw4RUMzMEd2Skk2L3IvSVF5Yk9WeEV3TzgwdXpUbHJlMmI3cGpzeGRXcWl1?= =?utf-8?B?d0s2cDVON0t4UkhpMzkxMWxKM0Z3UHEyd1BZV2dJMWdQLzVhQzg2QWZnM2ZS?= =?utf-8?B?bXVYNnA1Z0RUV0JzMW5jZ3FQL1JHVklLVm9uSklWNFFEc1hNeE5BanU1VHFY?= =?utf-8?B?Y2F3TEpSemdJRnlRWmduN1ljTG9rQ3RCc1BGYUNXK1V4N3E4UVhYSGFPSU8z?= =?utf-8?B?b3YrMC9RbXVlcEc4QnJ1ODFKOVVtcjlBSk5DL2hleURjV3FTVWZacGcwN2ky?= =?utf-8?B?UlArUVBOYU9KNU05ODBLSytwdE9kWFN2ZXVOSVVmM2NDR3pQSDJwd1FsekRQ?= =?utf-8?B?ZkJ1TWtuckRpd1lJRDlORE5QRTZHekllQjdIbDEyc0p3dWdQSXNFQ2tkVFdn?= =?utf-8?B?eGlUV3FFVmxGZFcwYU1NL0FCTVNMM1YvZjlHZ01ST0xCL3BrYnRQZjFQNTky?= =?utf-8?B?VmdHemd2ZXZyRVBFVFY2R252eXJEeE5lakFaRno1cVVBa2RBay9zRkJxbzhT?= =?utf-8?B?YnlFYVJkQTYrbFJvbTVCVEtGTklVN3J4MGIrTUxtemtYNjN6V3hHV2tncEc5?= =?utf-8?B?amUxM1JuLzhPRUw3QWFveVNpNk5LVXZuTTB1L0FJRDY0UTFocTMrOG1kUUlD?= =?utf-8?B?MWZxQy9ZUzJCeFcwZExWNUxZUWJKRWlxSnBveC9sdFBuTW5CZjFETXFvcnQv?= =?utf-8?B?U1VmVGtFKyswWEg5aWdSSlVsdHhxY0VMZzc2enc2bVlSMHg0UDBjajdrQ0NX?= =?utf-8?B?dWhwTVFpU2x4YnVsbG1pTGpYWFVPUmZEcFAxMEJibEo1Z1NjQnFOQlN0NWoz?= =?utf-8?B?c0dVQnBGek5NZ1ZCbHJwRVI0czg3VXpvcEkzWExUQm5JYjFCMnFHcXArODYy?= =?utf-8?B?UnhjREdzeGVBU2tPem9ZdlB1WW1lTWQ3OFJRRjIvL25GK3lxMjdLOC9ZSzRU?= =?utf-8?B?NlJQT2dBRjNRakkybzVNSHVnb0V1SWw1WjBQSStKa3YvNDBzaDFoZkZ1alRH?= =?utf-8?B?WXc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20283c6b-2bfd-47cc-0d58-08dab0b6a8d0 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:12:59.0652 (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: 8AYc6nr8hAgIqeewBG8EqYygDFSV4b5HiDABGBDbxm2Low1va0ItP3yN3fLWO48Qn717GjY1c3tG4wkLf3WrDBUCljfn4mZfhA7Fqm6iLmc= 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 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 | 4 + drivers/net/nfp/flower/nfp_flower_cmsg.h | 20 +++ drivers/net/nfp/nfp_flow.c | 252 ++++++++++++++++++++++++++++++- 4 files changed, 279 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..c5cd763 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -163,6 +163,10 @@ 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 as follow: + + * Ethernet + * **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 adf2fcc..adebf38 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; @@ -476,12 +500,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; @@ -541,6 +589,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[], @@ -583,6 +827,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