mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tamir Duberstein <tamird@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
	 Matthew Wilcox <willy@infradead.org>,
	 Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	 linux-mm@kvack.org, Tamir Duberstein <tamird@gmail.com>
Subject: [PATCH] XArray: revert (unintentional?) behavior change
Date: Fri, 21 Mar 2025 22:17:08 -0400	[thread overview]
Message-ID: <20250321-xarray-fix-destroy-v1-1-7154bed93e84@gmail.com> (raw)

Partially revert commit 6684aba0780d ("XArray: Add extra debugging check
to xas_lock and friends"), fixing test failures in check_xa_alloc.

Fixes: 6684aba0780d ("XArray: Add extra debugging check to xas_lock and friends")
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
---
Before this change:

  BUG at xa_alloc_index:57
  CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.14.0-rc7-next-20250321-00001-gf45bb5d4b2e8 #854 NONE
  Hardware name: linux,dummy-virt (DT)
  Call trace:
   show_stack+0x18/0x24 (C)
   dump_stack_lvl+0x40/0x84
   dump_stack+0x18/0x24
   xa_alloc_index+0x118/0x15c
   check_xa_alloc_1+0x114/0x6e8
   check_xa_alloc+0x24/0x78
   xarray_checks+0x58/0xd4
   do_one_initcall+0x74/0x168
   do_initcall_level+0x8c/0xac
   do_initcalls+0x54/0x94
   do_basic_setup+0x18/0x24
   kernel_init_freeable+0xb8/0x120
   kernel_init+0x20/0x198
   ret_from_fork+0x10/0x20
  BUG at xa_alloc_index:57
  CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.14.0-rc7-next-20250321-00001-gf45bb5d4b2e8 #854 NONE
  Hardware name: linux,dummy-virt (DT)
  Call trace:
   show_stack+0x18/0x24 (C)
   dump_stack_lvl+0x40/0x84
   dump_stack+0x18/0x24
   xa_alloc_index+0x118/0x15c
   check_xa_alloc_1+0x120/0x6e8
   check_xa_alloc+0x24/0x78
   xarray_checks+0x58/0xd4
   do_one_initcall+0x74/0x168
   do_initcall_level+0x8c/0xac
   do_initcalls+0x54/0x94
   do_basic_setup+0x18/0x24
   kernel_init_freeable+0xb8/0x120
   kernel_init+0x20/0x198
   ret_from_fork+0x10/0x20
  BUG at xa_erase_index:62
  CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.14.0-rc7-next-20250321-00001-gf45bb5d4b2e8 #854 NONE
  Hardware name: linux,dummy-virt (DT)
  Call trace:
   show_stack+0x18/0x24 (C)
   dump_stack_lvl+0x40/0x84
   dump_stack+0x18/0x24
   xa_erase_index+0xb0/0xd8
   check_xa_alloc_1+0x12c/0x6e8
   check_xa_alloc+0x24/0x78
   xarray_checks+0x58/0xd4
   do_one_initcall+0x74/0x168
   do_initcall_level+0x8c/0xac
   do_initcalls+0x54/0x94
   do_basic_setup+0x18/0x24
   kernel_init_freeable+0xb8/0x120
   kernel_init+0x20/0x198
   ret_from_fork+0x10/0x20
  BUG at xa_erase_index:62
  CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.14.0-rc7-next-20250321-00001-gf45bb5d4b2e8 #854 NONE
  Hardware name: linux,dummy-virt (DT)
  Call trace:
   show_stack+0x18/0x24 (C)
   dump_stack_lvl+0x40/0x84
   dump_stack+0x18/0x24
   xa_erase_index+0xb0/0xd8
   check_xa_alloc_1+0x160/0x6e8
   check_xa_alloc+0x24/0x78
   xarray_checks+0x58/0xd4
   do_one_initcall+0x74/0x168
   do_initcall_level+0x8c/0xac
   do_initcalls+0x54/0x94
   do_basic_setup+0x18/0x24
   kernel_init_freeable+0xb8/0x120
   kernel_init+0x20/0x198
   ret_from_fork+0x10/0x20
  XArray: 6782365 of 6782369 tests passed
---
 lib/xarray.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/xarray.c b/lib/xarray.c
index 261814d170d8..638c4c90e5b2 100644
--- a/lib/xarray.c
+++ b/lib/xarray.c
@@ -2380,6 +2380,7 @@ void xa_destroy(struct xarray *xa)
 	unsigned long flags;
 	void *entry;
 
+	xas.xa_node = NULL;
 	xas_lock_irqsave(&xas, flags);
 	entry = xa_head_locked(xa);
 	RCU_INIT_POINTER(xa->xa_head, NULL);

---
base-commit: 9388ec571cb1adba59d1cded2300eeb11827679c
change-id: 20250321-xarray-fix-destroy-274090a7a18b

Best regards,
-- 
Tamir Duberstein <tamird@gmail.com>


             reply	other threads:[~2025-03-22  2:17 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-22  2:17 Tamir Duberstein [this message]
2025-03-22  4:37 ` Andrew Morton
2025-03-22 10:34   ` Stephen Rothwell
2025-03-22 10:37   ` Christophe Leroy
2025-03-22 16:21   ` Pedro Falcato
2025-03-22 21:13 ` Matthew Wilcox
2025-03-24 14:45   ` Tamir Duberstein

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=20250321-xarray-fix-destroy-v1-1-7154bed93e84@gmail.com \
    --to=tamird@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=sfr@canb.auug.org.au \
    --cc=willy@infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®