From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,mason@kernel.org,ljs@kernel.org,
andrewjballance@gmail.com,aliceryhl@google.com,liam@infradead.org,
akpm@linux-foundation.org
Subject: [merged mm-hotfixes-stable] maple_tree-test-emptying-tree-while-rcu-reading.patch removed from -mm tree
Date: Mon, 09 Nov 2026 22:45:46 -0800 [thread overview]
Message-ID: <20261110064546.8A3971F0089F@smtp.kernel.org> (raw)
The quilt patch titled
Subject: maple_tree: test emptying tree while RCU reading
has been removed from the -mm tree. Its filename was
maple_tree-test-emptying-tree-while-rcu-reading.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Liam R. Howlett (Google)" <liam@infradead.org>
Subject: maple_tree: test emptying tree while RCU reading
Date: Mon, 02 Nov 2026 21:07:23 -0500
Add a test case for the rcu reader being restarted by emptying the tree.
A reverse walk from index 0 must not return the new root entry.
Link: https://lore.kernel.org/20261103020724.2614498-3-liam@infradead.org
Signed-off-by: Liam R. Howlett (Google) <liam@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Chris Mason <mason@kernel.org>
Cc: Alice Ryhl <aliceryhl@google.com>
Cc: Andrew Ballance <andrewjballance@gmail.com>
---
lib/test_maple_tree.c | 165 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 165 insertions(+)
--- a/lib/test_maple_tree.c~maple_tree-test-emptying-tree-while-rcu-reading
+++ a/lib/test_maple_tree.c
@@ -3740,6 +3740,170 @@ static noinline void __init check_range6
rcu_barrier();
}
+/*
+ * A reader that restarts after its leaf died may find a tree without nodes:
+ * emptied, or emptied and then given a single entry at 0. Each case starts
+ * from a tree with nodes, built by check_seq(). The stores run while the
+ * reader holds rcu_read_lock, so they use GFP_ATOMIC.
+ */
+static noinline void __init check_restart_no_node(struct maple_tree *mt)
+{
+ void *ptr = xa_mk_value(1234);
+ void *entry;
+ MA_STATE(mas, mt, 0, 0);
+
+ MT_BUG_ON(mt, !mtree_empty(mt));
+ mt_set_non_kernel(99999);
+
+ /* find: the tree is emptied */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, 0);
+ entry = mas_find(&mas, ULONG_MAX);
+ MT_BUG_ON(mt, entry != xa_mk_value(0));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ entry = mas_find(&mas, ULONG_MAX);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_none);
+ MT_BUG_ON(mt, mas.index != 0);
+ MT_BUG_ON(mt, mas.last != ULONG_MAX);
+ entry = mas_find(&mas, ULONG_MAX);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_none);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+
+ /* next: the tree is emptied */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, 0);
+ entry = mas_find(&mas, ULONG_MAX);
+ MT_BUG_ON(mt, entry != xa_mk_value(0));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ entry = mas_next(&mas, ULONG_MAX);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_none);
+ MT_BUG_ON(mt, mas.index != 0);
+ MT_BUG_ON(mt, mas.last != ULONG_MAX);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+
+ /* find: the tree is emptied, then holds one entry at 0 */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, 0);
+ entry = mas_find(&mas, ULONG_MAX);
+ MT_BUG_ON(mt, entry != xa_mk_value(0));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ MT_BUG_ON(mt, mtree_store(mt, 0, ptr, GFP_ATOMIC));
+ entry = mas_find(&mas, ULONG_MAX);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_none);
+ MT_BUG_ON(mt, mas.index != 1);
+ MT_BUG_ON(mt, mas.last != ULONG_MAX);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+
+ /* find_rev: the tree is emptied */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, ULONG_MAX);
+ entry = mas_find_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != xa_mk_value(100));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ entry = mas_find_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_none);
+ MT_BUG_ON(mt, mas.index != 0);
+ MT_BUG_ON(mt, mas.last != ULONG_MAX);
+ entry = mas_find_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_none);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+
+ /* prev: the tree is emptied, then holds one entry at 0 */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, ULONG_MAX);
+ entry = mas_find_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != xa_mk_value(100));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ MT_BUG_ON(mt, mtree_store(mt, 0, ptr, GFP_ATOMIC));
+ entry = mas_prev(&mas, 0);
+ MT_BUG_ON(mt, entry != ptr);
+ MT_BUG_ON(mt, mas.status != ma_root);
+ MT_BUG_ON(mt, mas.index != 0);
+ MT_BUG_ON(mt, mas.last != 0);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+
+ /* find_rev: the entry at 0 is below the minimum */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, ULONG_MAX);
+ entry = mas_find_rev(&mas, 1);
+ MT_BUG_ON(mt, entry != xa_mk_value(100));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ MT_BUG_ON(mt, mtree_store(mt, 0, ptr, GFP_ATOMIC));
+ entry = mas_find_rev(&mas, 1);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_root);
+ MT_BUG_ON(mt, mas.index != 0);
+ MT_BUG_ON(mt, mas.last != 0);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+
+ /* find_rev: the reader is at 0 when the tree gets one entry at 0 */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, 0);
+ entry = mas_find_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != xa_mk_value(0));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ MT_BUG_ON(mt, mtree_store(mt, 0, ptr, GFP_ATOMIC));
+ entry = mas_find_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_root);
+ MT_BUG_ON(mt, mas.index != 0);
+ MT_BUG_ON(mt, mas.last != 0);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+
+ /* find_range_rev: the reader is at 0 when the tree gets one entry at 0 */
+ mt_init_flags(mt, MT_FLAGS_USE_RCU);
+ check_seq(mt, 100, false);
+ rcu_read_lock();
+ mas_set(&mas, 0);
+ entry = mas_find_range_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != xa_mk_value(0));
+ MT_BUG_ON(mt, mtree_store_range(mt, 0, ULONG_MAX, NULL, GFP_ATOMIC));
+ MT_BUG_ON(mt, mtree_store(mt, 0, ptr, GFP_ATOMIC));
+ entry = mas_find_range_rev(&mas, 0);
+ MT_BUG_ON(mt, entry != NULL);
+ MT_BUG_ON(mt, mas.status != ma_root);
+ MT_BUG_ON(mt, mas.index != 0);
+ MT_BUG_ON(mt, mas.last != 0);
+ rcu_read_unlock();
+ mtree_destroy(mt);
+ rcu_barrier();
+ mt_set_non_kernel(0);
+}
+
static DEFINE_MTREE(tree);
static int __init maple_tree_seed(void)
{
@@ -4031,6 +4195,7 @@ static int __init maple_tree_seed(void)
check_range64_in_rcu(&tree);
+ check_restart_no_node(&tree);
#if defined(BENCH)
skip:
_
Patches currently in -mm which might be from liam@infradead.org are
maple_tree-update-internal-warning-and-bug_on-code.patch
reply other threads:[~2026-11-10 6:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261110064546.8A3971F0089F@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=aliceryhl@google.com \
--cc=andrewjballance@gmail.com \
--cc=liam@infradead.org \
--cc=ljs@kernel.org \
--cc=mason@kernel.org \
--cc=mm-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.