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 E34BBA0C4B; Mon, 12 Jul 2021 03:47:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0553A4118A; Mon, 12 Jul 2021 03:47:36 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2050.outbound.protection.outlook.com [40.107.236.50]) by mails.dpdk.org (Postfix) with ESMTP id E356441180 for ; Mon, 12 Jul 2021 03:47:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nqIrhGsuOyBz0M+VGRGMVgiKiju0jzcZ4oayStwlIcv38287Hmxx4Y4dZcjyDNB86hg/OnFa12Ewb5t0B9ymrE2GGlfw5rCW2pegmbwTmdNWnBnICpYLsG76KcPgdKgix5BEuDsqQ6zgMTg1hOa+LVVm7MeNnz2m6N4JWprlI0j+W7wu41g3+QrvWREhib0ld9htGW1W9sfHoM+TYwcjjGHeaOiJKN0rAf5ejGZfVMydtzX0BsHrILJBew6GPRkaVzp77NNnPlwb9X4hs4AJqj3OcAgrfVUNfwr1DkDDBHdS6brOaKpZ3zeXCj+qe9JAKsFFvr5xIAU555yyFBl9YA== 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-SenderADCheck; bh=sGKkTxBRkki51x92gVo/ec3Xx05Ymp9Wu93yZ7GM/pg=; b=neeBQl/q15mX5Jf2wJGZEg571HcBRptto78Nf2bCddVevLuYXKpltxZZ2cNnShn4hvsN5O1poxk9i7A+N1the07Ay3h+FD1gWIucskyCCVZGscQFqP24WiEihN2NYMyoHvWXjZRGasJC01bqMK9AFMIzw4nk3o8h69Kk2aOgZTPo3tCruW2I0jDNSufxpGlrX/8h/yenHryeKxT0iOMO4zGiXE2rV0U73SWBANw43KweXK529gLr0RAwRs9CJxXTuD2g/hmfu54AI5DET8Yp7FGsn5YNeIAoDwfRGAp7GRHWXjstUGkn4i9Uuzb1+VeiM4mzANv3iGpOm4touRgYPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sGKkTxBRkki51x92gVo/ec3Xx05Ymp9Wu93yZ7GM/pg=; b=HsmxuopqTPdGEU4Z/UD+inej+eKYoXalMK4Uqw8l5Y9xLv+BBOBzxGGBYxfM3Tl20UVEvJRGuGaMEXtigeGnije02LU1l1yQRvhvVciETHsD0etVpQZNU6EgPoOvMwcG+H/NBy7F994tCfid1wN3NiVJVn+YcpP5EyQPX3JmJ7R+/HP+BFBv5+ljX9kXcAURcnBNi909V18sJjyrE3VGmnyyjQbNlqf85I+SPvqFtltTAbN1SNnnPe7OQoo8IYOx4hXI9Q4tBERB3Ns9rLQ0+H0oZ6rdj2m2uaTp99AWOp8EhGeily0Hwxw2ABylotJuCX0cQo+iL8klPlLrR88YWg== Received: from BN0PR02CA0012.namprd02.prod.outlook.com (2603:10b6:408:e4::17) by BN8PR12MB3587.namprd12.prod.outlook.com (2603:10b6:408:43::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.23; Mon, 12 Jul 2021 01:47:32 +0000 Received: from BN8NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e4:cafe::ba) by BN0PR02CA0012.outlook.office365.com (2603:10b6:408:e4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.19 via Frontend Transport; Mon, 12 Jul 2021 01:47:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT009.mail.protection.outlook.com (10.13.176.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4308.20 via Frontend Transport; Mon, 12 Jul 2021 01:47:32 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 12 Jul 2021 01:47:17 +0000 From: Suanming Mou To: , CC: , , Date: Mon, 12 Jul 2021 04:46:32 +0300 Message-ID: <20210712014654.32428-5-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210712014654.32428-1-suanmingm@nvidia.com> References: <20210527093403.1153127-1-suanmingm@nvidia.com> <20210712014654.32428-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dadae785-0119-4ee4-55a9-08d944d703e2 X-MS-TrafficTypeDiagnostic: BN8PR12MB3587: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:72; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OBdoDRN3ivlWZiLl2yktv9Ii6HVF/aGRSpIT7K6J7OvdsnY5zMkFFsuL3j9d54XvLjmDJFHYdfu2EdKmqPhHAHWFUBr9SX83xWfEVxRG0yWShB1sZawp9RYwhhi7wXCr/eGSKGDfyXBqSI+w1OLVybG9IBGmFj1dVXIFuzbAiWopnlLMt/CClXHUL/azy5SMSw2lrMC65rDIXzGkk0/Qgc2CJSHJIkaGyFZPr6C8ZqabPSaVp+2Iu8DpdT/k1bJ17jXwgavDycxK91b3bGCmSb4TwaxVZJK1Q9bDEKeSYO3nkgVyqG6Il22opAwHiToXMP3opXqGdnV4seCpgAgMe5I2+iVF4d2aBcG5sqo4HA2eoBSJOuc6fEQlnkYREMe8TI9Wuf6v3l3XzwiEBZUEuGmZxq7hQW2p4dlI/8oJK9fkL6hInXehoReQAe0TfECC8XjuitB6Imk5S3FnLx66rbtD7jbPixCwRW24oO5ikEFQ32X/i0yDOTzPzPYTwvLhhk7sG+8lA6LnaxOcsIUXtj93sKP570Fqqq2h6XBzcty6HqkXDj0/P4hkQTsEgjHyYlsyWUXnSyWfBH4Edf3sp5eAgthZQBn71J77KBjNXlXl9/KzLUB3IqjfXdg6LxGtvMQ/9YUByspBIQZMliEwhy62bh5D3cuA3egHmUwIrbGZDTMWaOzbuPHXmXsAwZqF4hiaymBTnDJ/Wvg1NPiDGcMOvUAqyfjn2hrKHZNAFnU= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(376002)(39860400002)(136003)(346002)(36840700001)(46966006)(6286002)(36860700001)(426003)(478600001)(2616005)(6666004)(6636002)(7636003)(47076005)(336012)(1076003)(186003)(34020700004)(110136005)(8936002)(83380400001)(356005)(82740400003)(7696005)(82310400003)(5660300002)(16526019)(86362001)(36906005)(70206006)(54906003)(26005)(4326008)(70586007)(55016002)(316002)(2906002)(8676002)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2021 01:47:32.1609 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dadae785-0119-4ee4-55a9-08d944d703e2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3587 Subject: [dpdk-dev] [PATCH v5 04/26] net/mlx5: support index pool non-lcore operations 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 Sender: "dev" This commit supports the index pool non-lcore operations with an extra cache and lcore lock. Signed-off-by: Suanming Mou Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_utils.c | 75 +++++++++++++++++++++++++---------- drivers/net/mlx5/mlx5_utils.h | 3 +- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index 32f8d65073..f9557c09ff 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -275,6 +275,7 @@ mlx5_ipool_create(struct mlx5_indexed_pool_config *cfg) mlx5_trunk_idx_offset_get(pool, TRUNK_MAX_IDX + 1); if (!cfg->per_core_cache) pool->free_list = TRUNK_INVALID; + rte_spinlock_init(&pool->lcore_lock); return pool; } @@ -515,20 +516,14 @@ mlx5_ipool_allocate_from_global(struct mlx5_indexed_pool *pool, int cidx) } static void * -mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, uint32_t idx) +_mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, int cidx, uint32_t idx) { struct mlx5_indexed_trunk *trunk; struct mlx5_indexed_cache *lc; uint32_t trunk_idx; uint32_t entry_idx; - int cidx; MLX5_ASSERT(idx); - cidx = rte_lcore_index(rte_lcore_id()); - if (unlikely(cidx == -1)) { - rte_errno = ENOTSUP; - return NULL; - } if (unlikely(!pool->cache[cidx])) { pool->cache[cidx] = pool->cfg.malloc(MLX5_MEM_ZERO, sizeof(struct mlx5_ipool_per_lcore) + @@ -549,15 +544,27 @@ mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, uint32_t idx) } static void * -mlx5_ipool_malloc_cache(struct mlx5_indexed_pool *pool, uint32_t *idx) +mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, uint32_t idx) { + void *entry; int cidx; cidx = rte_lcore_index(rte_lcore_id()); if (unlikely(cidx == -1)) { - rte_errno = ENOTSUP; - return NULL; + cidx = RTE_MAX_LCORE; + rte_spinlock_lock(&pool->lcore_lock); } + entry = _mlx5_ipool_get_cache(pool, cidx, idx); + if (unlikely(cidx == RTE_MAX_LCORE)) + rte_spinlock_unlock(&pool->lcore_lock); + return entry; +} + + +static void * +_mlx5_ipool_malloc_cache(struct mlx5_indexed_pool *pool, int cidx, + uint32_t *idx) +{ if (unlikely(!pool->cache[cidx])) { pool->cache[cidx] = pool->cfg.malloc(MLX5_MEM_ZERO, sizeof(struct mlx5_ipool_per_lcore) + @@ -570,29 +577,40 @@ mlx5_ipool_malloc_cache(struct mlx5_indexed_pool *pool, uint32_t *idx) } else if (pool->cache[cidx]->len) { pool->cache[cidx]->len--; *idx = pool->cache[cidx]->idx[pool->cache[cidx]->len]; - return mlx5_ipool_get_cache(pool, *idx); + return _mlx5_ipool_get_cache(pool, cidx, *idx); } /* Not enough idx in global cache. Keep fetching from global. */ *idx = mlx5_ipool_allocate_from_global(pool, cidx); if (unlikely(!(*idx))) return NULL; - return mlx5_ipool_get_cache(pool, *idx); + return _mlx5_ipool_get_cache(pool, cidx, *idx); } -static void -mlx5_ipool_free_cache(struct mlx5_indexed_pool *pool, uint32_t idx) +static void * +mlx5_ipool_malloc_cache(struct mlx5_indexed_pool *pool, uint32_t *idx) { + void *entry; int cidx; + + cidx = rte_lcore_index(rte_lcore_id()); + if (unlikely(cidx == -1)) { + cidx = RTE_MAX_LCORE; + rte_spinlock_lock(&pool->lcore_lock); + } + entry = _mlx5_ipool_malloc_cache(pool, cidx, idx); + if (unlikely(cidx == RTE_MAX_LCORE)) + rte_spinlock_unlock(&pool->lcore_lock); + return entry; +} + +static void +_mlx5_ipool_free_cache(struct mlx5_indexed_pool *pool, int cidx, uint32_t idx) +{ struct mlx5_ipool_per_lcore *ilc; struct mlx5_indexed_cache *gc, *olc = NULL; uint32_t reclaim_num = 0; MLX5_ASSERT(idx); - cidx = rte_lcore_index(rte_lcore_id()); - if (unlikely(cidx == -1)) { - rte_errno = ENOTSUP; - return; - } /* * When index was allocated on core A but freed on core B. In this * case check if local cache on core B was allocated before. @@ -635,6 +653,21 @@ mlx5_ipool_free_cache(struct mlx5_indexed_pool *pool, uint32_t idx) pool->cache[cidx]->len++; } +static void +mlx5_ipool_free_cache(struct mlx5_indexed_pool *pool, uint32_t idx) +{ + int cidx; + + cidx = rte_lcore_index(rte_lcore_id()); + if (unlikely(cidx == -1)) { + cidx = RTE_MAX_LCORE; + rte_spinlock_lock(&pool->lcore_lock); + } + _mlx5_ipool_free_cache(pool, cidx, idx); + if (unlikely(cidx == RTE_MAX_LCORE)) + rte_spinlock_unlock(&pool->lcore_lock); +} + void * mlx5_ipool_malloc(struct mlx5_indexed_pool *pool, uint32_t *idx) { @@ -814,7 +847,7 @@ mlx5_ipool_destroy(struct mlx5_indexed_pool *pool) MLX5_ASSERT(pool); mlx5_ipool_lock(pool); if (pool->cfg.per_core_cache) { - for (i = 0; i < RTE_MAX_LCORE; i++) { + for (i = 0; i <= RTE_MAX_LCORE; i++) { /* * Free only old global cache. Pool gc will be * freed at last. @@ -883,7 +916,7 @@ mlx5_ipool_flush_cache(struct mlx5_indexed_pool *pool) for (i = 0; i < gc->len; i++) rte_bitmap_clear(ibmp, gc->idx[i] - 1); /* Clear core cache. */ - for (i = 0; i < RTE_MAX_LCORE; i++) { + for (i = 0; i < RTE_MAX_LCORE + 1; i++) { struct mlx5_ipool_per_lcore *ilc = pool->cache[i]; if (!ilc) diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index 737dd7052d..a509b0a4eb 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -248,6 +248,7 @@ struct mlx5_ipool_per_lcore { struct mlx5_indexed_pool { struct mlx5_indexed_pool_config cfg; /* Indexed pool configuration. */ rte_spinlock_t rsz_lock; /* Pool lock for multiple thread usage. */ + rte_spinlock_t lcore_lock; /* Dim of trunk pointer array. */ union { struct { @@ -259,7 +260,7 @@ struct mlx5_indexed_pool { struct { struct mlx5_indexed_cache *gc; /* Global cache. */ - struct mlx5_ipool_per_lcore *cache[RTE_MAX_LCORE]; + struct mlx5_ipool_per_lcore *cache[RTE_MAX_LCORE + 1]; /* Local cache. */ struct rte_bitmap *ibmp; void *bmp_mem; -- 2.25.1