From patchwork Mon Oct 10 06:08:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117766 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 A603EA0544; Mon, 10 Oct 2022 08:09:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3244242B6C; Mon, 10 Oct 2022 08:09:32 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2127.outbound.protection.outlook.com [40.107.100.127]) by mails.dpdk.org (Postfix) with ESMTP id BF73D427F6 for ; Mon, 10 Oct 2022 08:09:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SCaNXpmP3cI4S3eD5PYinnAHsBHVeQ+KSffoEzX5yQv7B52IjWIWR1uuZCjvsbhgv60uWvmAbH49y4vFrK1TcdsPna4CGA9s+5Vf6F+2XpFKAy/2t5TeCgdFk/pyWxqhWNwHkBWxpiP5BOO3OC0num0y847kiwmisywJ9FIz5PhuKwYnQZq1yOtVoMIkSNQS0lngme0elPGueOqLnUQTQNjqY8uIm+B5siNneFGckz/oN+dkkIXjg/SNXKsqTD0UOvkK9qzwjsjsbcnYJgSvCOYwnPwPORjdb9EZlC1E4aagNTwC08fRhNsnvFZUHt3zXBr5YPWi7zi3H0tH2feb/Q== 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=n/typgngfDiz+5Q5xdEyVbgZOwP5sbJT2BbpQnJU0dA=; b=flQuFUF23vms/j+OL4nD8MuzGSueymk8EJSH5bLOuIAZighyx9NB9NGud6i3lRBdFPoFcKjgN/W44IEDzupURg3LByymkXS7iDDJG11+akqMUcmGay0zc7xxng6OQNZ/bYNpvE1Ae6feEMC+3h6lJRXZTOIEYMWMX4z87lF55Y4/fR91V260rR2t+RMo8Fm3ljcT/GQrVWPbwnfct1SiZxrksUDW1+k/wdvaDCsQrpQXMxeBGhWQn5hrm0Wpx19UYEQv5mcpRVGCTOKRAUVLXaScA4WFcECgpvv0K8qptXdUWtIViWYLQyqE5DHQxlla98QDhbvF4DNtxGKHdASl+A== 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=n/typgngfDiz+5Q5xdEyVbgZOwP5sbJT2BbpQnJU0dA=; b=A4FHvd1Mfl29Ep7qsFtCBAntOIMBkMHKGwd7bb8DVzFTN4+wYOmh/6qx5lXsVnm8FqbzPTi2AXLIjkCAnFEqfdQSN2oQFJqskNLa6PARI1VH4P9zFrCwqviVBn4p+7UpujbXfBolSMmz3beUIZfh3IMvEQiMnTgDZkne916duR8= 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 SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct 2022 06:09:27 +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; Mon, 10 Oct 2022 06:09:27 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 04/24] net/nfp: add the offload support of basic items Date: Mon, 10 Oct 2022 14:08:42 +0800 Message-Id: <1665382142-21684-5-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> References: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> 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_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: a452ec35-e356-471c-1694-08daaa85fcba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KZlCdUXyVBjewlLugMT71Ai/VY+jXnvAFTipP3InSMx5bWrA131gnddqjVpIhc9WwGCn5nh/3XGc/pUzqYKnD1cRlagiPDXwueIDVlnVCtSflmPc0zDjsr0qF/HMuI/ibmAk2SzvO/qsOC7Lxc/oB0TfroZ50ydl3+mMgbwn4tR5X3b4+ot2ggeNAunz/4G16ZJqYQ8lJ/0E/Iy4MIKSUmdNAd4W8JdoKmYmUWrt91Efq035DZabDX0CkkxqYWktd3pl25Oel3XYb8cqiWJ2tVqu1qJNckvduVZ/XNU67YwozH3RrFSVdp4z0bti68A0iKGCAlkctIStJm1bNDXnxPvcnmnQJzdCbIWzKBR/ZWFlVTca29vJGjlakqTJkzUllGQih0EUtk9RrMuerXf82gO0bGvw2kJ9VbDVLeoGZetMb9lLjsjPmpe9XzNlXdW21/SmCXmGT2kh0KdMzC6yoEUSVVB4CdrxJOyaCx/5A8MEqrdqGWKbo+vKpjJ04+BM1M1Vn1DIvqKZtBNucJXgAE4FghQlOIgWt3Noq2JcRUaKB8cQzmFhdyK0peS1sqV54PkFcAmzCL29Yh7kmr3xiqXotSLKL1oN1Yut8JK7GT4L4A2rmjfamA324PYynlbk7Ho3lBXUwp3et8PpzdYgwKw3oy0TtwmyUPtD8nkzDc+1YqJTH8+9R3/C4qR3NXa4kFH/WPbH1gU7bEuCRZ5qkxD6CROqI84v6RfaT06WFM8LPUBZcTlYjILpqOcEjcCFx2JS2VtaoOegQ5iT4VdgSbTxxuvdnw6Gz3CRjjcrJbVk+WYXLfjOVTblKMpLgoyD 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)(366004)(396003)(346002)(376002)(136003)(39830400003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(30864003)(8936002)(8676002)(4326008)(5660300002)(66574015)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?90xf3qd6B2pMbn3nKj/La703sQ6B?= =?utf-8?q?D3kxBerRaLiOc3n1SZFC6SZNfzojNLv96k60UQkDJKdh1WclyIkftAT3eQtJF8wS6?= =?utf-8?q?+BkA3DJJpO4TgfZeMFyMWKRd4GUpM3NhJ1TdrNhQfHMK7yTuRwvof6GZoB/DErohE?= =?utf-8?q?QpJF9dWQHEHqNcg8yDdmVscetkcP9il6cCQik1OhSuKvzutrWFuycJ0LldIo/PgMx?= =?utf-8?q?2m9TUgUXX/zIGy2io0BiIdKkQ9D16TSXHtaQgg8UGllIeW8u5JbLIRO8ErZV+vwAk?= =?utf-8?q?M7Ci5H2zHLADxBFXkwwYiptcYkKVYTXvSf/XQMgf9oWgwR409KR43naFF+nLNBMwM?= =?utf-8?q?4l+MTY1b1GqyIVugyx75vnNeDsx7D7ibJ9JdUmMnrDpVTDzsVsU1rRm7CXxvRbjcD?= =?utf-8?q?ppua+SUhvmepGz0jBaiHLJUdIq5MMwvwnxyNCupOy+YfvZAbltQao1yeE0LEaMX3v?= =?utf-8?q?RziRQAtxUYGEYjNH4ZNvWfrhaAHW8Op/dggkEmHlK9ypojuL1/kps84wF0oG7Yd1c?= =?utf-8?q?OtcxP4n03ozE/hgnXs6EaT6KNHsN9GANfg7ir4BI98WnFfxxU5oDf54tWvCzjuLh2?= =?utf-8?q?m6QIWoOPiBH5me89sQAQxnNdKk8t4xaZ41ijagn39FwVSv3ekd6CgJsqJfHEqoUWb?= =?utf-8?q?uv3cZQXzNnZD2/f3qKiZ4p1HhlrYfVnpQT0Q+xZfa4WY9Sktb3pDBLsyukMJS2xx3?= =?utf-8?q?zCYE+/W8qs1Zq/QSSCXkIA2NWzdjzOs/3I9CwVoT4zQeUcTElS9KwZkbOIaraCkOb?= =?utf-8?q?D9de5FrxuMI7GiOVTv+P8sEBVA1oo7GS39QZ4/D8++FcikpVJ5xAaOy66LeZoYd/u?= =?utf-8?q?xWmTEe7QUPHZEawN8doD0uVapKiMmPI5Lfm6coPBOzYGKAVObFaclyAtB3cwh83bD?= =?utf-8?q?7rW3XNsiFOCL9pYcxbbKFx71D/XnqkWjFigrDrjLwOv1JzQtcpFs3vXQlNKOp2dLX?= =?utf-8?q?uFUcuRjqCyaEa/gOYEmjBU9Q19lN5G8x1lH20lIFnY7jkFsU92yvuOYShHC69eSPQ?= =?utf-8?q?vSU4bwoqMc68tp1+61zgsugvxmsJHCOskVMd6nvp2xaKhP2lNUSCjBnzyHTqpLwDE?= =?utf-8?q?pp27PUlczEd3oQrXrt0nWiQYP8bKa4/Eh5D8/4dddPTODj3IBt2FDHGB493Op0pp1?= =?utf-8?q?EEZo1iPVhZ/3J26kB/j30a01iKGjVuMdaYUpmtXdTZwwOoTt1x1s10drV1s8MrW4r?= =?utf-8?q?YUInITmdRQmFoI8cEsZ2IAO01GX0rQ4l4sVAb/XAE2rYEnhoqt5yXzmh1YY9Eu07S?= =?utf-8?q?imXMyLH/YONs+xs0qCDeVKmc3mVSH+KqxgMA/f3DRnDlBTVJ0fCkLsDWiVbaYcawN?= =?utf-8?q?x8X0l+1wkeEHBpOKHFuBCZNKpOhUEERN6LZCzgDDXF/s5ULWHSfMUT37npYiQDAoL?= =?utf-8?q?icgSWaA5KLLrejFSfOSXyTxOrKSHM1S+kDjNj0woIFcNIWyh6dvxdXTsZ+08VnelJ?= =?utf-8?q?zDA9XobMPCCSOibok4nu4kavHKf7ubLw8nH7GqXKuQOl+Qq3Epe0TyyyVnM/yFOgY?= =?utf-8?q?KBVFDhJetOEEeKoLhKIxA/FF+JR5h9bI6A=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a452ec35-e356-471c-1694-08daaa85fcba X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 06:09:27.5021 (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: 62wyA6A5Lx0/ySUK3pnQYnmJaWVpkZ3bKHlEMK+y8bjUQB7IbkcRHOWLsFY9dM4PmwqK35whRKTEZZaijDgO6ckF1rQURd7i2by+mhYE0Ow= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5296 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 fbb5752..cd22d95 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -151,6 +151,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 114686f..a077423 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;