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 BBCD1A0C47; Tue, 6 Jul 2021 15:33:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B32234138B; Tue, 6 Jul 2021 15:33:29 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2083.outbound.protection.outlook.com [40.107.236.83]) by mails.dpdk.org (Postfix) with ESMTP id AEC7941367 for ; Tue, 6 Jul 2021 15:33:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=byfU0KWDc/+YtRFwagRxbXIhds4dqP1dfeVvSw4bGTxkEaFXK5HJBIVQZNDsq9CmIwfiEOAcT+YwtHOqYExdoxde6GbrM29E5UVAmrXnFtngzysLbehKo6kXud7JXkrJU0TIhlN4P8+u7pl0s7LpBBWtRnBu68F9h1qi7/R2jB145rzsR3HlHbOVq74l/LmqJXwNLVW8+taZ6nwblpyiZT2dqA6yMU/WNcTTmDVhq/cDk8iEYpJRoG7/mIswoAjKCU4ic0W/w88s6rvvhptO7R+NWeO7FCiviREvde9YTekAiI9HIaR57saEhdaf/4sUCljM/R0qo8MPbOpapgmXCQ== 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=whPPfUGImCWDw9H8NLoASnEJAELcHjAacM0mL6bfyow=; b=EgIPcmgs0SfeQ9pxKApsZM4jMFNnxklbxQoc+w1zLxN73bcJW0hWRF90RrsiDS5rH579Q0M/dZ4nsChvpcPcA5RqJ7G6VBJhdZgW/zTwq4SIXL6bTusHDcWYwFQXS1NSvpwIVbv5CUr5ZI+kHTDTp8cTz6RGE/u+41CFnRo18Babgn09Oa4reqLOZmjNJ39UyzAJp/HZTILy/smzsVl+F3C/Hpy/ljOFfMhs7wA7AaPe9JjgPcl+rPmT/UPVROG9Ua51AbK4NwqPtqrAuMBMIZt97QGacy6H159YfhNpZb9spmkdHN4HgtZbw+wqYLb/oLhx/R+LNG0g+M8uLIYawg== 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=whPPfUGImCWDw9H8NLoASnEJAELcHjAacM0mL6bfyow=; b=Nx3IAZMSGBPUkeQozSZl8w0U1XlIgkTOJ5Ifo+a5oWos2I7cL6MrTclbF8V+E1kq2WlrYix/FrguVU+jATkyqXPKi7Z6OMPvTjfkd+7wlEB1t5cK3TPFAfeePSLsYMza9YhSB+PxwWDo/uRvwf94Bx2b52Er4FslZIbAkgRRWbLwzDx+qfrCEx5kM1nwtt1jd+krYsz569MBAaMsfHUDQaqih9+Fdd38jLKBVXwKEQpESBI35zg22ZNk8+UHRF8DxVIjYiSf5TVbToLEuikfXVSUVxb0Ja5GWBodT5MIg1W/WUT5AmETrjFdZn0KNMGMIjN14bhpTHYsHY5hi1A1Xg== Received: from BN0PR02CA0059.namprd02.prod.outlook.com (2603:10b6:408:e5::34) by MW2PR12MB2378.namprd12.prod.outlook.com (2603:10b6:907:f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.27; Tue, 6 Jul 2021 13:33:25 +0000 Received: from BN8NAM11FT047.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e5:cafe::5f) by BN0PR02CA0059.outlook.office365.com (2603:10b6:408:e5::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20 via Frontend Transport; Tue, 6 Jul 2021 13:33:24 +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 BN8NAM11FT047.mail.protection.outlook.com (10.13.177.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Tue, 6 Jul 2021 13:33:24 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 6 Jul 2021 13:33:22 +0000 From: Suanming Mou To: , CC: , , Date: Tue, 6 Jul 2021 16:32:34 +0300 Message-ID: <20210706133257.3353-4-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20210706133257.3353-1-suanmingm@nvidia.com> References: <20210527093403.1153127-1-suanmingm@nvidia.com> <20210706133257.3353-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [172.20.187.6] 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: 1798d11a-fc79-4117-170d-08d94082a15d X-MS-TrafficTypeDiagnostic: MW2PR12MB2378: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:156; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pZeIUYuEPj4KJ/a7NmxrpjDaqNFK6GisaRneMjjy7eeMf+jTPuiX7JurwsFVjz9RJRV9iiCtUfSOA2as1g9gq/PntpaRNo0EKVsIJbOjeGw4dDzd1WQtH3Sbm93CKnfXTfAgyCHOatuRr4DV5xf3Zf7jMTeYDa2uJuZdDDIV3HrRHD4Qz1PxX0eevKXMX6pAsSQLvxbxGbYGgU8apf/J6+Y1lxIPgDWJOnVLdjZ5D5jqaVs2dWtRXIK5v+AOMfOb3/rrbEwfb+LrmJM3ocDOwYXxblVxdRB553L4z0NnvZ1Z0rQcYFH9wN5mghLFdBppl0YXWcqrrzqZXi4IqbDKCxv0Xo5TRN4AQHBn770h73m+pWPddbG1zI2st3f7K2XXTRSEpBl8sTWutv27EeHx/3s+JTVKTzdZVN+S8YhEzzE9+4bUUGCcu5P/60XYS8PW+MG+5ixywt6XOr9cEBjaTWg8w4iPKNNlLEGl10xHmTEpSmnr058SiabeZSNq2bwOCUKWH36YsJKyLHy2C4m8uqCd8wQdbHwNx/Mrlw1U4NBrHIVbk5LZEevdP/WbQtfp6BBV1yLKyNOAs/9chYnzpKQy1QLlq4PU12KOJ0uoO4JgXDu7Wl8lKKiVXsk8UrqAlX5ZuIrKJAlWSF0rzE6FNi8FdsWaf/bktrPHBpUWVHSDY3eCjOIN+8D4chbyRYVckYVz1H6mZAXzpNLxnbW60Q== 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)(376002)(396003)(136003)(346002)(39860400002)(36840700001)(46966006)(55016002)(36860700001)(6666004)(82310400003)(8676002)(47076005)(7696005)(54906003)(478600001)(86362001)(316002)(36906005)(5660300002)(336012)(16526019)(7636003)(426003)(36756003)(70586007)(70206006)(2906002)(26005)(356005)(110136005)(6636002)(6286002)(8936002)(186003)(4326008)(2616005)(1076003)(83380400001)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2021 13:33:24.5065 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1798d11a-fc79-4117-170d-08d94082a15d 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: BN8NAM11FT047.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2378 Subject: [dpdk-dev] [PATCH v4 03/26] net/mlx5: add index pool foreach define 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" In some cases, application may want to know all the allocated index in order to apply some operations to the allocated index. This commit adds the indexed pool functions to support foreach operation. Signed-off-by: Suanming Mou Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_utils.c | 96 +++++++++++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_utils.h | 8 +++ 2 files changed, 104 insertions(+) diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index 215024632d..32f8d65073 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -529,6 +529,16 @@ mlx5_ipool_get_cache(struct mlx5_indexed_pool *pool, uint32_t idx) 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) + + (pool->cfg.per_core_cache * sizeof(uint32_t)), + RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY); + if (!pool->cache[cidx]) { + DRV_LOG(ERR, "Ipool cache%d allocate failed\n", cidx); + return NULL; + } + } lc = mlx5_ipool_update_global_cache(pool, cidx); idx -= 1; trunk_idx = mlx5_trunk_idx_get(pool, idx); @@ -839,6 +849,92 @@ mlx5_ipool_destroy(struct mlx5_indexed_pool *pool) return 0; } +void +mlx5_ipool_flush_cache(struct mlx5_indexed_pool *pool) +{ + uint32_t i, j; + struct mlx5_indexed_cache *gc; + struct rte_bitmap *ibmp; + uint32_t bmp_num, mem_size; + + if (!pool->cfg.per_core_cache) + return; + gc = pool->gc; + if (!gc) + return; + /* Reset bmp. */ + bmp_num = mlx5_trunk_idx_offset_get(pool, gc->n_trunk_valid); + mem_size = rte_bitmap_get_memory_footprint(bmp_num); + pool->bmp_mem = pool->cfg.malloc(MLX5_MEM_ZERO, mem_size, + RTE_CACHE_LINE_SIZE, rte_socket_id()); + if (!pool->bmp_mem) { + DRV_LOG(ERR, "Ipool bitmap mem allocate failed.\n"); + return; + } + ibmp = rte_bitmap_init_with_all_set(bmp_num, pool->bmp_mem, mem_size); + if (!ibmp) { + pool->cfg.free(pool->bmp_mem); + pool->bmp_mem = NULL; + DRV_LOG(ERR, "Ipool bitmap create failed.\n"); + return; + } + pool->ibmp = ibmp; + /* Clear global cache. */ + 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++) { + struct mlx5_ipool_per_lcore *ilc = pool->cache[i]; + + if (!ilc) + continue; + for (j = 0; j < ilc->len; j++) + rte_bitmap_clear(ibmp, ilc->idx[j] - 1); + } +} + +static void * +mlx5_ipool_get_next_cache(struct mlx5_indexed_pool *pool, uint32_t *pos) +{ + struct rte_bitmap *ibmp; + uint64_t slab = 0; + uint32_t iidx = *pos; + + ibmp = pool->ibmp; + if (!ibmp || !rte_bitmap_scan(ibmp, &iidx, &slab)) { + if (pool->bmp_mem) { + pool->cfg.free(pool->bmp_mem); + pool->bmp_mem = NULL; + pool->ibmp = NULL; + } + return NULL; + } + iidx += __builtin_ctzll(slab); + rte_bitmap_clear(ibmp, iidx); + iidx++; + *pos = iidx; + return mlx5_ipool_get_cache(pool, iidx); +} + +void * +mlx5_ipool_get_next(struct mlx5_indexed_pool *pool, uint32_t *pos) +{ + uint32_t idx = *pos; + void *entry; + + if (pool->cfg.per_core_cache) + return mlx5_ipool_get_next_cache(pool, pos); + while (idx <= mlx5_trunk_idx_offset_get(pool, pool->n_trunk)) { + entry = mlx5_ipool_get(pool, idx); + if (entry) { + *pos = idx; + return entry; + } + idx++; + } + return NULL; +} + void mlx5_ipool_dump(struct mlx5_indexed_pool *pool) { diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index 0469062695..737dd7052d 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -261,6 +261,9 @@ struct mlx5_indexed_pool { /* Global cache. */ struct mlx5_ipool_per_lcore *cache[RTE_MAX_LCORE]; /* Local cache. */ + struct rte_bitmap *ibmp; + void *bmp_mem; + /* Allocate objects bitmap. Use during flush. */ }; }; #ifdef POOL_DEBUG @@ -862,4 +865,9 @@ struct { \ (entry); \ idx++, (entry) = mlx5_l3t_get_next((tbl), &idx)) +#define MLX5_IPOOL_FOREACH(ipool, idx, entry) \ + for ((idx) = 0, mlx5_ipool_flush_cache((ipool)), \ + (entry) = mlx5_ipool_get_next((ipool), &idx); \ + (entry); idx++, (entry) = mlx5_ipool_get_next((ipool), &idx)) + #endif /* RTE_PMD_MLX5_UTILS_H_ */ -- 2.25.1