Skip to content

Commit c2ce8c1

Browse files
Wanpeng Litorvalds
authored andcommitted
mm/vmalloc: fix show vmap_area information race with vmap_area tear down
There is a race window between vmap_area tear down and show vmap_area information. A B remove_vm_area spin_lock(&vmap_area_lock); va->vm = NULL; va->flags &= ~VM_VM_AREA; spin_unlock(&vmap_area_lock); spin_lock(&vmap_area_lock); if (va->flags & (VM_LAZY_FREE | VM_LAZY_FREEZING)) return 0; if (!(va->flags & VM_VM_AREA)) { seq_printf(m, "0x%pK-0x%pK %7ld vm_map_ram\n", (void *)va->va_start, (void *)va->va_end, va->va_end - va->va_start); return 0; } free_unmap_vmap_area(va); flush_cache_vunmap free_unmap_vmap_area_noflush unmap_vmap_area free_vmap_area_noflush va->flags |= VM_LAZY_FREE The assumption !VM_VM_AREA represents vm_map_ram allocation is introduced by d4033af ("mm, vmalloc: iterate vmap_area_list, instead of vmlist, in vmallocinfo()"). However, !VM_VM_AREA also represents vmap_area is being tear down in race window mentioned above. This patch fix it by don't dump any information for !VM_VM_AREA case and also remove (VM_LAZY_FREE | VM_LAZY_FREEING) check since they are not possible for !VM_VM_AREA case. Suggested-by: Joonsoo Kim <[email protected]> Acked-by: KOSAKI Motohiro <[email protected]> Signed-off-by: Wanpeng Li <[email protected]> Cc: Mitsuo Hayasaka <[email protected]> Cc: Zhang Yanfei <[email protected]> Cc: David Rientjes <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 3722e13 commit c2ce8c1

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

mm/vmalloc.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2578,15 +2578,12 @@ static int s_show(struct seq_file *m, void *p)
25782578
struct vmap_area *va = p;
25792579
struct vm_struct *v;
25802580

2581-
if (va->flags & (VM_LAZY_FREE | VM_LAZY_FREEING))
2582-
return 0;
2583-
2584-
if (!(va->flags & VM_VM_AREA)) {
2585-
seq_printf(m, "0x%pK-0x%pK %7ld vm_map_ram\n",
2586-
(void *)va->va_start, (void *)va->va_end,
2587-
va->va_end - va->va_start);
2581+
/*
2582+
* s_show can encounter race with remove_vm_area, !VM_VM_AREA on
2583+
* behalf of vmap area is being tear down or vm_map_ram allocation.
2584+
*/
2585+
if (!(va->flags & VM_VM_AREA))
25882586
return 0;
2589-
}
25902587

25912588
v = va->vm;
25922589

0 commit comments

Comments
 (0)