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 BC0F6A0544; Mon, 10 Oct 2022 08:09:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6260F40E50; Mon, 10 Oct 2022 08:09:27 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2101.outbound.protection.outlook.com [40.107.96.101]) by mails.dpdk.org (Postfix) with ESMTP id 277D2427EB for ; Mon, 10 Oct 2022 08:09:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U2QDc6Ca67UQMN1BD2Rpc0jF/NK2gtUwCdHG+Ymqt8bUVt5k580pLdFJzQeOGf8KEO/rCKgFzJ/D11niaOfJ4FX3RccSYmscPj7GveOE2NsjxC5QBwa93i/N3uZHRPrNUi4YprGMQBw7T04lETZXgMmsZAcrHrAVMmgkqb+4JH1AE+SVIpeNvWeIIWjzsEYyUrkbx23gvYUtoHmVQliBXgeJOlQwiBOQLH2xdPULNNChZatERR5oDV0aSW5gIiAhPrHKiFWVhsYfpRRxE233N1/R4vY3TSCmH6182h8v1R+9XciYtMkHFWSmTZVfn7tRaFI5wk+O58eG6UIztSrJfQ== 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=YD8Nh+zySV1HqdJHBwUxHWU5xkvBmSX8p0eo2OHVhog=; b=RUkDDtjN0aUG1SULxrfb2RhA38GMGZfhEMmE4o5FUEfnniXRmOWtvlSaX8zg9d57+ikH0AbTVKR1YokcZBQU8rmpB1BiUNN4eozPo5roRxk0Dmy5J5rCITDzc81b21Y2dr0m1gsEbU3Um3ctEIRcJwrWOnAld9pWQOsKoeobJOwHRNhPy45/7Vswntr3F1IVsH9H92O0EADceNwQXaWdO0C/qHPO8ZL8jDzqBlTUwFt8tE71r0H6ZBtX7rTtuUvw32Xai6wXswceHAvR+w/nTwrxiCTZTgtW+TnWX1IzPKqNMyAmLw6FWu1yOfQDObGoj/tn0U5p+8BsZfOoj10cTQ== 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=YD8Nh+zySV1HqdJHBwUxHWU5xkvBmSX8p0eo2OHVhog=; b=l1oXw/BscE4ZYMjT8oku0oxYWapAx6YCr7dPg3KGGWMb1cY3M6Boc9NamVP/gcvUEb3lILlQIXa22n7DoIDRo0gKdt53RAcfN3gpqUa8SbwZ8SpEQ7sQ2ZroHE4O/C3SzzXVDGDHji7/11m56mhlchFilhINu3TkeLsHwViLBmU= 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:23 +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:23 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 02/24] net/nfp: add the structures and functions for flow offload Date: Mon, 10 Oct 2022 14:08:40 +0800 Message-Id: <1665382142-21684-3-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> 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_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: dd13800e-bd48-46ae-13ea-08daaa85fa6d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WLwDhlznoVDwWlKcnEcHcBWeybqw+QXV+GXGHGgqstBxVlrEZGgYWoitnoPUNmVfvc/NgCLossuNMrJSqt0rCbkXHmZuivPG3vHteUxjkJ23on681d/OX4pESLIeNM54BT08JWihAoOp2HI+s8bl2AWpJ8aBi8Tkzx6C1YZbmxK4TqvMlA24NQApSLGflGpfQRk0y63VicnNHvqO1NUnVyp2jG+EyWf+UfQMs/pZmUpvOyDBT3oYgoFq0qhPhDjsyfRbs8oE5Nh+voB0yu+vCECNrVO0xS/6c9hqOCsO6vIFkP8VjzVVY5c+/WVcrnrTywUuqjsjH0xsqU7J9nKsHwAWkJF2eoEh7wxgsu4mPKEkzRXAd4Gcn3WWRa6KaamIe4Hs4CDV3wUEfA15eTf9x2rkAdlKTx85j6VK4iszLzH/Dh8xkw7EInTdKcpx7xOTnn9oKHKovESMT8D9XcZ6fDdObGlqx0g76D988o3SM+f369j5ZOtB2JA+T3AuO0EunmUrsWr7c8aSWcr2/sQPga/2XTCSYSWDNUEozgs7ZbWR7eRZwAOZE/QG3yM+NG257fj/2BxbLpZschfOPZEbOj/yCJVAa93OaL7/JRGz0ztvGdI0g+3DfclnME3H+PCoNq1Ge0w9vjkLXtq6BICuZLxAK1PiLSj/YUtuCHhSwk9zxyJvKaumonM/A95dpqTA8mSY7tfaJByZ/+FMDIz5U5d3Zad0vH00hC18BuTI0/DYHDXSH3kcSdq9SFl1QwgL8QVK3iMTC3ztbgV77EglC8Ze6SBrxG7gmLCmsmW7KsTLJJ0lGohZCzrA0MoKdw08 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?B?bEh6TmJ1V3RhcHZUZjVRdW9QQkdtZFRCdHlIUHVuTDQveGJyN3BWM1VWemVh?= =?utf-8?B?Z0tVTTd2N25FQVp2NUpjb0cwcU9pSUs5N2VVYWpZY2UwYlFzejZ4QXZhUmpW?= =?utf-8?B?OGdqNEJ6M3MzZlhLdVhkQlFITGdmd0xIQzRHUFc0TE42TW5xakhRR2FqMmFk?= =?utf-8?B?RTNnR05SVk9tcXdlL3d3dVJ1V0Q5alJtNGE2bU1jQWpjbDU4VXNvYldsd0sv?= =?utf-8?B?NHhoQ3dMSG5sMnlZVHVQMHAwVHMyQzFiaEd3aG5HaVo2ek9VbjhzaVpTM3Js?= =?utf-8?B?dlV4TnUyckEzUzhYQTYycjA2eE5udlVvOXl6NzFVL081Zm0yNG9xWHBDS0lx?= =?utf-8?B?c0lpZGFXQ2VTd2VsNGh2WEJJTkpqeGlpNG5wUTRwbGxRSW1EQXZqMHRlVnJB?= =?utf-8?B?YXJIUkx6YUxEaWtHZEw4SkxxTklKVDF6TWhEU1JjZHVqbGxQd2ZLM0Z6TjRn?= =?utf-8?B?V0JOd0tYU0tzb3BBRFNOYTJFdmtFdWRNM0pBclM3ZFh5Q3NoL3IvMlhGa1FY?= =?utf-8?B?TS9KVFlVeFgzcHlRbndrY1FjdGM0Nlg2M21RSVpPZDUrd2ZDRlJaVE9DR0xs?= =?utf-8?B?S3IzUmxOMUhuNW00OHFHY0dEMnpUa1NmWnB5dTVlbGtBblg2VXRYemdCUkph?= =?utf-8?B?a3I0MW9IcHpqcTQwckRBTjlLZmRZcC9BNm1oRlBRb1hZQklQS2w4ZU9hNnpZ?= =?utf-8?B?N1FLcG9XMlFLN3Rwb001akxsWFUvbTgrVXlWK2JUYTdId1B4WDJkcEdVTUFU?= =?utf-8?B?ckNxdTU0c2J2TmNlZW90S3lPQnRkenpKd1kxQ1hoVVhNVjdTdThGSENUcXhF?= =?utf-8?B?Z3M5UHJxMXh1SVhBMTIzN1VqcmVFcm9oK1JDR3Joanp5ZVdqNGMzMFlWUWJS?= =?utf-8?B?NVdxNzdKclZzaTZzZDBZZFJOeU0vOXowU0I3WjNDSWJuVG43RnVLamJkaHc0?= =?utf-8?B?cHdCQ1E1ZlBCU29VVDVLRjhVeWpIVnNCSUJBdWtFdnUyYWQ5NDJhQjQycnZn?= =?utf-8?B?L091NnV4V3ZrWVlmbVZwNFBZaEFNakNMdkIrZnI0blUrc1ppNFFpS2NBM2dF?= =?utf-8?B?R1BFVEQ3eTM1OTNieHY5UGdkT21seTFwOEJuZVZUVFBXakhKbCtWZkdGUWZo?= =?utf-8?B?bEZGZW1TUzR1NmNpMGVvOHYvdDVnTnJlZE8xYjM5Z0UxRmZ4STlDQVNUZGxh?= =?utf-8?B?MUVKeURENGtSZXFsbk5UV0xQS1ZQWWU0THlKM1FickNoZ1J2b3duZHpBcTZw?= =?utf-8?B?ZmppTndWNjIzVlZML3N0QWxkQXRCd0pzek5FVUFmdFVZK2FhWnpWMllhOGtY?= =?utf-8?B?eEl1SzU5YVQvb1lFb2dXaDdtdlhKL2RkSGViUEtEOHZKcWNEazFIbXpjQWxm?= =?utf-8?B?Um9LbHhNeU9rUVVUQ1VGVTJSakM2R1hkVlcvWGVKT3VZMExnWGFadTRLbHNk?= =?utf-8?B?UUlRc3Qwemx5UGQxZHovVlhaOTRsZ1M5NDJZTmIrendTSGpFT21jL3BDSzYx?= =?utf-8?B?YjJ3NGJ6OHBLYmJLdnN3Zmo5M3IxaURGZldCV0hYdW51MjRHbURpMjJGWm1T?= =?utf-8?B?MUFiK05kM25jOHBqaXVob00xREFIaklIRGZxaHdZVzkyNjZacmhsK2FVMkph?= =?utf-8?B?N3dJTWp5MUtoVkdOMVE3RzN2YmI3NTVVL3dzdytFMnAxeWM2TFZIbFpQbjVG?= =?utf-8?B?TVFvT0ZVYkd4ekpMbDFtL2orVWF1TjhVZXY2YWkwQUhMSUxOZjg1d3RIS05j?= =?utf-8?B?bVJMOSs5M0o2MjFSSW9HZjFlcFp5c2NOWHpSbUIzV1BoOGtRc21CK2Ntby9y?= =?utf-8?B?WXJsL1lJL0VQN2c2aHFNV0RQZGtNOFdESGFzRFBOcGlUL3h5L0xiWlpaSVIy?= =?utf-8?B?STNRczFwbTBsQ1VjRjBRVndiMGpkcC9hQlV4Q3dOYmR3QU82Slg2YjNMeDhF?= =?utf-8?B?Zmg0Sys3MlNLTGtFakROdDBqaG9kUzloQVlrY1pwMkg2TWhrbERFSHY3R1VR?= =?utf-8?B?TXh4bjVuV08wdzNzanZsOWlEbC9MVy83aDIzRE9reGRtRVIzM3IvVTFQRk9n?= =?utf-8?B?UGtPVmIvUjdZaHhrZGcxTVRwSGVtRjg4cmExUTRuVXp5S0twU2NwKzJXSUhu?= =?utf-8?B?TmJORWxkU2J1TENzZ0Z0bVlCMzUxRlVNZkN2bXZLTmV4QmdGUVdDS0F0YlRS?= =?utf-8?B?U1E9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd13800e-bd48-46ae-13ea-08daaa85fa6d 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:23.6577 (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: 5pZdMAeZzs/bEyrJ6oBmHMiCh9uTzuR3oAF9Vo23/BJN4b2xk1sMJz87SlNmWJw5cdn7m4akSRVuI/FaAeZTyQ/QWDNVR1xfnXBj0pxv3dc= 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 structures and functions to process mask table, flow table, and flow stats id, which are used in the rte_flow offload logics. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 11 +- drivers/net/nfp/meson.build | 3 + drivers/net/nfp/nfp_flow.c | 507 ++++++++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_flow.h | 81 ++++++ 4 files changed, 601 insertions(+), 1 deletion(-) create mode 100644 drivers/net/nfp/nfp_flow.c diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 3e97f5c..3b16c12 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -15,6 +15,7 @@ #include "../nfp_ctrl.h" #include "../nfp_cpp_bridge.h" #include "../nfp_rxtx.h" +#include "../nfp_flow.h" #include "../nfpcore/nfp_mip.h" #include "../nfpcore/nfp_rtsym.h" #include "../nfpcore/nfp_nsp.h" @@ -1089,13 +1090,19 @@ pf_dev->app_fw_priv = app_fw_flower; + ret = nfp_flow_priv_init(pf_dev); + if (ret) { + PMD_INIT_LOG(ERR, "init flow priv failed"); + goto app_cleanup; + } + /* Allocate memory for the PF AND ctrl vNIC here (hence the * 2) */ pf_hw = rte_zmalloc_socket("nfp_pf_vnic", 2 * sizeof(struct nfp_net_adapter), RTE_CACHE_LINE_SIZE, numa_node); if (pf_hw == NULL) { PMD_INIT_LOG(ERR, "Could not malloc nfp pf vnic"); ret = -ENOMEM; - goto app_cleanup; + goto flow_priv_cleanup; } /* Map the PF ctrl bar */ @@ -1173,6 +1180,8 @@ nfp_cpp_area_free(pf_dev->ctrl_area); vnic_cleanup: rte_free(pf_hw); +flow_priv_cleanup: + nfp_flow_priv_uninit(pf_dev); app_cleanup: rte_free(app_fw_flower); diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build index 8a63979..7416fd3 100644 --- a/drivers/net/nfp/meson.build +++ b/drivers/net/nfp/meson.build @@ -27,4 +27,7 @@ sources = files( 'nfp_cpp_bridge.c', 'nfp_ethdev_vf.c', 'nfp_ethdev.c', + 'nfp_flow.c', ) + +deps += ['hash'] diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c new file mode 100644 index 0000000..97f5d1b --- /dev/null +++ b/drivers/net/nfp/nfp_flow.c @@ -0,0 +1,507 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022 Corigine, Inc. + * All rights reserved. + */ + +#include +#include +#include +#include + +#include "nfp_common.h" +#include "nfp_flow.h" +#include "nfp_logs.h" +#include "flower/nfp_flower.h" +#include "nfpcore/nfp_mip.h" +#include "nfpcore/nfp_rtsym.h" + +struct nfp_mask_id_entry { + uint32_t hash_key; + uint32_t ref_cnt; + uint8_t mask_id; +}; + +static int +nfp_mask_id_alloc(struct nfp_flow_priv *priv, uint8_t *mask_id) +{ + uint8_t temp_id; + uint8_t freed_id; + struct circ_buf *ring; + + /* Checking for unallocated entries first. */ + if (priv->mask_ids.init_unallocated > 0) { + *mask_id = priv->mask_ids.init_unallocated; + priv->mask_ids.init_unallocated--; + return 0; + } + + /* Checking if buffer is empty. */ + freed_id = NFP_FLOWER_MASK_ENTRY_RS - 1; + ring = &priv->mask_ids.free_list; + if (ring->head == ring->tail) { + *mask_id = freed_id; + return -ENOENT; + } + + rte_memcpy(&temp_id, &ring->buf[ring->tail], NFP_FLOWER_MASK_ELEMENT_RS); + *mask_id = temp_id; + + rte_memcpy(&ring->buf[ring->tail], &freed_id, NFP_FLOWER_MASK_ELEMENT_RS); + ring->tail = (ring->tail + NFP_FLOWER_MASK_ELEMENT_RS) % + (NFP_FLOWER_MASK_ENTRY_RS * NFP_FLOWER_MASK_ELEMENT_RS); + + return 0; +} + +static int +nfp_mask_id_free(struct nfp_flow_priv *priv, uint8_t mask_id) +{ + struct circ_buf *ring; + + ring = &priv->mask_ids.free_list; + + /* Checking if buffer is full. */ + if (CIRC_SPACE(ring->head, ring->tail, NFP_FLOWER_MASK_ENTRY_RS) == 0) + return -ENOBUFS; + + rte_memcpy(&ring->buf[ring->head], &mask_id, NFP_FLOWER_MASK_ELEMENT_RS); + ring->head = (ring->head + NFP_FLOWER_MASK_ELEMENT_RS) % + (NFP_FLOWER_MASK_ENTRY_RS * NFP_FLOWER_MASK_ELEMENT_RS); + + return 0; +} + +static int +nfp_mask_table_add(struct nfp_flow_priv *priv, + char *mask_data, + uint32_t mask_len, + uint8_t *id) +{ + int ret; + uint8_t mask_id; + uint32_t hash_key; + struct nfp_mask_id_entry *mask_entry; + + mask_entry = rte_zmalloc("mask_entry", sizeof(struct nfp_mask_id_entry), 0); + if (mask_entry == NULL) { + ret = -ENOMEM; + goto exit; + } + + ret = nfp_mask_id_alloc(priv, &mask_id); + if (ret != 0) + goto mask_entry_free; + + hash_key = rte_jhash(mask_data, mask_len, priv->hash_seed); + mask_entry->mask_id = mask_id; + mask_entry->hash_key = hash_key; + mask_entry->ref_cnt = 1; + PMD_DRV_LOG(DEBUG, "hash_key=%#x id=%u ref=%u", hash_key, + mask_id, mask_entry->ref_cnt); + + ret = rte_hash_add_key_data(priv->mask_table, &hash_key, mask_entry); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Add to mask table failed."); + goto mask_id_free; + } + + *id = mask_id; + return 0; + +mask_id_free: + nfp_mask_id_free(priv, mask_id); +mask_entry_free: + rte_free(mask_entry); +exit: + return ret; +} + +static int +nfp_mask_table_del(struct nfp_flow_priv *priv, + char *mask_data, + uint32_t mask_len, + uint8_t id) +{ + int ret; + uint32_t hash_key; + + hash_key = rte_jhash(mask_data, mask_len, priv->hash_seed); + ret = rte_hash_del_key(priv->mask_table, &hash_key); + if (ret < 0) { + PMD_DRV_LOG(ERR, "Delete from mask table failed."); + return ret; + } + + ret = nfp_mask_id_free(priv, id); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Free mask id failed."); + return ret; + } + + return 0; +} + +static struct nfp_mask_id_entry * +nfp_mask_table_search(struct nfp_flow_priv *priv, + char *mask_data, + uint32_t mask_len) +{ + int index; + uint32_t hash_key; + struct nfp_mask_id_entry *entry; + + hash_key = rte_jhash(mask_data, mask_len, priv->hash_seed); + index = rte_hash_lookup_data(priv->mask_table, &hash_key, (void **)&entry); + if (index < 0) { + PMD_DRV_LOG(DEBUG, "Data NOT found in the mask table."); + return NULL; + } + + return entry; +} + +__rte_unused static bool +nfp_check_mask_add(struct nfp_flow_priv *priv, + char *mask_data, + uint32_t mask_len, + uint8_t *meta_flags, + uint8_t *mask_id) +{ + int ret; + struct nfp_mask_id_entry *mask_entry; + + mask_entry = nfp_mask_table_search(priv, mask_data, mask_len); + if (mask_entry == NULL) { + /* mask entry does not exist, let's create one */ + ret = nfp_mask_table_add(priv, mask_data, mask_len, mask_id); + if (ret != 0) + return false; + + *meta_flags |= NFP_FL_META_FLAG_MANAGE_MASK; + } else { + /* mask entry already exist */ + mask_entry->ref_cnt++; + *mask_id = mask_entry->mask_id; + } + + return true; +} + +__rte_unused static bool +nfp_check_mask_remove(struct nfp_flow_priv *priv, + char *mask_data, + uint32_t mask_len, + uint8_t *meta_flags) +{ + int ret; + struct nfp_mask_id_entry *mask_entry; + + mask_entry = nfp_mask_table_search(priv, mask_data, mask_len); + if (mask_entry == NULL) + return false; + + mask_entry->ref_cnt--; + if (mask_entry->ref_cnt == 0) { + ret = nfp_mask_table_del(priv, mask_data, mask_len, + mask_entry->mask_id); + if (ret != 0) + return false; + + rte_free(mask_entry); + if (meta_flags) + *meta_flags &= ~NFP_FL_META_FLAG_MANAGE_MASK; + } + + return true; +} + +__rte_unused static int +nfp_flow_table_add(struct nfp_flow_priv *priv, + struct rte_flow *nfp_flow) +{ + int ret; + char *hash_data; + uint32_t hash_key; + + hash_data = (char *)(nfp_flow->payload.unmasked_data); + hash_key = rte_jhash(hash_data, nfp_flow->length, priv->hash_seed); + ret = rte_hash_add_key_data(priv->flow_table, &hash_key, nfp_flow); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Add to flow table failed."); + return ret; + } + + return 0; +} + +__rte_unused static int +nfp_flow_table_delete(struct nfp_flow_priv *priv, + struct rte_flow *nfp_flow) +{ + int ret; + char *hash_data; + uint32_t hash_key; + + hash_data = (char *)(nfp_flow->payload.unmasked_data); + hash_key = rte_jhash(hash_data, nfp_flow->length, priv->hash_seed); + ret = rte_hash_del_key(priv->flow_table, &hash_key); + if (ret < 0) { + PMD_DRV_LOG(ERR, "Delete from flow table failed."); + return ret; + } + + return 0; +} + +__rte_unused static struct rte_flow * +nfp_flow_table_search(struct nfp_flow_priv *priv, + struct rte_flow *nfp_flow) +{ + int index; + char *hash_data; + uint32_t hash_key; + struct rte_flow *flow_find; + + hash_data = (char *)(nfp_flow->payload.unmasked_data); + hash_key = rte_jhash(hash_data, nfp_flow->length, priv->hash_seed); + index = rte_hash_lookup_data(priv->flow_table, &hash_key, (void **)&flow_find); + if (index < 0) { + PMD_DRV_LOG(DEBUG, "Data NOT found in the flow table."); + return NULL; + } + + return flow_find; +} + +__rte_unused static struct rte_flow * +nfp_flow_alloc(struct nfp_fl_key_ls *key_layer) +{ + char *tmp; + size_t len; + struct rte_flow *nfp_flow; + struct nfp_fl_payload *payload; + + nfp_flow = rte_zmalloc("nfp_flow", sizeof(struct rte_flow), 0); + if (nfp_flow == NULL) + goto exit; + + len = key_layer->key_size + key_layer->key_size + key_layer->act_size; + tmp = rte_zmalloc("nfp_flow_payload", len + sizeof(struct nfp_fl_rule_metadata), 0); + if (tmp == NULL) + goto free_flow; + + nfp_flow->length = len; + + payload = &nfp_flow->payload; + payload->meta = (struct nfp_fl_rule_metadata *)tmp; + payload->unmasked_data = tmp + sizeof(struct nfp_fl_rule_metadata); + payload->mask_data = payload->unmasked_data + key_layer->key_size; + payload->action_data = payload->mask_data + key_layer->key_size; + + return nfp_flow; + +free_flow: + rte_free(nfp_flow); +exit: + return NULL; +} + +__rte_unused static void +nfp_flow_free(struct rte_flow *nfp_flow) +{ + rte_free(nfp_flow->payload.meta); + rte_free(nfp_flow); +} + +__rte_unused static int +nfp_stats_id_alloc(struct nfp_flow_priv *priv, uint32_t *ctx) +{ + struct circ_buf *ring; + uint32_t freed_stats_id; + uint32_t temp_stats_id; + + /* Check for unallocated entries first. */ + if (priv->stats_ids.init_unallocated > 0) { + *ctx = ((priv->stats_ids.init_unallocated - 1) & NFP_FL_STAT_ID_STAT) | + (priv->active_mem_unit & NFP_FL_STAT_ID_MU_NUM); + if (++priv->active_mem_unit == priv->total_mem_units) { + priv->stats_ids.init_unallocated--; + priv->active_mem_unit = 0; + } + return 0; + } + + /* Check if buffer is empty */ + ring = &priv->stats_ids.free_list; + freed_stats_id = priv->stats_ring_size; + if (ring->head == ring->tail) { + *ctx = freed_stats_id; + return -ENOENT; + } + + memcpy(&temp_stats_id, &ring->buf[ring->tail], NFP_FL_STATS_ELEM_RS); + *ctx = temp_stats_id; + memcpy(&ring->buf[ring->tail], &freed_stats_id, NFP_FL_STATS_ELEM_RS); + ring->tail = (ring->tail + NFP_FL_STATS_ELEM_RS) % + (priv->stats_ring_size * NFP_FL_STATS_ELEM_RS); + + return 0; +} + +__rte_unused static int +nfp_stats_id_free(struct nfp_flow_priv *priv, uint32_t ctx) +{ + struct circ_buf *ring; + + /* Check if buffer is full */ + ring = &priv->stats_ids.free_list; + if (!CIRC_SPACE(ring->head, ring->tail, priv->stats_ring_size * + NFP_FL_STATS_ELEM_RS - NFP_FL_STATS_ELEM_RS + 1)) + return -ENOBUFS; + + memcpy(&ring->buf[ring->head], &ctx, NFP_FL_STATS_ELEM_RS); + ring->head = (ring->head + NFP_FL_STATS_ELEM_RS) % + (priv->stats_ring_size * NFP_FL_STATS_ELEM_RS); + + return 0; +} + +int +nfp_flow_priv_init(struct nfp_pf_dev *pf_dev) +{ + int ret = 0; + uint64_t ctx_count; + uint64_t ctx_split; + size_t stats_size; + struct nfp_flow_priv *priv; + struct nfp_app_fw_flower *app_fw_flower; + + struct rte_hash_parameters mask_hash_params = { + .name = "mask_hash_table", + .entries = NFP_MASK_TABLE_ENTRIES, + .hash_func = rte_jhash, + .socket_id = rte_socket_id(), + .key_len = sizeof(uint32_t), + .extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY, + }; + + struct rte_hash_parameters flow_hash_params = { + .name = "flow_hash_table", + .hash_func = rte_jhash, + .socket_id = rte_socket_id(), + .key_len = sizeof(uint32_t), + .extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY, + }; + + ctx_count = nfp_rtsym_read_le(pf_dev->sym_tbl, + "CONFIG_FC_HOST_CTX_COUNT", &ret); + if (ret < 0) { + PMD_INIT_LOG(ERR, "Read CTX_COUNT from symbol table failed"); + goto exit; + } + + ctx_split = nfp_rtsym_read_le(pf_dev->sym_tbl, + "CONFIG_FC_HOST_CTX_SPLIT", &ret); + if (ret < 0) { + PMD_INIT_LOG(ERR, "Read CTX_SPLIT from symbol table failed"); + goto exit; + } + + priv = rte_zmalloc("nfp_app_flow_priv", sizeof(struct nfp_flow_priv), 0); + if (priv == NULL) { + PMD_INIT_LOG(ERR, "nfp app flow priv creation failed"); + ret = -ENOMEM; + goto exit; + } + + app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv); + app_fw_flower->flow_priv = priv; + priv->hash_seed = (uint32_t)rte_rand(); + priv->stats_ring_size = ctx_count; + priv->total_mem_units = ctx_split; + + /* Init ring buffer and unallocated mask_ids. */ + priv->mask_ids.init_unallocated = NFP_FLOWER_MASK_ENTRY_RS - 1; + priv->mask_ids.free_list.buf = rte_zmalloc("nfp_app_mask_ids", + NFP_FLOWER_MASK_ENTRY_RS * NFP_FLOWER_MASK_ELEMENT_RS, 0); + if (priv->mask_ids.free_list.buf == NULL) { + PMD_INIT_LOG(ERR, "mask id free list creation failed"); + ret = -ENOMEM; + goto free_priv; + } + + /* Init ring buffer and unallocated stats_ids. */ + priv->stats_ids.init_unallocated = ctx_count / ctx_split; + priv->stats_ids.free_list.buf = rte_zmalloc("nfp_app_stats_ids", + priv->stats_ring_size * NFP_FL_STATS_ELEM_RS, 0); + if (priv->stats_ids.free_list.buf == NULL) { + PMD_INIT_LOG(ERR, "stats id free list creation failed"); + ret = -ENOMEM; + goto free_mask_id; + } + + /* flow stats */ + rte_spinlock_init(&priv->stats_lock); + stats_size = (ctx_count & NFP_FL_STAT_ID_STAT) | + ((ctx_split - 1) & NFP_FL_STAT_ID_MU_NUM); + PMD_INIT_LOG(INFO, "ctx_count:%0lx, ctx_split:%0lx, stats_size:%0lx ", + ctx_count, ctx_split, stats_size); + priv->stats = rte_zmalloc("nfp_flow_stats", + stats_size * sizeof(struct nfp_fl_stats), 0); + if (priv->stats == NULL) { + PMD_INIT_LOG(ERR, "flow stats creation failed"); + ret = -ENOMEM; + goto free_stats_id; + } + + /* mask table */ + mask_hash_params.hash_func_init_val = priv->hash_seed; + priv->mask_table = rte_hash_create(&mask_hash_params); + if (priv->mask_table == NULL) { + PMD_INIT_LOG(ERR, "mask hash table creation failed"); + ret = -ENOMEM; + goto free_stats; + } + + /* flow table */ + flow_hash_params.hash_func_init_val = priv->hash_seed; + flow_hash_params.entries = ctx_count; + priv->flow_table = rte_hash_create(&flow_hash_params); + if (priv->flow_table == NULL) { + PMD_INIT_LOG(ERR, "flow hash table creation failed"); + ret = -ENOMEM; + goto free_mask_table; + } + + return 0; + +free_mask_table: + rte_free(priv->mask_table); +free_stats: + rte_free(priv->stats); +free_stats_id: + rte_free(priv->stats_ids.free_list.buf); +free_mask_id: + rte_free(priv->mask_ids.free_list.buf); +free_priv: + rte_free(priv); +exit: + return ret; +} + +void +nfp_flow_priv_uninit(struct nfp_pf_dev *pf_dev) +{ + struct nfp_app_fw_flower *app_fw_flower; + struct nfp_flow_priv *priv; + + app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv); + priv = app_fw_flower->flow_priv; + + rte_hash_free(priv->flow_table); + rte_hash_free(priv->mask_table); + rte_free(priv->stats); + rte_free(priv->stats_ids.free_list.buf); + rte_free(priv->mask_ids.free_list.buf); + rte_free(priv); +} diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index 971ba69..142d7d5 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -6,15 +6,96 @@ #ifndef _NFP_FLOW_H_ #define _NFP_FLOW_H_ +#define NFP_FL_META_FLAG_MANAGE_MASK (1 << 7) + +#define NFP_MASK_TABLE_ENTRIES 1024 + +enum nfp_flower_tun_type { + NFP_FL_TUN_NONE = 0, + NFP_FL_TUN_GRE = 1, + NFP_FL_TUN_VXLAN = 2, + NFP_FL_TUN_GENEVE = 4, +}; + +struct nfp_fl_key_ls { + uint32_t key_layer_two; + uint8_t key_layer; + int key_size; + int act_size; + uint32_t port; + uint16_t vlan; + enum nfp_flower_tun_type tun_type; +}; + +struct nfp_fl_rule_metadata { + uint8_t key_len; + uint8_t mask_len; + uint8_t act_len; + uint8_t flags; + rte_be32_t host_ctx_id; + rte_be64_t host_cookie __rte_packed; + rte_be64_t flow_version __rte_packed; + rte_be32_t shortcut; +}; + +struct nfp_fl_payload { + struct nfp_fl_rule_metadata *meta; + char *unmasked_data; + char *mask_data; + char *action_data; +}; + +#define CIRC_CNT(head, tail, size) (((head) - (tail)) & ((size) - 1)) +#define CIRC_SPACE(head, tail, size) CIRC_CNT((tail), ((head) + 1), (size)) +struct circ_buf { + uint32_t head; + uint32_t tail; + char *buf; +}; + +#define NFP_FLOWER_MASK_ENTRY_RS 256 +#define NFP_FLOWER_MASK_ELEMENT_RS sizeof(uint8_t) +struct nfp_fl_mask_id { + struct circ_buf free_list; + uint8_t init_unallocated; +}; + +#define NFP_FL_STATS_ELEM_RS sizeof(uint32_t) +struct nfp_fl_stats_id { + struct circ_buf free_list; + uint32_t init_unallocated; +}; + +#define NFP_FL_STAT_ID_MU_NUM 0xffc00000 +#define NFP_FL_STAT_ID_STAT 0x003fffff struct nfp_fl_stats { uint64_t pkts; uint64_t bytes; }; struct nfp_flow_priv { + uint32_t hash_seed; /**< Hash seed for hash tables in this structure. */ + /* mask hash table */ + struct nfp_fl_mask_id mask_ids; /**< Entry for mask hash table */ + struct rte_hash *mask_table; /**< Hash table to store mask ids. */ + /* flow hash table */ + struct rte_hash *flow_table; /**< Hash table to store flow rules. */ /* flow stats */ + uint32_t active_mem_unit; /**< The size of active mem units. */ + uint32_t total_mem_units; /**< The size of total mem units. */ + uint32_t stats_ring_size; /**< The size of stats id ring. */ + struct nfp_fl_stats_id stats_ids; /**< The stats id ring. */ struct nfp_fl_stats *stats; /**< Store stats of flow. */ rte_spinlock_t stats_lock; /** < Lock the update of 'stats' field. */ }; +struct rte_flow { + struct nfp_fl_payload payload; + size_t length; + bool install_flag; +}; + +int nfp_flow_priv_init(struct nfp_pf_dev *pf_dev); +void nfp_flow_priv_uninit(struct nfp_pf_dev *pf_dev); + #endif /* _NFP_FLOW_H_ */ -- 1.8.3.1