From patchwork Mon Oct 9 09:03:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13413122 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 39B86E95A91 for ; Mon, 9 Oct 2023 09:03:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AC7FC8D0025; Mon, 9 Oct 2023 05:03:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A776C8D0001; Mon, 9 Oct 2023 05:03:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 919EC8D0025; Mon, 9 Oct 2023 05:03:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7E6A68D0001 for ; Mon, 9 Oct 2023 05:03:51 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 58E51A00E6 for ; Mon, 9 Oct 2023 09:03:51 +0000 (UTC) X-FDA: 81325335462.04.EB09D67 Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) by imf28.hostedemail.com (Postfix) with ESMTP id 80700C0013 for ; Mon, 9 Oct 2023 09:03:49 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=O5tVtdKw; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.161.53 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696842229; a=rsa-sha256; cv=none; b=LnujEs9lvvH6Y/Lrxr2JAUlbRIlOqX027yh3R12uDv9fH/tmyDTg3dn2rZbk5R3kqK5JLv Kptco5kwdN869pTsUZUA2NJ26pXn2gvgN6N0pAR7E/zPoDu9bBDCcAe6lt1RtH4RLcaX5W 5ObPbteMmHnBRXCdN2AeVb60xW7+Huc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=O5tVtdKw; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf28.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.161.53 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=1696842229; 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=Vn4VBWQzj5W1GGyecNOIEAPBueVPsjsImBXm9m9YoY4=; b=YVB8M++8sLdg9WAZmzWNCOmT1Ysp9gxk41f9W2ToKPgKfB60Vmsc+W8XfW6RWMMjvJ9GKR xHAjGfJ/0sfyXqrJe6IzrOSBuTKqvI+lZS8aMcOSgShwazYXXk/6q+C7DHA04/Fd5TiNgy MXwVGMsA4g6O9hMvzEDBsFlTy4Vbh6w= Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-57b9231e91dso2677962eaf.2 for ; Mon, 09 Oct 2023 02:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1696842228; x=1697447028; 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=Vn4VBWQzj5W1GGyecNOIEAPBueVPsjsImBXm9m9YoY4=; b=O5tVtdKwCDo+0qWvjJOVNhA7F1rSCrW3es8yF3kXKH2UhYRcWfGdoZV1HDEv9730zQ wNdKlxsg+td2TTmNO2IrOtOcVrHB+47GJXNiByjb4ng8m+wbDt4L87/hDTE5GxziZ7ig KGHjWPN9az7ERJRcQWgNndV3jLY2UxEFFx2WfHSvwdkZJ2XP5sIY4SPDVdwomfN/0Hcb jG68AENmN6eACRyuqBmhVWYyAP71UuA8tLImQKIy5SK9FjA7UiCP+4X9+AcFxoXee9Zz UTyJ6tgb8OmKb4o4R2PwBdiSxJtoLO92rsiKZwFv4ytVqWMRJqIGluz+vAXz3WYN8zKw oj+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696842228; x=1697447028; 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=Vn4VBWQzj5W1GGyecNOIEAPBueVPsjsImBXm9m9YoY4=; b=CDWEMVbOCP/Z5oQZNs2+wUSOfCys8XNXlVsChmTo+QNXLqZ0QSFeYNywhb6Sq9YwbY dK6vQJNOfqLNwVqv6iKKpIFBx904YMn0/rH/g6YAzkjiM0dExj+5a8maiefqqg9tChbk sCzSK7PjeuS5wHEmgbDBKRfRraFho1XzhUe7kbUvGwWOVV0fFaMJnXaOyR1dJM7dp1fK VLBQ6ZjN49/35MKy/Z5E175xvdmIAvclWDY6paGHUmMF9+iv2eUn3CZn+1IbeDR7E+Bt KYI9kS4fBsDLzoNR9dnK2JI0Bib1gQh3aDChD86j/kSb1dlriXDMI9Za9FbFGATZGku+ RwVQ== X-Gm-Message-State: AOJu0Yx3VOvPXH6UVODFbuaPiAl+rtt3h3gVhOdPxQQEKepVbAvGXxp5 EJdshkJT2rxwgcF0RCuAnCRzIg== X-Google-Smtp-Source: AGHT+IEWY+HaVY8fp64WuczHV3IZD4vZBL6+LkZqahkWHktgA14SlAu5iH/y7MbQI8ixDAn9dfnWUA== X-Received: by 2002:a05:6358:4408:b0:134:c37f:4b64 with SMTP id z8-20020a056358440800b00134c37f4b64mr14018761rwc.30.1696842228498; Mon, 09 Oct 2023 02:03:48 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.243]) by smtp.gmail.com with ESMTPSA id fk3-20020a056a003a8300b00690ca4356f1sm5884847pfb.198.2023.10.09.02.03.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Oct 2023 02:03:48 -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 v4 01/10] maple_tree: Add mt_free_one() and mt_attr() helpers Date: Mon, 9 Oct 2023 17:03:11 +0800 Message-Id: <20231009090320.64565-2-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20231009090320.64565-1-zhangpeng.00@bytedance.com> References: <20231009090320.64565-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 80700C0013 X-Stat-Signature: 8i145yk33fxdty4c844em9png7aqspcp X-HE-Tag: 1696842229-628229 X-HE-Meta: U2FsdGVkX1+avrlAtrYVJcpelp6RnVNOsWwlpdLNPT9FfR7Q2EMCuzVOVyiJJJ3JqgfFPmr7++VM1wJXpBrQiO57pJB4Up30BZ2LvMZpAwidRCzszWQeEdQ39oDLvqopDKyICJvR1PJ0y5OvKrVbx3fb6q8Q3NHYQ+czvQmZ5jzHM560s8g5S96FMC9qI6qM7Pu0uBReCt6Ij0mRFsHV0ZcP+8NAEKKn57rWg6cOgKU4ICXHvLQ+NTc9PO69fkP9Qg4o0OOexBzZUwh4EfQPM8a+vOauhAdI3vqAivuTj8M2OYRz/ZZAQJfsFEJuYexgfO21f1j8+ziEcOLF505Pq2hZGJreceXDJXxEmdsRaD/paqpE1QQ36Cx+5RZI3SGXqObaLDjgD1ikRC0T2Q+V0efpgz4/mYie815CxItYObWVWxlKzukXCWxO/RSszcnNUGu+JXNUy6rTDo2a77BvPAcyyeD/yjkEUKyRPUWWR7erDQAgSTskQzBkjJYnPH07e1R7aWG7Uw2ucmiOAk4mBWM9+Q7Yn6iyNV/c34nbBNR284iPGG/K7nEgCADDCrN3axycnmBqqlO2CFSyOPG8ev2QdvQXbmByECPgp1YZJsnxgLVS5cScc1hnUvGBWT5vda6WUOFobhu+6V3/72Bg421WaIjEiuz72B3xbxSM+k/oM7TIK7uT92MCQ/3nw0s8nYaEatKbWu9AEw7A3iWbNHtQ1ejNkOYW8GkrA4QDsD9SJ49XXIorNSwZO5ZNCO/Dmk9BQiW3PUFTdM46WFNDhF+PywqLuvcYcz1uaZk1B/0yaeMxnF1LVflTUGjIBPv0ZcdTZGPIih7u6IbK6151uA4kRZp8Dbb90khrxtaXpVzaT2mEAOeWWGjDfqx7mkVS9Y1naQacMzYSEd0ix8H7cq+/q9fB9GmW/mE7KDxAQo6Ba7d3mraZTeZgMBZSlpSIVM/zGoMuKMLvPXvIssg Y8caLhci ztwJiQTQZ9z0KSqrDfGGj3hmCRiWB/pTJDYcnot/ojEqyiC28JnGUXxIL0H8wQHiKFwI/rmi7j/rMHaes/E6JlVRLohncRzVQZQwyPG78X8vqY5sCCrpDw8PepCtr5fVhM/lQiPfbb/K/AxjOXsxkWSr5TfYFz5hjSKiGoOxXdmOkHy/YFlGduHZo2kW/RVouoiMmhjVsfz3BTsj15D2y7wMxxom1YmaVifZ0JYbIu+E2aOgCeMy9XTIxpxNJR29Dtk+ppqLaja6hscu2Au8AgTARaztQWsQjsJdBjATCLUgDwusYU6+Z4lEGMZd8xuRpiCDHz0/vo7QtCAYtSTp8zjeuLkLurbSJhf/FsTeHdu2gJkPT2Rkp/OYJmn8rYIuJMIvJ9MxsAXBMgSg4TjoCkjrxxTVRTq5L6pQCTWBa0ep3/Ad8QbnOTWc/gasfjED404wrEpP9YAuXEGs8H8htyLCVmA== 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: 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 0e00a84e8e8f..28d8959386e7 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--; }