From patchwork Tue Oct 24 08:32:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13434035 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 8AE06C00A8F for ; Tue, 24 Oct 2023 08:33:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0B8316B0199; Tue, 24 Oct 2023 04:33:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0401B6B019A; Tue, 24 Oct 2023 04:33:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFD406B019B; Tue, 24 Oct 2023 04:33:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C6F006B0199 for ; Tue, 24 Oct 2023 04:33:20 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4F8B8140E7E for ; Tue, 24 Oct 2023 08:33:20 +0000 (UTC) X-FDA: 81379690560.16.C2C7C97 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf02.hostedemail.com (Postfix) with ESMTP id 884BA80002 for ; Tue, 24 Oct 2023 08:33:18 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="X7/H3+v/"; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698136398; 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=7MLK4HxQMsxrLAQzNmdHMtQCN++SQMztyyHR1MHkRQQ=; b=IMtnlgo/n9WaDE3utqwhkIz9Nlf0UaRzQ16KIVMUWP0c63DhctgDnUo68h265JlCvGyKkg 5Lop6kidAsVsIPyMDC6nTMQeUQPhC5WKQrTKRQnOQ2oMwhxBQHd8pGCjZQuyNUXPjm0u1k CPoXlv4E6ICeyuiSgkZ+NSndZnPkeZg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698136398; a=rsa-sha256; cv=none; b=ZslhssSx+nOI+WWI0TVctRUwFQTrrDiWAfv6eCl3ZBCdI9vai+m6MVHXcfsJ2qUM0C/hDb BaHr/UdgEXSW+8lzqyMd3ZgqOO+LswJGffxO8IM9nGKKOb0TjAqXtra0u8+7QswokM6dj3 ZPx1Ke0QCv1PQ54eAxNxNfmAAeg8ozI= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="X7/H3+v/"; spf=pass (imf02.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-692c02adeefso3266479b3a.3 for ; Tue, 24 Oct 2023 01:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1698136397; x=1698741197; darn=kvack.org; 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=7MLK4HxQMsxrLAQzNmdHMtQCN++SQMztyyHR1MHkRQQ=; b=X7/H3+v/FXHPtOj7sCaOYPo4m3CHIcVh23W1t273iBSDfsSx8j7YEzV2Lp1dwEdlPT DVPqoPeCHXAl7j+c5WO+81T82ta0xlPND+cF/p4rCnjpJ3NBFKwBUUE2PVL1ivspLuUq HKT5rYEe9HKKpB8BXERStpG+kxCISzUe1YKIwRnmvolkybTnG+xZEawuP3UY6XgYRuxu mhvxWaXPjSuW+5iPxGvTFjMWP0xtrEFNJQs9pQWr5dyJeWKRtDQbpQpsYxmpU1l6v+M4 1tkYmnt/GmAG1et49+X7d7AqZA+egbAs30/iZIlGbwjEYCAQQnP45BRGBSFyqnXyZkuN dTSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698136397; x=1698741197; 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=7MLK4HxQMsxrLAQzNmdHMtQCN++SQMztyyHR1MHkRQQ=; b=Ttw7CKPBIDwCc2OWPjXQ8wS/KwbmSR07W+HPb8cXl2N+SQrLVQVa0AeqiXbv+YEKtG X8+W8mo97oe/9PibrPc8ywDQL6D0YGcCRLICxPc6S/Kng9NhlkrUtt/K7LIyBNPfJgSt UcO/yb++wAdLRVmnUzDHHMILQnpKJDc1fNaHPeiB6oog0akiYo5Q6fPlGmqZ3qZbBdEr s3n02WUVlG1VaWYsPVDkJE+zyscGOiCQ2JHkoBW90lbc46ORcrgafQiTVdOqPbLMCOgq ErXgtpvoir5v4/aeSR21h58gTp1Ajd7L82KXvJT3h6qemXWjDPx9ZiYp9ru7x7qfgq5Z hKbQ== X-Gm-Message-State: AOJu0Yzg7J8r15WZscI0GVH07MjAdKXMA4CyCzl2ZDKd/XfvPiXg/2Cx WM3u3Ka1mIv2jfBThLa1V+kUjx5nvtYSu8iDXlA= X-Google-Smtp-Source: AGHT+IHB77N08kpQP3kK7g9QlYWTNYn9tfxBH6TdMNcz14U0iu/fhKvY168Jlzr+1CThhjfwCpOJUw== X-Received: by 2002:a05:6a00:2292:b0:6bd:7cbd:15a2 with SMTP id f18-20020a056a00229200b006bd7cbd15a2mr10659966pfe.26.1698136397397; Tue, 24 Oct 2023 01:33:17 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([203.208.167.147]) by smtp.gmail.com with ESMTPSA id y21-20020aa79af5000000b0068be348e35fsm7236977pfp.166.2023.10.24.01.33.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Oct 2023 01:33:17 -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, mjguzik@gmail.com, mathieu.desnoyers@efficios.com, npiggin@gmail.com, peterz@infradead.org, oliver.sang@intel.com, mst@redhat.com Cc: zhangpeng.00@bytedance.com, maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v6 01/10] maple_tree: Add mt_free_one() and mt_attr() helpers Date: Tue, 24 Oct 2023 16:32:49 +0800 Message-Id: <20231024083258.65750-2-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231024083258.65750-1-zhangpeng.00@bytedance.com> References: <20231024083258.65750-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: x8po6qhaqsuopb1jyjxpkye96acnwxar X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 884BA80002 X-Rspam-User: X-HE-Tag: 1698136398-731431 X-HE-Meta: U2FsdGVkX18Mnh/eaa6HYEDzWn91OorAYVYedDNwnhECcuuM10DaVh57vkp7DOGrO53kh+YxjChf8mMjGmaIkf4VJRaYppBwZ57RTSWXYyViMoSyiSKfC34hQCaHHPKGoZJIB0fK68JhjGEPn1RYSJsONNPVERi4s4ZaxyIJh3JIYXLz9BCVE3cU3YUbNcxxy1LvNmoQJa854ETVjFTrt+l1abuE/Rf1Hf3llMT2VEOyOn9lRxq/4QwZX/Nbipug/bDa5UspwJV6cxgXvtrDPVQTWT/WnmRxRfueqL2vZAOTQl2ZNSq/Uc45c6ZN1f2C/9N6wC5+Xo3BjCSmeC4m6ff/lk6/p+IwXdkxByaZkyQtetlZuhYBDdbq8WuDS4213bHxtktfwx26i3om7F+tn0lZTRrmtGG9rB0WZ+fJC/iLAL75XbcElTN+tJfpcqIXkk+2eFehmsrowVvbB473mkfvnLbd3j0i7lXic24i0gRUhDhTxaEoKfx8wca3t6cLZzeeZZW1o5NhamxQu44yO/XNEHBrRDYXguXY4vEjh1iUGEubTQCPSFuFew32qQ1arp6rD2CnEpMX0MQeg7seTv7f14BVIa1AWGPR/GPRfo8qfXf/rMQ33P5j9FVz4kydv0JfrUCnGFLtTWVu1Mw7I0Ok5b9CT1AcjNF7dvaykHFNG5jKYujpc43TQNnhiUQoa5nSr5lQO14qt0xQtsP4Ef6s0NGaVcUhMHTy5cazqYYuOYFatHeXCCdFmCXl95DLMcKkVZ4vvmzV4xAZtmYYqeRNrhMVJexN3Qn72WxzKCN1U3XXW4YnYWsYhtGYx5r+jzbYFOpyl1LJ7PfXF2Z+pOmM5HQ+Ci9c1KKx6Noqtxc9JwP1b5qsTUE+WZsAq7RlTOUfAfOknjqjp+coyOVfA1ee09u036DTZJIp90A0dsp7XPga0A8qvKfy4h9dxWZm3Fbr8jbrVQMonzUSRzq iO4HmfL2 uM0J/NrOnVKoaAuD4uRvxKitnSZxp0TcFEdrOw93iOtSGdVX9Nyg92eyZ+qe8K8G5jk42ECylfUfLMXrJ4f2WFBNn873qFARGlxt8zyylQdF1yRKfDUgq7wd6FQmZd77gFxIFQl9y8kKqCWM7kBUzlyXbzTrCuGpkEmEXIcNW4NtFoNcpVLE+kjXgq5UhgisQTQDlLB6R5cvZr2JAdiqCfXB02slQue2xUBuZuue0RfidKUz1OBZt+odBheh4M48Y/kFBPlzvdS0CKCcSvp/HxgSqbLjubRKYyVEh34zlbso3+DwT3qQ6ojdGKxdM9+1/r1uq0hybKPwiDXemyJ6N1zw2tLb2teC1vmBpqWCFm4mfkqPjBgrSsa8WPcuDGONq/wS84jVwGNa2AlQH3exzII0LzJ7MkxsCRgXT/zZpE00iNVZUDQLKE/znbcsjkkxREzf8uLvsRlkWbwih1FFEBlg2IQ== 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: List-Subscribe: List-Unsubscribe: Add two helpers: 1. mt_free_one(), used to free a maple node. 2. mt_attr(), used to obtain the attributes of maple tree. Signed-off-by: Peng Zhang --- lib/maple_tree.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index bb24d84a4922..ca7039633844 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -165,6 +165,11 @@ static inline int mt_alloc_bulk(gfp_t gfp, size_t size, void **nodes) return kmem_cache_alloc_bulk(maple_node_cache, gfp, size, nodes); } +static inline void mt_free_one(struct maple_node *node) +{ + kmem_cache_free(maple_node_cache, node); +} + static inline void mt_free_bulk(size_t size, void __rcu **nodes) { kmem_cache_free_bulk(maple_node_cache, size, (void **)nodes); @@ -205,6 +210,11 @@ static unsigned int mas_mt_height(struct ma_state *mas) return mt_height(mas->tree); } +static inline unsigned int mt_attr(struct maple_tree *mt) +{ + return mt->ma_flags & ~MT_FLAGS_HEIGHT_MASK; +} + static inline enum maple_type mte_node_type(const struct maple_enode *entry) { return ((unsigned long)entry >> MAPLE_NODE_TYPE_SHIFT) & @@ -5573,7 +5583,7 @@ void mas_destroy(struct ma_state *mas) mt_free_bulk(count, (void __rcu **)&node->slot[1]); total -= count; } - kmem_cache_free(maple_node_cache, node); + mt_free_one(ma_mnode_ptr(node)); total--; }