Patchwork memory hotplug: Refuse to add unaligned memory regions

login
register
mail settings
Submitter Anton Blanchard
Date Sept. 14, 2011, 8:26 p.m.
Message ID <20110915062615.782bc4df@kryten>
Download mbox | patch
Permalink /patch/114703/
State Not Applicable
Headers show

Comments

Anton Blanchard - Sept. 14, 2011, 8:26 p.m.
The sysfs memory probe interface allows unaligned regions
to be added:

# echo 0xffffff > /sys/devices/system/memory/probe

# cat /proc/iomem 
00ffffff-01fffffe : System RAM
01ffffff-02fffffe : System RAM
02ffffff-03fffffe : System RAM
03ffffff-04fffffe : System RAM
04ffffff-05fffffe : System RAM

Return -EINVAL instead of creating these bad regions.

Signed-off-by: Anton Blanchard <anton@samba.org>
---
gregkh@suse.de - Sept. 15, 2011, 6:35 a.m.
On Thu, Sep 15, 2011 at 06:26:15AM +1000, Anton Blanchard wrote:
> 
> The sysfs memory probe interface allows unaligned regions
> to be added:
> 
> # echo 0xffffff > /sys/devices/system/memory/probe
> 
> # cat /proc/iomem 
> 00ffffff-01fffffe : System RAM
> 01ffffff-02fffffe : System RAM
> 02ffffff-03fffffe : System RAM
> 03ffffff-04fffffe : System RAM
> 04ffffff-05fffffe : System RAM
> 
> Return -EINVAL instead of creating these bad regions.
> 
> Signed-off-by: Anton Blanchard <anton@samba.org>
> ---

Is this something that should go into 3.1 and older kernels to properly
handle this type of error?

greg k-h
Andrew Morton - Sept. 15, 2011, 7:58 a.m.
On Thu, 15 Sep 2011 06:26:15 +1000 Anton Blanchard <anton@samba.org> wrote:

> 
> The sysfs memory probe interface allows unaligned regions
> to be added:
> 
> # echo 0xffffff > /sys/devices/system/memory/probe
> 
> # cat /proc/iomem 
> 00ffffff-01fffffe : System RAM
> 01ffffff-02fffffe : System RAM
> 02ffffff-03fffffe : System RAM
> 03ffffff-04fffffe : System RAM
> 04ffffff-05fffffe : System RAM

Then don't do that?
Chen Gong - Nov. 9, 2011, 7:28 a.m.
于 2011/9/15 4:26, Anton Blanchard 写道:
>
> The sysfs memory probe interface allows unaligned regions
> to be added:
>
> # echo 0xffffff>  /sys/devices/system/memory/probe
>
> # cat /proc/iomem
> 00ffffff-01fffffe : System RAM
> 01ffffff-02fffffe : System RAM
> 02ffffff-03fffffe : System RAM
> 03ffffff-04fffffe : System RAM
> 04ffffff-05fffffe : System RAM
>
> Return -EINVAL instead of creating these bad regions.
>
> Signed-off-by: Anton Blanchard<anton@samba.org>
> ---
>
> Index: linux-build/drivers/base/memory.c
> ===================================================================
> --- linux-build.orig/drivers/base/memory.c	2011-08-11 08:25:55.005941391 +1000
> +++ linux-build/drivers/base/memory.c	2011-08-11 08:28:27.938580440 +1000
> @@ -380,9 +380,13 @@ memory_probe_store(struct class *class,
>   	u64 phys_addr;
>   	int nid;
>   	int i, ret;
> +	unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block;
>
>   	phys_addr = simple_strtoull(buf, NULL, 0);
>
> +	if (phys_addr&  ((pages_per_block<<  PAGE_SHIFT) - 1))
> +		return -EINVAL;
> +
>   	for (i = 0; i<  sections_per_block; i++) {
>   		nid = memory_add_physaddr_to_nid(phys_addr);
>   		ret = add_memory(nid, phys_addr,
> --

what platform doese it affect? PowerPC or else?

As I know, on x86 platform it should not use this interface: *probe*,
instead of acpi_hotplug_xxx. But PowerPC is RISC so how can you add
such weird address for it? Maybe it is because PowerPC uses 16M as
one section size and you assign a wrong address to it intentionally.
The final result is as you show, isn't it?

Patch

Index: linux-build/drivers/base/memory.c
===================================================================
--- linux-build.orig/drivers/base/memory.c	2011-08-11 08:25:55.005941391 +1000
+++ linux-build/drivers/base/memory.c	2011-08-11 08:28:27.938580440 +1000
@@ -380,9 +380,13 @@  memory_probe_store(struct class *class,
 	u64 phys_addr;
 	int nid;
 	int i, ret;
+	unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block;
 
 	phys_addr = simple_strtoull(buf, NULL, 0);
 
+	if (phys_addr & ((pages_per_block << PAGE_SHIFT) - 1))
+		return -EINVAL;
+
 	for (i = 0; i < sections_per_block; i++) {
 		nid = memory_add_physaddr_to_nid(phys_addr);
 		ret = add_memory(nid, phys_addr,