Commit bf531831 authored by Omar Sandoval's avatar Omar Sandoval Committed by Linus Torvalds

proc/kcore: don't grab lock for memory hotplug notifier

The memory hotplug notifier kcore_callback() only needs kclist_lock to
prevent races with __kcore_update_ram(), but we can easily eliminate that
race by using an atomic xchg() in __kcore_update_ram().  This is
preparation for converting kclist_lock to an rwsem.

Link: http://lkml.kernel.org/r/0a4bc89f4dbde8b5b2ea309f7b4fb6a85fe29df2.1531953780.git.osandov@fb.comSigned-off-by: default avatarOmar Sandoval <osandov@fb.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Bhupesh Sharma <bhsharma@redhat.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a8dd9c4d
...@@ -118,7 +118,7 @@ static void __kcore_update_ram(struct list_head *list) ...@@ -118,7 +118,7 @@ static void __kcore_update_ram(struct list_head *list)
LIST_HEAD(garbage); LIST_HEAD(garbage);
write_lock(&kclist_lock); write_lock(&kclist_lock);
if (kcore_need_update) { if (xchg(&kcore_need_update, 0)) {
list_for_each_entry_safe(pos, tmp, &kclist_head, list) { list_for_each_entry_safe(pos, tmp, &kclist_head, list) {
if (pos->type == KCORE_RAM if (pos->type == KCORE_RAM
|| pos->type == KCORE_VMEMMAP) || pos->type == KCORE_VMEMMAP)
...@@ -127,7 +127,6 @@ static void __kcore_update_ram(struct list_head *list) ...@@ -127,7 +127,6 @@ static void __kcore_update_ram(struct list_head *list)
list_splice_tail(list, &kclist_head); list_splice_tail(list, &kclist_head);
} else } else
list_splice(list, &garbage); list_splice(list, &garbage);
kcore_need_update = 0;
proc_root_kcore->size = get_kcore_size(&nphdr, &size); proc_root_kcore->size = get_kcore_size(&nphdr, &size);
write_unlock(&kclist_lock); write_unlock(&kclist_lock);
...@@ -593,9 +592,8 @@ static int __meminit kcore_callback(struct notifier_block *self, ...@@ -593,9 +592,8 @@ static int __meminit kcore_callback(struct notifier_block *self,
switch (action) { switch (action) {
case MEM_ONLINE: case MEM_ONLINE:
case MEM_OFFLINE: case MEM_OFFLINE:
write_lock(&kclist_lock);
kcore_need_update = 1; kcore_need_update = 1;
write_unlock(&kclist_lock); break;
} }
return NOTIFY_OK; return NOTIFY_OK;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment