diff options
| author | Wanpeng Li <liwanp@linux.vnet.ibm.com> | 2013-11-12 15:07:32 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-02 21:08:53 +0200 |
| commit | 9c75a2e7ad58d3c78e270d964a79e6593f3de703 (patch) | |
| tree | e8a03d0007656068479bb50e3a4713058c4a64f2 | |
| parent | 49e9df46a3810f8c70d5d1f0126b873c723115a7 (diff) | |
mm/vmalloc: revert "mm/vmalloc.c: check VM_UNINITIALIZED flag in s_show instead of show_numa_info"
The VM_UNINITIALIZED/VM_UNLIST flag introduced by f5252e009d5b ("mm:
avoid null pointer access in vm_struct via /proc/vmallocinfo") is used
to avoid accessing the pages field with unallocated page when
show_numa_info() is called.
This patch moves the check just before show_numa_info in order that some
messages still can be dumped via /proc/vmallocinfo. This patch reverts
commit d157a55815ff ("mm/vmalloc.c: check VM_UNINITIALIZED flag in
s_show instead of show_numa_info");
Reviewed-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Change-Id: Idb005d8df92f7f6451b29ddddb3cdada43423056
(cherry picked from commit 4f7792c8b17e622790b7cef7e50dcf6349982771)
| -rw-r--r-- | mm/vmalloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 019ac4672..f1780c770 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2604,6 +2604,11 @@ 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++) @@ -2629,11 +2634,6 @@ 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); |