Skip to content

Commit

Permalink
mm/vmalloc.c: check VM_UNINITIALIZED flag in s_show instead of show_n…
Browse files Browse the repository at this point in the history
…uma_info

We should check the VM_UNITIALIZED flag in s_show().  If this flag is
set, that said, the vm_struct is not fully initialized.  So it is
unnecessary to try to show the information contained in vm_struct.

We checked this flag in show_numa_info(), but I think it's better to
check it earlier.

Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Zhang Yanfei authored and Linus Torvalds committed Jul 9, 2013
1 parent 20fc02b commit d157a55
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions mm/vmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2569,11 +2569,6 @@ static void show_numa_info(struct seq_file *m, struct vm_struct *v)
if (!counters)
return;

/* Pair with smp_wmb() in clear_vm_uninitialized_flag() */
smp_rmb();
if (v->flags & VM_UNINITIALIZED)
return;

memset(counters, 0, nr_node_ids * sizeof(unsigned int));

for (nr = 0; nr < v->nr_pages; nr++)
Expand Down Expand Up @@ -2602,6 +2597,11 @@ static int s_show(struct seq_file *m, void *p)

v = va->vm;

/* Pair with smp_wmb() in clear_vm_uninitialized_flag() */
smp_rmb();
if (v->flags & VM_UNINITIALIZED)
return 0;

seq_printf(m, "0x%pK-0x%pK %7ld",
v->addr, v->addr + v->size, v->size);

Expand Down

0 comments on commit d157a55

Please sign in to comment.