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 8BC17A0093; Fri, 7 Oct 2022 04:19:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 402E442B72; Fri, 7 Oct 2022 04:19:20 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2124.outbound.protection.outlook.com [40.107.220.124]) by mails.dpdk.org (Postfix) with ESMTP id 8A8A44280B for ; Fri, 7 Oct 2022 04:19:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gmio5WoCikUlJ8hhQoay+YFCT0TEK1ltGWA1h7MI3QsxPARelikYCfYaeL+GZIw70WyrrjBwhzRxmYca7fvnJ8WnPTP9BRfIiEHoAeA4MbKxF4IW+06hWKJ5ljzBZsVKN3Tp9+MQhUkBbbdsDdB6RM2lRw5PvtmLCsSafGQdNvCvwl34TRIt4p349MFf7LGwOVrxPMGA5joayW+8WrRKikZHNnLPavXS8wZsF0Jt0Zczphi9WBMJDyB0gQB7HkFy5Xb5IGE3iOuwZgV9xVOucIogHYy23BPJBfF2AHDWk4yeAsoOYe+DcuTuoz+4nyIwqyNbyDWZPWDrteWExNiNpA== 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=soRSspkOxg1Agie1+bFSXWIfUoPVn9JGJ+VAdLrp370=; b=WGTOLMfom/oxCMDJ44IuznQAjpCO0ZUo80ZBQ/yVGrexe+42rOtGjXil2irnQiJkjc4b30xNhttpc7tsupsl45/EkZ+gFZB5D+YuAZtFDDFDSaMNGDQcekfZEmpr2Q0w5ni2Bt7ubujkQQDviPmghotLdzkROCycWMclS5NeaLMk/NfcHyxfXIiu7yNmEGTIyBtpA5ACDgN3amIw3sRqiBndPhF/fynFDoCp4grQ5GzgFckV3tVOQV+ls7pNloEs2HG3JdXc6ys9T9Ea7/5+bsiVDGeGHFBgpiRxLPtwte0WM9OUqujE1mPm33HKFq4dFRURWfWChUBgzKGNtqS78Q== 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=soRSspkOxg1Agie1+bFSXWIfUoPVn9JGJ+VAdLrp370=; b=Lh3DQibidh908lD2nJ2KQX3cSuhV78zSTqj/a317tPdjV5fH3S1nTvX3QIALZMKVcmjKLJi/Vf21ZZ4JPALPfGbpedmcVVHWyo5XASf2u2kiPEvjjsObBqnWjNhtq4ZmVBcmGHSsV16lDCevxkmc4c4nBpi4BxTA4bFVSSO+9NY= 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 SA1PR13MB5465.namprd13.prod.outlook.com (2603:10b6:806:230::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10; Fri, 7 Oct 2022 02:19:16 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773%4]) with mapi id 15.20.5723.010; Fri, 7 Oct 2022 02:19:16 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 04/24] net/nfp: add the offload support of basic items Date: Fri, 7 Oct 2022 10:18:26 +0800 Message-Id: <1665109126-16201-5-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> References: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5465:EE_ X-MS-Office365-Filtering-Correlation-Id: fb162d50-7b53-4405-8b83-08daa80a559c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RGFSLwu5DgQFwAZgUggbzX+Jg3r0uZA+RXZ2SvaJDgUkKUMFCm+UA0V/7xytsA44DpD8+eIR3DNtY7k2UkX6vRIGgAlppo4gqckMTLIJOraeXwSsGf2ez2keUDuLcdT+W/+DlY953S/P/hONT+FgevKYLPQBDwhsof7d0bqFe80oHjrt1Z+0BWrU4DZd++NcWJ7e74hjYuEBxIzSgectlwBwP/r+UzMBu2JJe3B3NdDlDMQW9neZqKcLmZy0JCjxu7fyDdgDeX4lLmfciqw/BUeOZ2e9uHgG7/XlY+Clg2oOEdhg3PkSnYqRSIs1tWznlIlfHHnjpW5bqXYeKnjx+Kx/WLexiId/u460WnwmoV79tVU1Cc9AnUc9I0eaG8++ztdkNxP2g5UXjd7P18Sr0Nf1+qEOBsDCSUdEmReXzVWx5glJ9HsZDTEPBGsERbIhE7vz9Jwip9TAXwQeURQCTI1CYPH3kkLWOOo0Kj0z4m6Vq9sHypQMqdFfSbTE6eQT4dOW8+EFSg+QW3TEzdkHphpgRt8in4+hIwBLQ1tyUaShSuVPzaV66cFB3tbbTaXi+GVynInOY7A3buXn2EzlSJUFn0gJmoFhekjXH/2g6gt7gncmtORr4LAbJdEhT5rSUspuNxmk7diHKH7QqBQI/1ex+jEWTztXtesdDo4W6jKiKsgd/xQveUTTxiHa1d6r/6hG7vdQ51u5LISFJgogMOJBg9krdUnfWDC+J6PJEfYV8OJ+tTbj5d5AXIW4reL2j0xKc0lhB6y0qOy627mUcg== 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)(39830400003)(366004)(136003)(346002)(376002)(396003)(451199015)(36756003)(86362001)(66946007)(30864003)(44832011)(38350700002)(38100700002)(8936002)(6486002)(6916009)(66574015)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(6666004)(5660300002)(66476007)(66556008)(2906002)(186003)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Snc5ZmZ0ekp3MXFGUysrWG50aEJjVFB0Unl0UXlFak1waER0dm8wTnUvKzhS?= =?utf-8?B?SzVPWWFBMVJ3QzMvdEVXZkdHemJ1TmpQWHNHcjFWaHRpbU9hZVZ3R1pTbnZE?= =?utf-8?B?UmY1REppRFE2QzMvQVdoZldPTkdaSFZkdzRiOUxyYmVGOFZqVXZ6aUdvNjgw?= =?utf-8?B?QWVURWJIYWE5QU01MUxubjhMd3hjRU0yNjF6aTZZU3JtSnY2NXFjSzhnTnph?= =?utf-8?B?NDRKOGhpZnM3WjRxUmtrNjJaU2RobTVEY1VHMC9Zdk5VU2hHWlNMMVJtRHox?= =?utf-8?B?ajhWZ2NoTUsvQzcrRVA3ZEwrLzlmSHVkV05HSTdaWU16cVlhRnQ0R3I0Y2lE?= =?utf-8?B?VWxHbUhLb0k4NmNuSE5MSm1pN3ZWSjd3RTNBVlBDU3ZMSUNiNlRmK28xNDV5?= =?utf-8?B?MC9ycWJ0alV2clZiZmJWcFNqVGptcFhDQU1OYjdwQnhOZnZFWDJ6REJtM1F2?= =?utf-8?B?ay9TYWlTQ3Y5aEZzd2s5RlNObW5KRFljd0FXRVJRSnEzUnM4ZUVhZ2pVRkZ6?= =?utf-8?B?K2Y3amcvTFZ6UDIrUGEySGNRWUtPMXFuMGtaMFZ3c2dybkdSMG5HMDZ5bmdv?= =?utf-8?B?OFBnYTk2YkRzU1R2Tmk0N2l5aG9rNVdjdXBxWHNPeTU1K2F4a0dteVlJMGFn?= =?utf-8?B?Q3N4ZnppRllaRmFKb2ZyUjhHR1ZzNHRBakRHWkYzZTlVWk9WKzgyd0dDN2RV?= =?utf-8?B?cG56WCtPbEVCYzVYOTZaMCs3ank0K1Y0WXpnU1ZzMHl6bXB6NGM5OUt0bmQr?= =?utf-8?B?ZFRlUW9KSmZzS3EwQkxmQmVBTmgrQkdOTjViOGFCQmVVQjM0UlMvWlBXbHNM?= =?utf-8?B?amJIV0JzaWlPRit3TjlCYk9CckpvM2xRc0FEK1g4STc0eHBEYlZPOVlrUjJt?= =?utf-8?B?MHpPNXhsSVpWWjNZeU8zcGRmOHdQNGsyRHBVNEZUTVA3ell0WVY4dU1DUCtQ?= =?utf-8?B?N2lKbHpIOERoeStNSVI2K3BqOVE2Vi83dWhlaS91dzhydGxZMmI5RmUrbUJh?= =?utf-8?B?QUFBRGE2Mk0zaXgwMjYrUnIzNjd6bEJiNW9uTTJNTDZoMmZsQ2NBa3E0aXNG?= =?utf-8?B?aXVwblZpMk5LRlRPbDBrYTJ2ZStaaFR2SnJWaktjYUhLdHVwZ2NRK1lCVTgz?= =?utf-8?B?ZWFJNUFSWmJZckd2WURwaStUZEpGRkJCUWdrZkY0YUlCTXZPVXBxd3VndUNr?= =?utf-8?B?SWtpUXcwMm53N2NaRm5xZ2s1NVBKSFVWaldJYjR4UUVBeVlGY1VUTnFRU3Nm?= =?utf-8?B?YXJIbjVHWDdXYXdCQVduUVBqNHBCaTgwYSt6cVNFRS8ycXlONGs0QnhXRVQ0?= =?utf-8?B?bE55dThONFhhbnZxeFBpMFp2MGt6RFd2QUl1NnVjQ1MzRFp0YmtHakgzbTA4?= =?utf-8?B?QUdINHcwUE1MUXVCTmFKVWVjSUVwMjRIaFk5QkxZSmRmUWNxeHFDTXVhUFZX?= =?utf-8?B?Z083M051a2tnRFdQUG0wb2xxZDArTU9xczdadW1FYkMzbzFzTVZHbEZXTnJW?= =?utf-8?B?ZkdMUUd3L3FhcHQraUwycHFtNFBxYzNNZkdONnpvUjhOZTdBZTE0UkJmL3hJ?= =?utf-8?B?MjVlZHJuUjAvbHg5SVN2NWhXNnpsVUo1Zk1VaERRVVEzSGN1U3BQamxWYTBj?= =?utf-8?B?cStGWkdXd0FMTlF3ejJicjlmaXowY1hvWGZkTjkzZ1Y3eHlDZVNsaDFQNWI4?= =?utf-8?B?RnJXVXVWUWcrcTR4SEN0QmhZSkpDbEpBRGtOc2Y2NVdzYkJYYlZocElGcERq?= =?utf-8?B?RDZjQ0tlU0xRMWxaejB5RG5rOUtOSk9vV28rdWtmVFZVWmh2eWlrS1k2ditq?= =?utf-8?B?MnhKenE5NkxuYXZMRGRNSVAwazd5aWhGYUlyUmxjWXhSRnRuSEFsZWtHbUJS?= =?utf-8?B?L3FFQzNRR0c5S0ZDb3lLdTlrT01LeE5vV0c5bEJxdXE2bWI5cEk3UEZoU3VX?= =?utf-8?B?ZmN4U1ZwOTVlaGFXcjZVQnZBUHdoNnNZT0lydWVGNm1DNlBsa3Y1WEtUMUlY?= =?utf-8?B?L3ZvRzh5dVEyOG1aU2lJYnlrU3k3Q0N4Yk1RRHhYczVka3F6cVZsaVBRaGVK?= =?utf-8?B?c3hwemtlTUF3bTQ2ZzBvZHc5MXFVTnFWZm16bS9KNEYreWEvenA4dzRkZ3Bn?= =?utf-8?B?U2dhbGloaS8yZTl3YzY2NzhkcUIrSS9Tdm1FZHViVFM1Y2xrdENsYXdQVGxI?= =?utf-8?B?aHc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb162d50-7b53-4405-8b83-08daa80a559c X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 02:19:16.8151 (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: 8/G/7NJwqwNfEwuRRVAwmKlilHVDdC9BryEBzVnTwejWFvDujCNKTZjRmuvuU9ayBXrlwP1NsPkuhPVzgQp9Z6iqsm9JaKVgHeoTdXfYec4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5465 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 6794a9c..17ac784 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -105,6 +105,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; -- 1.8.3.1