Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

memory hotplug: sysfs probe routine should add all memory sections

As a follow-on to the recent patches I submitted that allowed for a sysfs
memory block to span multiple memory sections, we should also update the
probe routine to online all of the memory sections in a memory block. Without
this patch the current code will only add a single memory section. I think
the probe routine should add all of the memory sections in the specified memory
block so that its behavior is in line with memory hotplug actions through
the sysfs interfaces.

This patch applies on top of the previous sysfs memory updates to allow
a sysfs directory o span multiple memory sections.

https://lkml.org/lkml/2011/1/20/245

Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Nathan Fontenot and committed by
Greg Kroah-Hartman
6add7cd6 1dc41aa6

+10 -3
+10 -3
drivers/base/memory.c
··· 387 387 { 388 388 u64 phys_addr; 389 389 int nid; 390 - int ret; 390 + int i, ret; 391 391 392 392 phys_addr = simple_strtoull(buf, NULL, 0); 393 393 394 - nid = memory_add_physaddr_to_nid(phys_addr); 395 - ret = add_memory(nid, phys_addr, PAGES_PER_SECTION << PAGE_SHIFT); 394 + for (i = 0; i < sections_per_block; i++) { 395 + nid = memory_add_physaddr_to_nid(phys_addr); 396 + ret = add_memory(nid, phys_addr, 397 + PAGES_PER_SECTION << PAGE_SHIFT); 398 + if (ret) 399 + break; 400 + 401 + phys_addr += MIN_MEMORY_BLOCK_SIZE; 402 + } 396 403 397 404 if (ret) 398 405 count = ret;