[3/6] acpi,memory-hotplug : add physical memory hotplug code to acpi_memhotplug.c

Commit Message

Yasuaki Ishimatsu Oct. 3, 2012, 10:09 a.m. UTC

From: Yasuaki Ishimatsu <[e-mail]>

For hot removing physical memory, the patch adds remove_memory() into
acpi_memory_remove_memory(). But we cannot support physical memory
hot remove. So remove_memory() do nothinig.

CC: David Rientjes <[e-mail]>
CC: Jiang Liu <[e-mail]>
CC: Len Brown <[e-mail]>
CC: Christoph Lameter <[e-mail]>
Cc: Minchan Kim <[e-mail]>
CC: Andrew Morton <[e-mail]>
CC: KOSAKI Motohiro <[e-mail]> 
Signed-off-by: Yasuaki Ishimatsu <[e-mail]>
Signed-off-by: Wen Congyang <[e-mail]>
---
 drivers/acpi/acpi_memhotplug.c |   10 ++++++++++
 include/linux/memory_hotplug.h |    5 +++++
 mm/memory_hotplug.c            |    7 +++++++
 3 files changed, 22 insertions(+)


--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Motohiro KOSAKI Oct. 5, 2012, 6:54 p.m. UTC | #1

On Wed, Oct 3, 2012 at 6:09 AM, Yasuaki Ishimatsu
<[e-mail]> wrote:
> From: Yasuaki Ishimatsu <[e-mail]>
>
> For hot removing physical memory, the patch adds remove_memory() into
> acpi_memory_remove_memory(). But we cannot support physical memory
> hot remove. So remove_memory() do nothinig.

I don't understand this explanation. Why do we need do nothing change?
I guess you need to fold this patch into another meaningful fix.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-3.6/drivers/acpi/acpi_memhotplug.c
===================================================================
--- linux-3.6.orig/drivers/acpi/acpi_memhotplug.c	2012-10-03 19:03:10.960400793 +0900
+++ linux-3.6/drivers/acpi/acpi_memhotplug.c	2012-10-03 19:03:26.818401966 +0900
@@ -310,6 +310,9 @@  static int acpi_memory_remove_memory(str
 {
 	int result;
 	struct acpi_memory_info *info, *n;
+	int node;
+
+	node = acpi_get_node(mem_device->device->handle);
 
 	list_for_each_entry_safe(info, n, &mem_device->res_list, list) {
 		if (!info->enabled)
@@ -319,6 +322,13 @@  static int acpi_memory_remove_memory(str
 		if (result)
 			return result;
 
+		if (node < 0)
+			node = memory_add_physaddr_to_nid(info->start_addr);
+
+		result = remove_memory(node, info->start_addr, info->length);
+		if (result)
+			return result;
+
 		list_del(&info->list);
 		kfree(info);
 	}
Index: linux-3.6/include/linux/memory_hotplug.h
===================================================================
--- linux-3.6.orig/include/linux/memory_hotplug.h	2012-10-03 19:03:10.963400796 +0900
+++ linux-3.6/include/linux/memory_hotplug.h	2012-10-03 19:03:26.820401968 +0900
@@ -222,6 +222,7 @@  static inline void unlock_memory_hotplug
 #ifdef CONFIG_MEMORY_HOTREMOVE
 
 extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages);
+extern int remove_memory(int nid, u64 start, u64 size);
 
 #else
 static inline int is_mem_section_removable(unsigned long pfn,
@@ -229,6 +230,10 @@  static inline int is_mem_section_removab
 {
 	return 0;
 }
+static inline int remove_memory(int nid, u64 start, u64 size)
+{
+	return -EBUSY;
+}
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 
 extern int mem_online_node(int nid);
Index: linux-3.6/mm/memory_hotplug.c
===================================================================
--- linux-3.6.orig/mm/memory_hotplug.c	2012-10-03 19:03:10.962400795 +0900
+++ linux-3.6/mm/memory_hotplug.c	2012-10-03 19:04:15.493404911 +0900
@@ -1042,6 +1042,13 @@  int offline_memory(u64 start, u64 size)
 
 	return 0;
 }
+
+int remove_memory(int nid, u64 start, u64 size)
+{
+	/* It is not implemented yet*/
+	return 0;
+}
+EXPORT_SYMBOL_GPL(remove_memory);
 #else
 int offline_pages(unsigned long start_pfn, unsigned long nr_pages)
 {