From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAE87C001DC for ; Wed, 26 Jul 2023 08:10:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A7216B007B; Wed, 26 Jul 2023 04:10:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 72DAE6B007D; Wed, 26 Jul 2023 04:10:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A6546B007E; Wed, 26 Jul 2023 04:10:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 487BD6B007B for ; Wed, 26 Jul 2023 04:10:27 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 113AB401D2 for ; Wed, 26 Jul 2023 08:10:27 +0000 (UTC) X-FDA: 81053040894.14.194D5CB Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf21.hostedemail.com (Postfix) with ESMTP id 44A081C0019 for ; Wed, 26 Jul 2023 08:10:25 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="P+/0rgLt"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1690359025; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oxj+btiC5bp07i0raCrQCISm2j0evx87VB7Ft6vQm0Y=; b=hdx0wLua97eNOdVYUbxo0kvSNeC/QtxCgORpn56lWpSybtQstIn6fsyGyDjD/gCcNk+fDp NdkVQy2ssxTkKEiER4VtPwGW9xtpbEKnKgaZ4e1puDFRi0VRf7NGLPEucE9Izdg7PKh9di R/87Bj42zZxd55SugxSSQMougcR+UQw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="P+/0rgLt"; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf21.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690359025; a=rsa-sha256; cv=none; b=31TyLjLBfrKw7HjzGm6Rx17FvZR1+nFC8ETBlgoMPvTCv2I07L09VkG1GiWVlb94K4r0LE CIQ6+cnIYUO20oH29vHQjWwpIfyVrNZEU0Ichy2iHR4noMOanGbpQ9wSjy5q+5v3ljMZ37 BdqsJDRyczlFeQ+xgo6oyGYLcaF4r/8= Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-26826f93a1fso1646943a91.3 for ; Wed, 26 Jul 2023 01:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1690359024; x=1690963824; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oxj+btiC5bp07i0raCrQCISm2j0evx87VB7Ft6vQm0Y=; b=P+/0rgLtEdpbjzKqmA02o57JAFTpubjCpSW6mbosOnpFa92pkdk6Jcgr2NP/7Cwuqv X704pWI/GcFkT+iYFHPSJB4sqKMdrdQDbQO40IHz8iIVf4GjaTiv6wZEnyXnNguWrM+W x4jUL97/rQ4GOieM5c2xzpBxvTkZ6DSetuV5zIGVZqGZ2sm4rHt43AqEx6Fkn8k50sjH SRru4KNzIIA6FNTeYMNPz5gIVMHzVscuHdHd4gtKTsN9OUrOXGyDqcUS5HBnD3L+NgwX G5eGekoi/fvhPV5mfSGu8zzazu4u7WPmnD8TUvnKm5P2igUsV6DLAbGfvYr5+JXeQ9DH sPGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690359024; x=1690963824; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oxj+btiC5bp07i0raCrQCISm2j0evx87VB7Ft6vQm0Y=; b=MHleY4pVoSSgKPZ7/CKezHltlav90m9vdTQckcEtSdEzdrKCyG89UgcRVDCKFWH4rc yofjAq7ho30aaOTCZI86W5tj0Az8qgqr+1LzVfFf8FedE7t9gTtPENS2ZGgrhl7jMzfe yJ5VsJZXsZMjXxmdj/5sk7OCm8v6ar2AbtL1k8wQhTYYrgJv+WWGlxIooegGa1p7cE5n S6ktOEdSqVwn0axnim9rymq6inBzUMbU8MFxSelW+k+OmsEvUBCxu5WZk4gRsrepVOD7 lxCDppN0lRw6equcX77sHbot6jRWJgEhgxH6IsB97hlUUnI1hjrNlvsbK5a5xCRFyreT 7pKA== X-Gm-Message-State: ABy/qLb3TBksktmRivA8Y0NbDuUFE+Ob66dlb53VxgfnduExZZDrV0RU LHuNROHm2wyXPZ1mqZh1WPuZsQ== X-Google-Smtp-Source: APBJJlGlSCxdEfq1BDlME7pPijSE799iYFshp/KuL1hJgcfxhw5EPTeKsWGCQw9soPRWN5f9bpFYXQ== X-Received: by 2002:a17:90b:1b4f:b0:25b:f66c:35a9 with SMTP id nv15-20020a17090b1b4f00b0025bf66c35a9mr1209893pjb.48.1690359024079; Wed, 26 Jul 2023 01:10:24 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id gc17-20020a17090b311100b002680b2d2ab6sm756540pjb.19.2023.07.26.01.10.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 26 Jul 2023 01:10:23 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com, corbet@lwn.net, akpm@linux-foundation.org, willy@infradead.org, brauner@kernel.org, surenb@google.com, michael.christie@oracle.com, peterz@infradead.org, mathieu.desnoyers@efficios.com, npiggin@gmail.com, avagin@gmail.com Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Peng Zhang Subject: [PATCH 06/11] maple_tree: Introduce mas_replace_entry() to directly replace an entry Date: Wed, 26 Jul 2023 16:09:11 +0800 Message-Id: <20230726080916.17454-7-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230726080916.17454-1-zhangpeng.00@bytedance.com> References: <20230726080916.17454-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 44A081C0019 X-Stat-Signature: deig3kgaaeezueoup7ua8zaghzezcpqo X-Rspam-User: X-HE-Tag: 1690359025-606092 X-HE-Meta: U2FsdGVkX1+MjM7w/hZWi+XpwjLQm1z/5ak8ZkfaPGMVnnfqNfUca5tW0mOcG1ky8XLN4os9e2Q+B475eLw1Yj2h3vWVIG+jAGtIxKhmg92aEMBxnnboq5w2QWmMUT7zlA4iENVhpu5+VTTtA2zZbxC/9+qlGWroisXlHcKPJSbHgwNafXuK6DpyAWXzr7oOyF3u075cchCz7raq1pUqgXTMPEwTA/dm23BmA0nt8eHJJYzWwWU6NKxALb8pmk5lLxq6eus1NEXfBHNmBsx92YQhTzvDj3KKgEtQp6YSxR6yTS5EKxTzYBMuwjlcNzSwrvVPu9oAZZMD7EEhKhIoncedUAMH2I6jjARDT//4bXZ88zufgPI/2AIUU5BcLTmOZDQ6rgkEyHB1J97p7mwrGhu/PdG4ejbV+l7j2DbJQD+TeGGtjVO/v9esw9qpJxVE0+S2/BSa/H8Snrh6mwzYBnZmdtuRSDhPxX1+hn8I6SKgFJJilO6SodAttaRiQT+FzPofhOkzsu5+KEUPcVzpWw0rpZiUYDNl15I4G5i02jGnfZEXGGtM1PM1FUvc9cMjothK1JUiMUmnUi2OFIIjc3s7n1ZPPQQe4CDixOHsHAvtXGoklO3ihzOTjywfoXluQmdAYSW4dT3DfFPMLUBXmFhepJH5bHKojtdc4XF3b52bW8d0MoVt+zEbJult0LJTeobpgi/66zV4sdMHmbYAlIwG6NgFNwSMZvamXkiUHNZD+LguTDXgarCLjslg0hsIEgrQkp4yrQnDSVWnnuU+Ljv5Sff4PvydqFB2V6hcd5yHCNtzqkHBSFwOPZ8p62ZxPw5an2sSY8gfspTBzjRL7E6ptiiCtkKTQreoywBJgDBj/8wABLrUAX/E4yDxnOEd/pkwohTize3zgX76IwtPh010i2vNDzIB6QxfuXA/Dsg3fN9AfGag6z9vhvQmuv60R1FNUYN2uk7puYe2Frs JWkEIkHE MHSHB/eOczTJW/G1F7/Y+gGKQKf8TBBBuPHXVR3ZdMWd2pWZObRIj5YAymQKGd7BObVO4zemFJ+xdaUU2ccwSVETQWE/pFIjHj+JSN71m53r1Tt9SfWoct+HtcCsglvL3lK8J8mc1Hxa6E8E58gBH7AL7/FbDLX3DHW/FN7d9dtazuFK+AYr3kwtCLdMsLulP8kRPSzrHqSfuEGOXy1D2nkiMdlv85lre9PvhVFl97SiNH6lrytWMaJ+hC2Cwn6Z+szG7tawk4JToyElNfFSFi8cE9b9D/SVJD84p1ghhHZHr39GZMyX8g/3bZzY4yr72R7177k+nRFBLXF/Vl0QKWktEwkCG47FdS6Rns+NPnwztUFDS4acL4nbvyUiJNY80p9O0UUaQ5dyqjHw6UE4QOPor0eMMuwV9Z/2nt1MDSdWUjFWJjN/HKP0Ylwxw6xU0uKWniQ2BBPifMVjHy9O7+rR7gw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: If mas has located a specific entry, it may be need to replace this entry, so introduce mas_replace_entry() to do this. mas_replace_entry() will be more efficient than mas_store*() because it doesn't do many unnecessary checks. This function should be inline, but more functions need to be moved to the header file, so I didn't do it for the time being. Signed-off-by: Peng Zhang --- include/linux/maple_tree.h | 1 + lib/maple_tree.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h index 229fe78e4c89..a05e9827d761 100644 --- a/include/linux/maple_tree.h +++ b/include/linux/maple_tree.h @@ -462,6 +462,7 @@ struct ma_wr_state { void *mas_walk(struct ma_state *mas); void *mas_store(struct ma_state *mas, void *entry); +void mas_replace_entry(struct ma_state *mas, void *entry); void *mas_erase(struct ma_state *mas); int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp); void mas_store_prealloc(struct ma_state *mas, void *entry); diff --git a/lib/maple_tree.c b/lib/maple_tree.c index efac6761ae37..d58572666a00 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5600,6 +5600,31 @@ void *mas_store(struct ma_state *mas, void *entry) } EXPORT_SYMBOL_GPL(mas_store); +/** + * mas_replace_entry() - Replace an entry that already exists in the maple tree + * @mas: The maple state + * @entry: The entry to store + * + * Please note that mas must already locate an existing entry, and the new entry + * must not be NULL. If these two points cannot be guaranteed, please use + * mas_store*() instead, otherwise it will cause an internal error in the maple + * tree. This function does not need to allocate memory, so it must succeed. + */ +void mas_replace_entry(struct ma_state *mas, void *entry) +{ + void __rcu **slots; + +#ifdef CONFIG_DEBUG_MAPLE_TREE + MAS_WARN_ON(mas, !mte_is_leaf(mas->node)); + MAS_WARN_ON(mas, !entry); + MAS_WARN_ON(mas, mas->offset >= mt_slots[mte_node_type(mas->node)]); +#endif + + slots = ma_slots(mte_to_node(mas->node), mte_node_type(mas->node)); + rcu_assign_pointer(slots[mas->offset], entry); +} +EXPORT_SYMBOL_GPL(mas_replace_entry); + /** * mas_store_gfp() - Store a value into the tree. * @mas: The maple state -- 2.20.1