From patchwork Mon Jan 30 16:42:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1734284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=iDKOgkn0; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5DX03BBzz1yhq for ; Tue, 31 Jan 2023 03:43:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8440C81E61; Mon, 30 Jan 2023 16:43:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8440C81E61 Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=corigine.onmicrosoft.com header.i=@corigine.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-corigine-onmicrosoft-com header.b=iDKOgkn0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5151uuR9Yz-z; Mon, 30 Jan 2023 16:43:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1DAEE81E06; Mon, 30 Jan 2023 16:43:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1DAEE81E06 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C66C8C0033; Mon, 30 Jan 2023 16:43:23 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id DB4E8C0033 for ; Mon, 30 Jan 2023 16:43:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9885F81DD8 for ; Mon, 30 Jan 2023 16:43:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9885F81DD8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7lb7OiSYgMuj for ; Mon, 30 Jan 2023 16:43:18 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org DE6A781D0C Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2118.outbound.protection.outlook.com [40.107.92.118]) by smtp1.osuosl.org (Postfix) with ESMTPS id DE6A781D0C for ; Mon, 30 Jan 2023 16:43:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=If00EhE8lmS109eDHbVt6as0JmYnnJGWueXg9JH/iThWbC989jW/tfJN/Tw5hwlvfiXCN33/tNDZs+CiVOxNYkdnDnsm++izZ221GMkPghDyVM7ln5dYqUZ0UVdVsQq0b9BANrwIWfOcgjJaG5kc88NiXF/xzwKVhDJsvlEITNMQ96eGdZj8dlSWNsOXWRZiQR/+SLANRNDr/H/6VVxzFODoq6Y4wy/Ju0dRkigeIzNfuV1jKWSHJJUPybllw+Vkd1WB7CQNgfxSwaBywpR/+dukT3iHrM3kkx7k8KnTIzaGxhZTKElUowHcymtxs4IXmruApFiA7WggNvrlAGVh7A== 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=7KTSzZiXtNzxFGrZ6B+9qsqH2yj6JuZWqt9RuwyPzrs=; b=ZQEw0kS0MzW2Sy3im1jDS19g9RRbyFS/jsJ6MOz1un9D4mgFnfB51k4HhkJAbY1e4Lxa43CVqKjCPuS+l1/OIyu+zC6grPGyKKUkgQR/pBW9a+wSADYS9/1bmxbHjxzJvc0wBBg9l+577/xAasaBzZpqhUDdWOOlYhsV6egDO3S9AjW7ZSkHZYeFpusdF+MHE797/+fWfEpLG2MTeCo3xeo/G50AMLuyHRe1szKF8AB7WufVnOHV9IdLntfbr0mfYx6UIur+ANDOlfT1tnfs6Z25VQLrTpTiqvyQZG9tUZ5rWbDjejFGgHx7u5Q5gtBp+r1juagHmQkCw1GWsstZ8A== 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=7KTSzZiXtNzxFGrZ6B+9qsqH2yj6JuZWqt9RuwyPzrs=; b=iDKOgkn0Yu22kUVmiwPDbx2IquT6chuRwCM0AKmESebWhtxC0qDbZuRuUjvWcpw4qE1czuSmM8m8TUyXRNN1fu7Ls/RfkwynKZWuBLOs2xOsxrUnLMkggupU5bLCbdBGbvy/UsqA/MwRRju8W0Ltv6kQugC5c1Y3be2tw6EzIAc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) by DM6PR13MB3866.namprd13.prod.outlook.com (2603:10b6:5:241::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Mon, 30 Jan 2023 16:43:16 +0000 Received: from PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::eb5c:910f:3730:fd65]) by PH0PR13MB4842.namprd13.prod.outlook.com ([fe80::eb5c:910f:3730:fd65%6]) with mapi id 15.20.6043.036; Mon, 30 Jan 2023 16:43:16 +0000 From: Simon Horman To: dev@openvswitch.org Date: Mon, 30 Jan 2023 17:42:55 +0100 Message-Id: <20230130164256.764534-3-simon.horman@corigine.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130164256.764534-1-simon.horman@corigine.com> References: <20230130164256.764534-1-simon.horman@corigine.com> X-ClientProxiedBy: AM4PR05CA0014.eurprd05.prod.outlook.com (2603:10a6:205::27) To PH0PR13MB4842.namprd13.prod.outlook.com (2603:10b6:510:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB4842:EE_|DM6PR13MB3866:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a80dab3-71d3-4048-ceb0-08db02e115a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fdXauoEvZsuN2AzBXmUwdBQxwCb20yUfCBTydzuKz91uek9AY/jzV9oCpQwQHfy73o5O1DRnDEH4waVye4C0ShF9xN6BuM5yZfVv2GPARJiIGJ3jidFNif076gj/SnfLQ7QPjXU3CRr1ssWywV8NEeH5HQdzgg4WiVqKCGT1yjUR/xIAlN4RbDCMxCuCqmGXANagtnVkOyj4aWz9QQY+bwmmNYtQ08j2z9/qGI+h/r/HyKLRheAZTJWwDePxpQ5tRVcr2+pf/24uGsoRHbEovPfdCVRgzqLU3+cIdECrQws3xevOlEohoeXPabw6UMgTiBnE5so5XuKOdIEtonTim7MeMmsnLraDna6tBiAtYNCKXZKl0zqw4Jxnkzeutp9yo/L/X1SvAsjeHtZ2s+SzZv2+mecC+vqrI2Eih/Za6EPDmDa+c+kA/+dKooZ/5bGDaZJ82L76QQmHYB/StEbtvJBxgg1cvTMkvauxvnrQxQBnrf+e59zYta9UlP9Kd4k5Qy3dJDlS5n8sE9/QZRldBU3+aSWzG3LNvNo2SFz9pgKEf71AX4Mnl4HfIrBrcGU3H32CaEFwWBxbXsgCRrfMcetZskge3m4Sfx3N+7TpSGFsGadp1tDs8QjQy2rGseqA7kXHUE8IXq5x+X40DC+6VPT+G1A/TSTh1oLpTaygW7dqFS3Hzm/QsvMO1UZK+I5T X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB4842.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(366004)(346002)(136003)(376002)(396003)(39830400003)(451199018)(186003)(478600001)(2616005)(6512007)(6486002)(2906002)(4326008)(54906003)(6916009)(107886003)(83380400001)(6666004)(6506007)(1076003)(52116002)(8676002)(66556008)(66476007)(66946007)(316002)(41300700001)(44832011)(5660300002)(8936002)(38100700002)(36756003)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8T6zlFHw9Esj9npvOqi/5OHux9mTgH0W6wNqJGN2pMu4mID+eGqJWUfbvs02IbfveD8og6b3qF3NHaYJLJMU5MTgxEP2ZcxC8PkrVbwqWdPBVpwUS0yxO6fAHMJTT0POeHb36eI7jaRLUAVNfafOJozaNVt4rJKlvlKRINHULq9Njdn18ub+wH2h+G3Qzz8xWWhaqw0xdeX5juCtOqdOvotAkOQMdT/Mq/z7dCTM25VhgMzgi9etlO6MP9RHX0W0QMkcERIyghUoT5QVj3YyZJLUNbMukBDQ92qXnb2VqyCYe6g7O4HwdVhDRHarTO/K1LQ2nggwN3/KmRC0LJ852mETbepiYWmYugm6EbTEsRsWULuTa3frlLy8ij+yukqZZwUaDGkv8nsaFz/Ls5ibSeUpHLAbCjXvuuxYg8mA7NPZZH26HcF3FkOK8OEZyuim0G0gvrWXrHi+79eQE/vW7hbxj3E94GWdf0gQxPocY+AezjJycq0EZ422uAOMqRjImGUwXt20H5OIBZGXLVHe0hothIAR4ZQ498yh8BMXohHt7SMFFoVkOKeNQtgok3QIDreUKKqgmNn63hOZYuai694uAfUtRNbsWvhCzwEd2FF+4OG17GRIaYjqzbsKXPyGOS4+vY/XZs8azOPAm8+vPS3zvHhtZXe8ev7dW53rjKtirkZcWY3TGk/omIKG/yM/NZMdKZZjPAPH/c+KY6FIhd4qF1p+s5ucKLB4O3VCANAdKAfgob3+VeDQ3ngGeXgA6yhVFY26gc998yaHKjvbdxuUhpiz4jt10nhKjX8BKhatPpEemIvecjEsye1x9V2r7HNHqH8Qoay9HPUIm0iElcZSReBhPbhloAx/GynYOwN5KSQJrp5HQk35KKmVahB3a/WG5oZtq+U5FALZfGBBlvEp+kr1922h7QWbJhtAJF+A/0n+oNAcdkUVTf1N35uxzGTDlR2kSvyHG6aKFMh5/fsUKTvA9tI2cJFsXH/tYWFN0txXPS7VvssNFOAqsA7fC/85gZGki0crV/dgrbVc7/W9m/6YgCCs42cxlTb/rVa6uL8cYK/DXzxgAVibUjjtQuvg3A8kANq3UTyPG7lLDRyiudCMV/lslHY3mBghAw/qYaC9Ho8l+5fPP5Y1LlgHbFa6p6vi70XFd/BPRjqdvxt2jcr1s61kXHCWG8ypRS6T6nMi3WliUyHMWjuEqbL2iU0DwtE/eDvBVXWmR/i1PiTyKUWsRQH5dEcnyM1HheFCPofJSOiHZLavh0HSigJJ0/xPkRQ1GZ3udFl7yXOa/aItY6iV9NYbC7vmoqx66UV48VZJLHKkIDG8PLJy5W6isPhHkQ9FwnARsSH3Jd9W2vBXsYUSKuakJu9YrhjFNsQL/1UQELpdnzGa77dKPvVzMNFZS5WdqafgF/kVHCUL/BOJNlmYM0sKW1hWzo40AKs/ah3jmypmPBRXrUmUWlS8Rvle1Lt8ioJf7sGzx5rTgxXT3me//uqX8Klot2by/2wXxOOC8716xjMB2zRVdUR4/BNg8y80Au0dGiXSeeNklvhkKRnkNXBzwpqSmoqWu9zzg/CBnTVfJ01mvzbPuaDyBksOpOo9M8MO7lo3vwuxqCN8ayZ2xUQ5EAu5unWZyaIX9tPnF5hXMldav8T21hXecsgyYD/5zl2jX1Y0dthC9Q== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a80dab3-71d3-4048-ceb0-08db02e115a9 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB4842.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 16:43:16.0228 (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: 9ANnbB4OxTusKsC80EnZadGHPz/JcqcENL8XZ0vvgwXx++U8e+haTwpr4QoqIXS4F8CK+Ne5RoUsojDONTzEm60uTwR9pXzRz/Jz6I0KsBo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3866 Cc: oss-drivers@corigine.com, Jianbo Liu Subject: [ovs-dev] [PATCH v3 2/3] id_pool: add helper function to add id_node in hmap X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Tianyu Yuan Add helper function to add id_node in hmap directly and expose this function for external use. Signed-off-by: Tianyu Yuan Signed-off-by: Simon Horman --- lib/id-pool.c | 12 ++++++++++-- lib/id-pool.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/id-pool.c b/lib/id-pool.c index 97b7185ed538..5c6dab906922 100644 --- a/lib/id-pool.c +++ b/lib/id-pool.c @@ -87,14 +87,22 @@ id_pool_find(struct id_pool *pool, uint32_t id) } void -id_pool_add(struct id_pool *pool, uint32_t id) +id_hmap_add(struct hmap *map, uint32_t id) { struct id_node *id_node = xmalloc(sizeof *id_node); size_t hash; id_node->id = id; hash = hash_int(id, 0); - hmap_insert(&pool->map, &id_node->node, hash); + hmap_insert(map, &id_node->node, hash); +} + +void +id_pool_add(struct id_pool *pool, uint32_t id) +{ + struct hmap *map = &pool->map; + + id_hmap_add(map, id); } bool diff --git a/lib/id-pool.h b/lib/id-pool.h index f71cc570f104..9fcd2c188666 100644 --- a/lib/id-pool.h +++ b/lib/id-pool.h @@ -35,6 +35,7 @@ struct id_pool *id_pool_create(uint32_t base, uint32_t n_ids); void id_pool_destroy(struct id_pool *); bool id_pool_alloc_id(struct id_pool *, uint32_t *id); void id_pool_free_id(struct id_pool *, uint32_t id); +void id_hmap_add(struct hmap *map, uint32_t id); void id_pool_add(struct id_pool *, uint32_t id); /*