Skip to content

Commit cb5490a

Browse files
jallen93torvalds
authored andcommitted
drivers/base/memory.c: fix kernel warning during memory hotplug on ppc64
Fix a bug where a kernel warning is triggered when performing a memory hotplug on ppc64. This warning may also occur on any architecture that uses the memory_probe_store interface. WARNING: at drivers/base/memory.c:200 CPU: 9 PID: 13042 Comm: systemd-udevd Not tainted 4.4.0-rc4-00113-g0bd0f1e-dirty #7 NIP [c00000000055e034] pages_correctly_reserved+0x134/0x1b0 LR [c00000000055e7f8] memory_subsys_online+0x68/0x140 Call Trace: memory_subsys_online+0x68/0x140 device_online+0xb4/0x120 store_mem_state+0xb0/0x180 dev_attr_store+0x34/0x60 sysfs_kf_write+0x64/0xa0 kernfs_fop_write+0x17c/0x1e0 __vfs_write+0x40/0x160 vfs_write+0xb8/0x200 SyS_write+0x60/0x110 system_call+0x38/0xd0 The warning is triggered because there is a udev rule that automatically tries to online memory after it has been added. The udev rule varies from distro to distro, but will generally look something like: SUBSYSTEM=="memory", ACTION=="add", ATTR{state}=="offline", ATTR{state}="online" On any architecture that uses memory_probe_store to reserve memory, the udev rule will be triggered after the first section of the block is reserved and will subsequently attempt to online the entire block, interrupting the memory reservation process and causing the warning. This patch modifies memory_probe_store to add a block of memory with a single call to add_memory as opposed to looping through and adding each section individually. A single call to add_memory is protected by the mem_hotplug mutex which will prevent the udev rule from onlining memory until the reservation of the entire block is complete. Signed-off-by: John Allen <jallen@linux.vnet.ibm.com> Acked-by: Dave Hansen <dave.hansen@intel.com> Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent fec174d commit cb5490a

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

drivers/base/memory.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,7 @@ memory_probe_store(struct device *dev, struct device_attribute *attr,
450450
const char *buf, size_t count)
451451
{
452452
u64 phys_addr;
453-
int nid;
454-
int i, ret;
453+
int nid, ret;
455454
unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block;
456455

457456
ret = kstrtoull(buf, 0, &phys_addr);
@@ -461,15 +460,12 @@ memory_probe_store(struct device *dev, struct device_attribute *attr,
461460
if (phys_addr & ((pages_per_block << PAGE_SHIFT) - 1))
462461
return -EINVAL;
463462

464-
for (i = 0; i < sections_per_block; i++) {
465-
nid = memory_add_physaddr_to_nid(phys_addr);
466-
ret = add_memory(nid, phys_addr,
467-
PAGES_PER_SECTION << PAGE_SHIFT);
468-
if (ret)
469-
goto out;
463+
nid = memory_add_physaddr_to_nid(phys_addr);
464+
ret = add_memory(nid, phys_addr,
465+
MIN_MEMORY_BLOCK_SIZE * sections_per_block);
470466

471-
phys_addr += MIN_MEMORY_BLOCK_SIZE;
472-
}
467+
if (ret)
468+
goto out;
473469

474470
ret = count;
475471
out:

0 commit comments

Comments
 (0)