mm/vmalloc: Add a safer version of find_vm_area() for debug
Subsystems (4)
PATCH 1/2 mm/vmalloc: Add a safer version of find_vm_area() for debug
It is unsafe to dump vmalloc area information when trying to do so from some contexts. Add a safer trylock version of the same function to do a best-effort VMA finding and use it from vmalloc_dump_obj().
--- mm/vmalloc.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
mm/vmalloc.c +34 -1
@@ -1865,6 +1865,18 @@ struct vmap_area *find_vmap_area(unsigned long addr)return va; } +static struct vmap_area *find_vmap_area_trylock (unsigned long addr) +{ +struct vmap_area *va; + +if (!spin_trylock (&vmap_area_lock)) +return NULL ; + va =__find_vmap_area (addr, &vmap_area_root); +spin_unlock (&vmap_area_lock); + +return va; +} +static struct vmap_area *find_unlink_vmap_area (unsigned long addr) {struct vmap_area *va;
@@ -2671,6 +2683,27 @@ struct vm_struct *find_vm_area(const void *addr)return va->vm; } +/** +* try_to_find_vm_area - find a continuous kernel virtual area +* @addr: base address +* +* This function is the same as find_vm_area() except that it is +* safe to call if vmap_area_lock is already held and returns NULL +* if it is. See comments in find_vmap_area() for other details. +* +* Return: the area descriptor on success or %NULL on failure. +*/ +static struct vm_struct *try_to_find_vm_area (const void *addr) +{ +struct vmap_area *va; + + va =find_vmap_area_trylock ((unsigned long )addr); +if (!va) +return NULL ; + +return va->vm; +} +/** * remove_vm_area - find and remove a continuous kernel virtual area * @addr: base address
@@ -4277,7 +4310,7 @@ bool vmalloc_dump_obj(void *object)struct vm_struct *vm;void *objp = (void *)PAGE_ALIGN ((unsigned long )object); - vm =find_vm_area (objp); + vm =try_to_find_vm_area (objp);if (!vm)return false; pr_cont(" %u-page vmalloc region starting at %#lx allocated at %pS\n",
Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog
PATCH 2/2 rcu: Dump vmalloc memory info safely
From: Zqiang <[email protected]>
Currently, for double invoke call_rcu(), will dump rcu_head objects memory info, if the objects is not allocated from the slab allocator, the vmalloc_dump_obj() will be invoke and the vmap_area_lock spinlock need to be held, since the call_rcu() can be invoked in interrupt context, therefore, there is a possibility of spinlock deadlock scenarios.
And in Preempt-RT kernel, the rcutorture test also trigger the following lockdep warning:
BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48
in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 1, name: swapper/0preempt_count: 1, expected: 0
RCU nest depth: 1, expected: 1
3 locks held by swapper/0/1:
#0: ffffffffb534ee80 (fullstop_mutex){+.+.}-{4:4}, at: torture_init_begin+0x24/0xa0 #1: ffffffffb5307940 (rcu_read_lock){....}-{1:3}, at: rcu_torture_init+0x1ec7/0x2370 #2: ffffffffb536af40 (vmap_area_lock){+.+.}-{3:3}, at: find_vmap_area+0x1f/0x70
irq event stamp: 565512 hardirqs last enabled at (565511): [<ffffffffb379b138>] __call_rcu_common+0x218/0x940 hardirqs last disabled at (565512): [<ffffffffb5804262>] rcu_torture_init+0x20b2/0x2370 softirqs last enabled at (399112): [<ffffffffb36b2586>] __local_bh_enable_ip+0x126/0x170 softirqs last disabled at (399106): [<ffffffffb43fef59>] inet_register_protosw+0x9/0x1d0 Preemption disabled at: [<ffffffffb58040c3>] rcu_torture_init+0x1f13/0x2370 CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 6.5.0-rc4-rt2-yocto-preempt-rt+ #15 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.2-0-gea1b7a073390-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x68/0xb0 dump_stack+0x14/0x20 __might_resched+0x1aa/0x280 ? __pfx_rcu_torture_err_cb+0x10/0x10 rt_spin_lock+0x53/0x130 ? find_vmap_area+0x1f/0x70 find_vmap_area+0x1f/0x70 vmalloc_dump_obj+0x20/0x60 mem_dump_obj+0x22/0x90 __call_rcu_common+0x5bf/0x940 ? debug_smp_processor_id+0x1b/0x30 call_rcu_hurry+0x14/0x20 rcu_torture_init+0x1f82/0x2370 ? __pfx_rcu_torture_leak_cb+0x10/0x10 ? __pfx_rcu_torture_leak_cb+0x10/0x10 ? __pfx_rcu_torture_init+0x10/0x10 do_one_initcall+0x6c/0x300 ? debug_smp_processor_id+0x1b/0x30 kernel_init_freeable+0x2b9/0x540 ? __pfx_kernel_init+0x10/0x10 kernel_init+0x1f/0x150 ret_from_fork+0x40/0x50 ? __pfx_kernel_init+0x10/0x10 ret_from_fork_asm+0x1b/0x30 </TASK>
The previous patch fixes this by using the deadlock-safe best-effort version of find_vm_area. However, in case of failure print the fact that the pointer was a vmalloc pointer so that we print at least something.
--- mm/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/util.c +3 -1
@@ -1071,7 +1071,9 @@ void mem_dump_obj(void *object)if (vmalloc_dump_obj (object))return ; -if (virt_addr_valid (object)) +if (is_vmalloc_addr (object)) + type ="vmalloc memory" ; +else if (virt_addr_valid (object)) type ="non-slab/vmalloc memory" ;else if (object ==NULL ) type ="NULL pointer" ;
Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog
Re: [PATCH 2/2] rcu: Dump vmalloc memory info safely
Quoted 60 lines · Joel Fernandes (Google)
From: Zqiang <[email protected]>
Currently, for double invoke
call_rcu(), will dumprcu_headobjects memory info, if the objects is not allocated from the slab allocator, thevmalloc_dump_obj()will be invoke and thevmap_area_lockspinlock need to be held, since thecall_rcu()can be invoked in interrupt context, therefore, there is a possibility of spinlock deadlock scenarios.And in Preempt-RT kernel, the rcutorture test also trigger the following lockdep warning:
BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48
in_atomic(): 1,irqs_disabled(): 1,non_block: 0, pid: 1, name: swapper/0preempt_count: 1, expected: 0
RCU nest depth: 1, expected: 1
3 locks held by swapper/0/1:
#0:ffffffffb534ee80(fullstop_mutex){+.+.}-{4:4}, at:torture_init_begin+0x24/0xa0#1:ffffffffb5307940(rcu_read_lock){....}-{1:3}, at:rcu_torture_init+0x1ec7/0x2370#2:ffffffffb536af40(vmap_area_lock){+.+.}-{3:3}, at:find_vmap_area+0x1f/0x70irq event stamp: 565512 hardirqs last enabled at (565511): [<ffffffffb379b138>] __call_rcu_common+0x218/0x940 hardirqs last disabled at (565512): [<ffffffffb5804262>] rcu_torture_init+0x20b2/0x2370 softirqs last enabled at (399112): [<ffffffffb36b2586>] __local_bh_enable_ip+0x126/0x170 softirqs last disabled at (399106): [<ffffffffb43fef59>] inet_register_protosw+0x9/0x1d0 Preemption disabled at: [<ffffffffb58040c3>] rcu_torture_init+0x1f13/0x2370 CPU: 0 PID: 1 Comm: swapper/0 Tainted: G W 6.5.0-rc4-rt2-yocto-preempt-rt+ #15 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.16.2-0-gea1b7a073390-prebuilt.qemu.org 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x68/0xb0 dump_stack+0x14/0x20 __might_resched+0x1aa/0x280 ? __pfx_rcu_torture_err_cb+0x10/0x10 rt_spin_lock+0x53/0x130 ? find_vmap_area+0x1f/0x70 find_vmap_area+0x1f/0x70 vmalloc_dump_obj+0x20/0x60 mem_dump_obj+0x22/0x90 __call_rcu_common+0x5bf/0x940 ? debug_smp_processor_id+0x1b/0x30 call_rcu_hurry+0x14/0x20 rcu_torture_init+0x1f82/0x2370 ? __pfx_rcu_torture_leak_cb+0x10/0x10 ? __pfx_rcu_torture_leak_cb+0x10/0x10 ? __pfx_rcu_torture_init+0x10/0x10 do_one_initcall+0x6c/0x300 ? debug_smp_processor_id+0x1b/0x30 kernel_init_freeable+0x2b9/0x540 ? __pfx_kernel_init+0x10/0x10 kernel_init+0x1f/0x150 ret_from_fork+0x40/0x50 ? __pfx_kernel_init+0x10/0x10 ret_from_fork_asm+0x1b/0x30 </TASK>The previous patch fixes this by using the deadlock-safe best-effort version of
find_vm_area. However, in case of failure print the fact that the pointer was a vmalloc pointer so that we print at least something.
Quoted 5 lines
Reported-by Zhen Lei <[email protected]>Cc Paul E. McKenney <[email protected]>Signed-off-by Zqiang <[email protected]>Signed-off-by Joel Fernandes (Google) <[email protected]>
Andrew Morton
maintainerRe: [PATCH 2/2] rcu: Dump vmalloc memory info safely
In reply to Joel Fernandes (Google)Quoted 8 lines · On Wed, 30 Aug 2023 11:04:00 +0000 "Joel Fernandes (Google)"…
Currently, for double invoke
call_rcu(), will dumprcu_headobjects memory info, if the objects is not allocated from the slab allocator, thevmalloc_dump_obj()will be invoke and thevmap_area_lockspinlock need to be held, since thecall_rcu()can be invoked in interrupt context, therefore, there is a possibility of spinlock deadlock scenarios.And in Preempt-RT kernel, the rcutorture test also trigger the following lockdep warning:
"possibility of deadlock" sounds like something -stable kernels would like to have fixed.
Did you consider the desirability of a -stable backport?
If so, are we able to identify a suitable Fixes: target?
Re: [PATCH 2/2] rcu: Dump vmalloc memory info safely
Quoted 12 lines · Andrew Morton
Quoted 8 lines · On Wed, 30 Aug 2023 11:04:00 +0000 "Joel Fernandes (Google)"…
Currently, for double invoke
call_rcu(), will dumprcu_headobjects memory info, if the objects is not allocated from the slab allocator, thevmalloc_dump_obj()will be invoke and thevmap_area_lockspinlock need to be held, since thecall_rcu()can be invoked in interrupt context, therefore, there is a possibility of spinlock deadlock scenarios.And in Preempt-RT kernel, the rcutorture test also trigger the following lockdep warning:
Quoted 6 lines
"possibility of deadlock" sounds like something -stable kernels would like to have fixed.
Did you consider the desirability of a -stable backport?
If so, are we able to identify a suitable Fixes: target?
Good point, it should be:
I am currently reworking the patch as Vlad was also concerned about (the existing) issue of accessing vm_struct fields without holding the lock [1].
I will add this fixes tag to both patches for the v3 on the respin.
Thanks!
- Joel
Re: [PATCH 2/2] rcu: Dump vmalloc memory info safely
Quoted 21 lines · Joel Fernandes
Quoted 12 lines · Andrew Morton
Quoted 8 lines · On Wed, 30 Aug 2023 11:04:00 +0000 "Joel Fernandes (Google)"…
Currently, for double invoke
call_rcu(), will dumprcu_headobjects memory info, if the objects is not allocated from the slab allocator, thevmalloc_dump_obj()will be invoke and thevmap_area_lockspinlock need to be held, since thecall_rcu()can be invoked in interrupt context, therefore, there is a possibility of spinlock deadlock scenarios.And in Preempt-RT kernel, the rcutorture test also trigger the following lockdep warning:
Quoted 6 lines
"possibility of deadlock" sounds like something -stable kernels would like to have fixed.
Did you consider the desirability of a -stable backport?
If so, are we able to identify a suitable Fixes: target?
Quoted 9 lines
Good point, it should be:
Fixes 98f180837a89 ("mm: Make mem_dump_obj() handle vmalloc() memory")I am currently reworking the patch as Vlad was also concerned about (the existing) issue of accessing
vm_structfields without holding the lock [1].I will add this fixes tag to both patches for the v3 on the respin.
Sigh, I missed sharing the link to [1]:
[1] https://lore.kernel.org/all/[email protected]/
thanks,
- Joel
Quoted 9 lines · Joel Fernandes (Google)
It is unsafe to dump vmalloc area information when trying to do so from some contexts. Add a safer trylock version of the same function to do a best-effort VMA finding and use it from
vmalloc_dump_obj().Reported-by Zhen Lei <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Zqiang <[email protected]>Signed-off-by Joel Fernandes (Google) <[email protected]>
I once started writing something similar, but got distracted and the immediate problem got solved a different way.
It does make me wonder if we couldn't make this tree RCU-safe, but that's obviously a much larger job.
Quoted 6 lines · Matthew Wilcox
Quoted 4 lines · Joel Fernandes (Google)
It is unsafe to dump vmalloc area information when trying to do so from some contexts. Add a safer trylock version of the same function to do a best-effort VMA finding and use it from
vmalloc_dump_obj().
Quoted 7 lines
Quoted 5 lines
Reported-by Zhen Lei <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Zqiang <[email protected]>Signed-off-by Joel Fernandes (Google) <[email protected]>Reviewed-by Matthew Wilcox (Oracle) <[email protected]>
Thanks!
Quoted 5 lines
I once started writing something similar, but got distracted and the immediate problem got solved a different way.
It does make me wonder if we couldn't make this tree RCU-safe, but that's obviously a much larger job.
Yes, that would be nice.
- Joel
Quoted 3 lines · Joel Fernandes (Google)
It is unsafe to dump vmalloc area information when trying to do so from some contexts. Add a safer trylock version of the same function to do a best-effort VMA finding and use it from
vmalloc_dump_obj().
Seems like 2/2 to actually use this is missing?
Hi Christoph,
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · Joel Fernandes (Google)
It is unsafe to dump vmalloc area information when trying to do so from some contexts. Add a safer trylock version of the same function to do a best-effort VMA finding and use it from
vmalloc_dump_obj().Seems like 2/2 to actually use this is missing?
1/2 itself uses it.
And then 2/2 is here which does additional improvement courtesy of Zqiang:
https://lore.kernel.org/all/[email protected]/
I used git send-email with cc-cmd set to get_maintainer.pl script.
thanks,
- Joel