From patchwork Thu Feb 16 05:17:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13142496 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 2AE3DC61DA4 for ; Thu, 16 Feb 2023 05:18:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCCF46B007B; Thu, 16 Feb 2023 00:18:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B7DF76B007D; Thu, 16 Feb 2023 00:18:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1D666B007E; Thu, 16 Feb 2023 00:18:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 9098C6B007B for ; Thu, 16 Feb 2023 00:18:04 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5788C120B37 for ; Thu, 16 Feb 2023 05:18:04 +0000 (UTC) X-FDA: 80471998488.26.086F9DF Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf06.hostedemail.com (Postfix) with ESMTP id 730D3180004 for ; Thu, 16 Feb 2023 05:18:02 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JaAJMQvk; spf=pass (imf06.hostedemail.com: domain of 3ibztYwYKCN4SURENBGOOGLE.COMLINUX-MMKVACK.ORG@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3ibztYwYKCN4SURENBGOOGLE.COMLINUX-MMKVACK.ORG@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=1676524682; 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=UHRaAOWRO45il7vCWYolP2vMSHNJY77rtpcEDPLreFo=; b=ae/mMLC6S3Ghg+RqXs0kDofxV332ul23JULr0ncp8t/UjsuexjQsZbMyIVd/4TzTElaj52 kF3Oq/FshT8Fef6jfGi3zyGfijmCoS2yhfj023pKtb+AEMfq27MDLvo0R6cVTnhQE/L6am EMOTkdOy8rIGNOPVCHh3xT+U72hk1MA= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=JaAJMQvk; spf=pass (imf06.hostedemail.com: domain of 3ibztYwYKCN4SURENBGOOGLE.COMLINUX-MMKVACK.ORG@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3ibztYwYKCN4SURENBGOOGLE.COMLINUX-MMKVACK.ORG@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676524682; a=rsa-sha256; cv=none; b=U12WXvFaG6ESZ2LpY/uAaKrswqD8QgJTjY7EF2JEr258o2POzN8IuFf/Toir13gIH8+DrK Bxb3+f9fImKEXSTkNtVLmWPowLjcKnZdWit+gHgZo0U74v4oyoKeHW2wSTe4PKLHgpfGPa VLWDyZklM5mCCd33jOZ0GO+iXaMh72w= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-52f233aff21so8590567b3.7 for ; Wed, 15 Feb 2023 21:18:02 -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=UHRaAOWRO45il7vCWYolP2vMSHNJY77rtpcEDPLreFo=; b=JaAJMQvkQYkAsRG/T0d+zxwkrl7mq+q9FZsokrXfiBXR+R1ZXxx2vVNR2lMSqf4OC/ WN5L5m6K8l41JtRKI2HZbVfjAY+cjnkF1BJGHx4Vp8UHSVK5UGOhTfSvkmRDjsxq+IrD 02V2mM9EdjYNQiXsOwUhDaiCYn5z8ljJQUJeFnF2XY5CF0WF7YFz2opQhOGyVfb59slI zMkZhBxatB6Jt2s9icMmk1QAWL7dqweRI7j0fEknZ3XaTRcFBLrS6UTE7S7Q4BJqI8Vo VXsm9/T42jqn+e5iri473tsxrbcsgusYZ9oNJzgxHuxj6F/D7b6ACgioO/upEa2Rro7t uyJg== 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=UHRaAOWRO45il7vCWYolP2vMSHNJY77rtpcEDPLreFo=; b=RBsPB0OnaI8r46s8WwyaFpCAAW3QjDMtR7BZBvUfRuZKYMEFr/0PUB/FQQU5IH5J69 eyswE8bNugdNNXwOT0bxHopoKmjWZePh2MAhpIhmK+9qc+6k4UkeBA6a/krVo4VvuQwv VDmphEOO3nKVYUG6Nmd+6dKigNFELrM4Aogf6Asw/0x0YjP1YQF3KPOlMcx1CIR3yC9O tql6u/8e6pwC+GN5iNgi0StmYXSrZXHAMXTp6eaATN9Y7yv2UUwYEYKWc1D95m8fDKKM tJ6ylBGG01ygz5Cn8VzShL9UK8wLgVXG9jiL1F/Hj7ja6dld27qXaidFYPBmBzjOnccc ILNA== X-Gm-Message-State: AO0yUKUTcoztn0PaqwNLxiPgSjdwjVECNR5tVw6UNpcAwb/d5fCy9Ply jEtBAxKkLGDRLVuMP+gzS+pvtYCpQ08= X-Google-Smtp-Source: AK7set8Uq/nZgRLZFfJuxWYQ4ij1Dw1PY56gBuOAhM9aSZ73J6nsbhc6qz5TmHaa+yP435YL3FPEkHcMzr0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:f781:d5ed:1806:6ebb]) (user=surenb job=sendgmr) by 2002:a05:6902:10f:b0:855:fa17:4f5f with SMTP id o15-20020a056902010f00b00855fa174f5fmr80ybh.1.1676524681354; Wed, 15 Feb 2023 21:18:01 -0800 (PST) Date: Wed, 15 Feb 2023 21:17:18 -0800 In-Reply-To: <20230216051750.3125598-1-surenb@google.com> Mime-Version: 1.0 References: <20230216051750.3125598-1-surenb@google.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog Message-ID: <20230216051750.3125598-4-surenb@google.com> Subject: [PATCH v3 03/35] 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-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 730D3180004 X-Stat-Signature: 538ax88de3xkccy7g7bf4w5zuwjfxzcc X-HE-Tag: 1676524682-374857 X-HE-Meta: U2FsdGVkX1/Iw9XXc6p3ZqPizH+CGj7mUiJtsJUF3aZuNyZNE0PsaW+AefknohmpVvWVYMW3jlSx0usP78Owg2MJDKMB8bcNkZjZkvIwlXlFdFZbFJnnKoM5mUAytSuxIynkeOSKq5zDm3rNeskcpwRlVTdHs5k0W1rpV0OeeJo341u3FaYOKaTHGe2qJAEUrc+/AhWyUR5etnMeGdcL3e1p+SfUhIh4FxPpCh+SHduFRujY3gpI8lbzdBDgI8PnjeZ/LBOpnvJKFOnQjAEYUznc1Ot6KehYdGjcOR2Na8LMiFkDURkWBtJSrfqv8xPJCoiJgPxXpYlnc1GKg1NjnpKO/etaPRS5403gsdOiWa7GuZ7PlpdzHVz5otZaBdS4YSVg/0Vksx04gdoEh/ZZH4e0ZPes9dmeTdz0WvKRSGDhTdxTTyRalPmQsbZj19hcb5EhQuhXny5PApLNiF38dyWLk8fO6pbbnQr645kJg0ZDlBK1gx2sWwcIZf++so75v52Q4wGQ1W032/cVEQUnGh16D6il8CWDvO9SNfgQcpMNrxPkPQadvRzEaMPzeBhtK3649EvvPednOWvLdf85Jl4EM/PC8bKcNGCcx+X9weY3rGnUZuKim6JUvOdJG51iSsDqx25Gz9OT4y9UBNsnzmL4TbejuJ4bp1FbYyo1zOMCZcgvijMt/Ei9BRYSiDtOuLJGMN5ldBf5KZCuw4VS8a+P3om278lAC2RfRxvvUXroXADa8jIAeOikl9zfHIfpOXsAzae636wRqLyDz0fybcFkxROjWxVs+hrbfk1keovGMv5tK/vPTLpiXdyUbWRIIWS0xuw0fZ647tKJCMfekJ8hCdTNXpxy/d7P6Vxv8DHX4sSVEwplfHVlOYOJzIR6lT3IkARKC414YVanGQMTD/3N244L/f7oBXeyZQ37nUnBRt3kJdaWBfiGX4IbxjbYis5AmO+ZRnEq8EnwbyK M5S7dsFb KqdU3Cpdw4qrfsPMp9u5oJx4/fL1zTuzLAkpTOyPdy0BIYPa6T3+nZS2ICa6qD/hNpr+DMLFGOQzIrWXFaq429Gn7+64VJBYkIsoVMVB7z6Ygmia1WNa+7NSfKfJV7ETb0LJWa0mK3mtHYpdIRq2/VUG0v8a8PuM6n2kkD1eOzUJgtP3hWjduTBdwjJeq8AmnlZY8QWULcBv2oF7Qy9znQ9knrxE89lzskzK8CYf04Ur5LIyRztAEdUwp3Arm7lcSziO29Lq0C9qtqeTlI+FCZOjUpuP1C0FFVCIb9xPxZGbUQESGcOG1ChAksML66xGv3T9tu8l0vDIiuQys+UT9fbGK0mh9vJg6rJeScqV//vd+XVoKIeeacpSdVTAWpC9C07S75KE87oCaO9dArtViXufMKP+GYRC4i/6q5QeyOUHDlj3Rh/ie1iH9KnApooq+9Kg0fVwvqbg7muMLy3v35iAi0+zRIf7Sey/LTl2+DbVN9ujQEoU4eAEx49BtPVmvJ2me4j0QoHC54kTiYcstpcnbyGVstcc/Lx7ZrTMZvn3cGgwM5fKmPgVomy3msAZx2Zs7mNbrF3oLKVOEo/JGoukWq1C0VA2PNHgPTqWaqe1Vfh7SgSieNrFGynB91ecYzOTBBWl4RmV6HUFSKw1q7vXBUvujG4HcklTtCnih+vUVvfz9CKDtmCdkAx15Ntp8cCpd 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); } /*