From patchwork Mon Feb 27 17:36:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13153966 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 2006FC64ED6 for ; Mon, 27 Feb 2023 17:36:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9A896B007E; Mon, 27 Feb 2023 12:36:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B4BC46B0080; Mon, 27 Feb 2023 12:36:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A11F06B0081; Mon, 27 Feb 2023 12:36:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 90D436B007E for ; Mon, 27 Feb 2023 12:36:47 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 444CD40A69 for ; Mon, 27 Feb 2023 17:36:47 +0000 (UTC) X-FDA: 80513776854.20.8AE6E90 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf04.hostedemail.com (Postfix) with ESMTP id 8064340019 for ; Mon, 27 Feb 2023 17:36:45 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Am83ro2Y; spf=pass (imf04.hostedemail.com: domain of 3LOr8YwYKCBsJLI5E27FF7C5.3FDC9ELO-DDBM13B.FI7@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3LOr8YwYKCBsJLI5E27FF7C5.3FDC9ELO-DDBM13B.FI7@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677519405; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=orUi5wHnC++aji9CdkMMFCsYDd1RwNIxCQdLrt+cFY0=; b=Dov5T2X/3139z9CzgdEx2SW6Akzl6uUjUyBV/YbIun9+b740wLLXz0vAQ7Vq067IRpNZK8 z9SItfvagn4FI6Hr81aqNKnUF8SFGh+xmw3rNtHUhzFlR8yrhbuc9ap3pSzuNSSe2LsS9Q Ig4Cm2QR8Gx2b/af8Xr4h9SYiD9Manw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Am83ro2Y; spf=pass (imf04.hostedemail.com: domain of 3LOr8YwYKCBsJLI5E27FF7C5.3FDC9ELO-DDBM13B.FI7@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3LOr8YwYKCBsJLI5E27FF7C5.3FDC9ELO-DDBM13B.FI7@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677519405; a=rsa-sha256; cv=none; b=CNymojD73XzL34lLYTnWuUb9IdJqUvQJlCE8PkAuEvDRaUQJxABhiU4XuI3lchqJ/tKopF +O/MD+c9CxLLo0UwqoevUO8X9YsvJtnMQ/QBBAEm7C7MC24hLtex3lp1gcpih+vXb5slIT 3zW44JQeeKtPqOC9Yg9a4Ukh0b014fw= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-536a5a0b6e3so155578887b3.10 for ; Mon, 27 Feb 2023 09:36:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=orUi5wHnC++aji9CdkMMFCsYDd1RwNIxCQdLrt+cFY0=; b=Am83ro2YmRzZ4VgyIBhDoTNrPllqfw/5UTqTUL7yZCncC06+SMYT4eArFva+POwT7g 6A/0/pFhHTsDxJdieAltqSAe6HtiFFVlFItush+XbcRSxs2FetQjqrV9RzDHQ5xUXxy+ EFVFqHW9b/Vfsu1fjnNuXuTzPWG0kNjoL02ASewZm4aTLFi207WQmvOLdMhmY0rXGsBi NgW5j6vPb4Yb97AotYvdQXAzm4p61g/PV5t8r9ru9nwtbYld830L0Sd8TDb9hbnZaf2S Co5g3ZCxIRR9yw3YwCJpCKA97OC2cOIFxPWxIRbJAgeIMHg6EAO/atx61gUeYr5Wxasb jnNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=orUi5wHnC++aji9CdkMMFCsYDd1RwNIxCQdLrt+cFY0=; b=3dwbYgVG9uzO33qfGrgn7tcSVKWGfp+EmHBsiCO3+fDpGAA5Ibl6XNY6UP0fqZL7xd QJtN2/Kdu7csWphzysU30T5LSwVrfSg3AOzaXQgmOHef4dVqEMBJk4Jnj1U78eBqhJCW JDWQPMdfP4jU2/zOzAUvLgxS7DuwS5AE970pybSa7euLaTMsoj0KsOm2SdT+KXcooWPp QYiGEp4t7J6on/I0Qt8xUWknHyfAJfpLgTpvBwip44KV40UwK22ADpNPFjUXM0dbYIh3 d944aBvS4+MJIOKQbGq8LRsBaOHCnKP3mRGW8aXPrtrBO+0AuAo2vW4eRkc9dFKi6KcQ t2og== X-Gm-Message-State: AO0yUKWAEubdi51T+dTcfAcoU7Bi+ecjVQP68P72/Nh441UTyhVheMcL x0VmnSua4WbnrVY1p7xQpqg/9jQocM8= X-Google-Smtp-Source: AK7set8ivfKmLT2u3vpwWqjPXs4Ue9yElb1Co2/gr63/ZMmCdo5ef9MT+bBbe/btFlir1Y+dX6RcjVs74cU= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:e1f6:21d1:eead:3897]) (user=surenb job=sendgmr) by 2002:a5b:ecb:0:b0:a03:da3f:3e68 with SMTP id a11-20020a5b0ecb000000b00a03da3f3e68mr9395474ybs.12.1677519404853; Mon, 27 Feb 2023 09:36:44 -0800 (PST) Date: Mon, 27 Feb 2023 09:36:02 -0800 In-Reply-To: <20230227173632.3292573-1-surenb@google.com> Mime-Version: 1.0 References: <20230227173632.3292573-1-surenb@google.com> X-Mailer: git-send-email 2.39.2.722.g9855ee24e9-goog Message-ID: <20230227173632.3292573-4-surenb@google.com> Subject: [PATCH v4 03/33] maple_tree: Fix freeing of nodes in rcu mode From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: michel@lespinasse.org, jglisse@google.com, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, mgorman@techsingularity.net, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, peterz@infradead.org, ldufour@linux.ibm.com, paulmck@kernel.org, mingo@redhat.com, will@kernel.org, luto@kernel.org, songliubraving@fb.com, peterx@redhat.com, david@redhat.com, dhowells@redhat.com, hughd@google.com, bigeasy@linutronix.de, kent.overstreet@linux.dev, punit.agrawal@bytedance.com, lstoakes@gmail.com, peterjung1337@gmail.com, rientjes@google.com, chriscli@google.com, axelrasmussen@google.com, joelaf@google.com, minchan@google.com, rppt@kernel.org, jannh@google.com, shakeelb@google.com, tatashin@google.com, edumazet@google.com, gthelen@google.com, gurua@google.com, arjunroy@google.com, soheil@google.com, leewalsh@google.com, posk@google.com, michalechner92@googlemail.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, Liam Howlett , Suren Baghdasaryan X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8064340019 X-Stat-Signature: t6nbufx7c1s5ssebc644ofakthy6e6iy X-Rspam-User: X-HE-Tag: 1677519405-427106 X-HE-Meta: U2FsdGVkX1+7bRyRLW6b3PKvgKvckWSADbVJyjnNGcI7i+D8MqLd89U0qmfnioa34NT+ArI8fZrYo/u2ocFW95OYn5U1xIpUw1E3tDNay0t5kpSu1XhYBBdl0pYxwUKlhAc3Glm1/r+FYoZsFzw1ced4UGIdpdeqyYVktxtsQXS38kgL1XEcPVy8QkknMC78iX8iPq9y/eaHcnOw0KGhgi+UtMzWddY9BwngmJqvRMx2EbRvDpqXlwfDMGp9iz4PcEMPvp/6GmQZXooOH4iP44l3lrICpEtwJTeY0vjvklz51gFXGfm3EcNbLVYC6Ot6rJtqqyyy/ZdNSWjuYRF+PmEGbaXHnMsD2Hp1/6TUM6e2v13+IvNCLIhYvh7tLDNHbSCsQXX+9iGPzBLQVuKStmxkApnd/oM8r2Z0NqNS572vRUH1deR99xz9gQlaXX0DnKKyXAapTXTifZK272Do7EMf4Qy6SUmM0Wakxl6syzmAmt81kSDVqvV2SlMlqtS4XGlhzr5MIN8Ih1bOhYxktD2yHifvAyuukpHLnOaUVsasYYA2LQtdRd5Zs1hP5kz8wzHO8InGTMIoK317FHJZbVWjxsJ2cwk+eph3l7w5YM1mGRJalL7H9NYQvBfhb289U2FUVPBEEA+ua92GWOv+CSI80n+oTis33DulMtc0d3EyR9SFqccN2SLtgVZXkIeF3+vAIG8vd3Dg3e9RqZp3KnExwTD9N9VgLJa4ZpEC5gLdNmFvC8C9oIDL94Zo70oCi0YhqBd/0/opgNfRpCj57tNH0sLtqQSUnbfGdw/Au/CpzsQKeSG0fMLZWHYsqbFxjD3Tfm9w6ii36P8UkEhnkuYoo0u3kimvbLgAe/utt0vnu/E74+XbswWg6R5bxlALQrgyYH1sB5VTJdifwJbfV13Q6mBNb20PlIhavy4lWxYe86bV0M/WQM3hQtwLb5VtG9gM3PGtBdzXbK6XGn+ FG2edh2D 7hKxUsLSeb6OMSc+S0KWMkURx/+wIyR2g78X7IDZJ2Lazr5KWIWWcLQCqy1QxxlNr2HkPhv6aNEo1v2YaMUSdcYD7b0DFCDwxTl9piuEF7vnYLLWQVVHTESf/B1pgNk1wmMWNEPksbdpoQkp+31iTauvknbRGEe7vRol0YuCIh8wlQv2wYsJI6yM0GgebzYA9SYUWY9JoQW6l0zUEXBzXbJ7B+UCLAhg4NeD6LCcFWcEr6tfGEJyBKTsDo+ahEh/P0O8AImW4s1tJr/aORj8srSXdlvCSY0OX099VDTmeklIRjd2S+tkbWMGwtUUcsDBhgigdvW/Se+l9fQ5rQfszPabxwSsnahAgzYMU+cKi+GPVODuexMkf29Kn9IeT2wz3TPO0KQCs/j9jSM6YxFtGXwTrFvsdl7Fef8aiQMkt/sYJY39oU458yDVXMJzCJo6cnG21woTArMDy8o99C4H/aU/kDy+xy+Ww5VFPWvLdB9Cgfp4ipdepkLzfU4IJNbT37CNOKHeDFgvafNOb3S1L89sc6+QCnrmkEeiUihzn66bvkH3Rxfh0ap7Y2NSigWiciSXw3xXjHlU65VZQJMGVsE5mKEykND0VW0Jw+iGjBUrY6IbXc0vLeK1W9KiB8E35nwaYvnQ5KHlHCMTy/J9Zs2sdccr9MsrT/4vKRBiel2DmAuRe4WdgnofpUxFX9a6hYq+o 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: From: Liam Howlett The walk to destroy the nodes was not always setting the node type and would result in a destroy method potentially using the values as nodes. Avoid this by setting the correct node types. This is necessary for the RCU mode of the maple tree. Fixes: 54a611b60590 ("Maple Tree: add new data structure") Signed-off-by: Liam Howlett Signed-off-by: Suren Baghdasaryan --- lib/maple_tree.c | 73 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 089cd76ec379..44d6ce30b28e 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -902,6 +902,44 @@ static inline void ma_set_meta(struct maple_node *mn, enum maple_type mt, meta->end = end; } +/* + * mas_clear_meta() - clear the metadata information of a node, if it exists + * @mas: The maple state + * @mn: The maple node + * @mt: The maple node type + * @offset: The offset of the highest sub-gap in this node. + * @end: The end of the data in this node. + */ +static inline void mas_clear_meta(struct ma_state *mas, struct maple_node *mn, + enum maple_type mt) +{ + struct maple_metadata *meta; + unsigned long *pivots; + void __rcu **slots; + void *next; + + switch (mt) { + case maple_range_64: + pivots = mn->mr64.pivot; + if (unlikely(pivots[MAPLE_RANGE64_SLOTS - 2])) { + slots = mn->mr64.slot; + next = mas_slot_locked(mas, slots, + MAPLE_RANGE64_SLOTS - 1); + if (unlikely((mte_to_node(next) && mte_node_type(next)))) + return; /* The last slot is a node, no metadata */ + } + fallthrough; + case maple_arange_64: + meta = ma_meta(mn, mt); + break; + default: + return; + } + + meta->gap = 0; + meta->end = 0; +} + /* * ma_meta_end() - Get the data end of a node from the metadata * @mn: The maple node @@ -5455,20 +5493,22 @@ static inline int mas_rev_alloc(struct ma_state *mas, unsigned long min, * mas_dead_leaves() - Mark all leaves of a node as dead. * @mas: The maple state * @slots: Pointer to the slot array + * @type: The maple node type * * Must hold the write lock. * * Return: The number of leaves marked as dead. */ static inline -unsigned char mas_dead_leaves(struct ma_state *mas, void __rcu **slots) +unsigned char mas_dead_leaves(struct ma_state *mas, void __rcu **slots, + enum maple_type mt) { struct maple_node *node; enum maple_type type; void *entry; int offset; - for (offset = 0; offset < mt_slot_count(mas->node); offset++) { + for (offset = 0; offset < mt_slots[mt]; offset++) { entry = mas_slot_locked(mas, slots, offset); type = mte_node_type(entry); node = mte_to_node(entry); @@ -5487,14 +5527,13 @@ unsigned char mas_dead_leaves(struct ma_state *mas, void __rcu **slots) static void __rcu **mas_dead_walk(struct ma_state *mas, unsigned char offset) { - struct maple_node *node, *next; + struct maple_node *next; void __rcu **slots = NULL; next = mas_mn(mas); do { - mas->node = ma_enode_ptr(next); - node = mas_mn(mas); - slots = ma_slots(node, node->type); + mas->node = mt_mk_node(next, next->type); + slots = ma_slots(next, next->type); next = mas_slot_locked(mas, slots, offset); offset = 0; } while (!ma_is_leaf(next->type)); @@ -5558,11 +5597,14 @@ static inline void __rcu **mas_destroy_descend(struct ma_state *mas, node = mas_mn(mas); slots = ma_slots(node, mte_node_type(mas->node)); next = mas_slot_locked(mas, slots, 0); - if ((mte_dead_node(next))) + if ((mte_dead_node(next))) { + mte_to_node(next)->type = mte_node_type(next); next = mas_slot_locked(mas, slots, 1); + } mte_set_node_dead(mas->node); node->type = mte_node_type(mas->node); + mas_clear_meta(mas, node, node->type); node->piv_parent = prev; node->parent_slot = offset; offset = 0; @@ -5582,13 +5624,18 @@ static void mt_destroy_walk(struct maple_enode *enode, unsigned char ma_flags, MA_STATE(mas, &mt, 0, 0); - if (mte_is_leaf(enode)) + mas.node = enode; + if (mte_is_leaf(enode)) { + node->type = mte_node_type(enode); goto free_leaf; + } + ma_flags &= ~MT_FLAGS_LOCK_MASK; mt_init_flags(&mt, ma_flags); mas_lock(&mas); - mas.node = start = enode; + mte_to_node(enode)->ma_flags = ma_flags; + start = enode; slots = mas_destroy_descend(&mas, start, 0); node = mas_mn(&mas); do { @@ -5596,7 +5643,8 @@ static void mt_destroy_walk(struct maple_enode *enode, unsigned char ma_flags, unsigned char offset; struct maple_enode *parent, *tmp; - node->slot_len = mas_dead_leaves(&mas, slots); + node->type = mte_node_type(mas.node); + node->slot_len = mas_dead_leaves(&mas, slots, node->type); if (free) mt_free_bulk(node->slot_len, slots); offset = node->parent_slot + 1; @@ -5620,7 +5668,8 @@ static void mt_destroy_walk(struct maple_enode *enode, unsigned char ma_flags, } while (start != mas.node); node = mas_mn(&mas); - node->slot_len = mas_dead_leaves(&mas, slots); + node->type = mte_node_type(mas.node); + node->slot_len = mas_dead_leaves(&mas, slots, node->type); if (free) mt_free_bulk(node->slot_len, slots); @@ -5630,6 +5679,8 @@ static void mt_destroy_walk(struct maple_enode *enode, unsigned char ma_flags, free_leaf: if (free) mt_free_rcu(&node->rcu); + else + mas_clear_meta(&mas, node, node->type); } /*