From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<linuxppc-dev@lists.ozlabs.org>, <linux-acpi@vger.kernel.org>
Cc: len.brown@intel.com, wency@cn.fujitsu.com, paulus@samba.org,
minchan.kim@gmail.com, kosaki.motohiro@jp.fujitsu.com,
cl@linux.com, akpm@linux-foundation.org
Subject: [RFC PATCH 4/12] memory-hotplug : remove /sys/firmware/memmap/X sysfs
Date: Wed, 27 Jun 2012 14:47:11 +0900 [thread overview]
Message-ID: <4FEA9E5F.4070205@jp.fujitsu.com> (raw)
In-Reply-To: <4FEA9C88.1070800@jp.fujitsu.com>
When (hot)adding memory into system, /sys/firmware/memmap/X/{end, start, type}
sysfs files are created. But there is no code to remove these files. The patch
implements the function to remove them.
Note : The code does not free firmware_map_entry since there is no way to free
memory which is allocated by bootmem.
CC: Len Brown <len.brown@intel.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Paul Mackerras <paulus@samba.org>
CC: Christoph Lameter <cl@linux.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
---
drivers/firmware/memmap.c | 71 +++++++++++++++++++++++++++++++++++++++++++
include/linux/firmware-map.h | 6 +++
mm/memory_hotplug.c | 6 +++
3 files changed, 82 insertions(+), 1 deletion(-)
Index: linux-3.5-rc4/mm/memory_hotplug.c
===================================================================
--- linux-3.5-rc4.orig/mm/memory_hotplug.c 2012-06-26 13:37:30.546288901 +0900
+++ linux-3.5-rc4/mm/memory_hotplug.c 2012-06-26 13:44:37.069955820 +0900
@@ -661,7 +661,11 @@ EXPORT_SYMBOL_GPL(add_memory);
int remove_memory(int nid, u64 start, u64 size)
{
- return -EBUSY;
+ lock_memory_hotplug();
+ /* remove memmap entry */
+ firmware_map_remove(start, start + size, "System RAM");
+ unlock_memory_hotplug();
+ return 0;
}
EXPORT_SYMBOL_GPL(remove_memory);
Index: linux-3.5-rc4/include/linux/firmware-map.h
===================================================================
--- linux-3.5-rc4.orig/include/linux/firmware-map.h 2012-06-25 04:53:04.000000000 +0900
+++ linux-3.5-rc4/include/linux/firmware-map.h 2012-06-26 13:44:37.070955807 +0900
@@ -25,6 +25,7 @@
int firmware_map_add_early(u64 start, u64 end, const char *type);
int firmware_map_add_hotplug(u64 start, u64 end, const char *type);
+int firmware_map_remove(u64 start, u64 end, const char *type);
#else /* CONFIG_FIRMWARE_MEMMAP */
@@ -38,6 +39,11 @@ static inline int firmware_map_add_hotpl
return 0;
}
+static inline int firmware_map_remove(u64 start, u64 end, const char *type)
+{
+ return 0;
+}
+
#endif /* CONFIG_FIRMWARE_MEMMAP */
#endif /* _LINUX_FIRMWARE_MAP_H */
Index: linux-3.5-rc4/drivers/firmware/memmap.c
===================================================================
--- linux-3.5-rc4.orig/drivers/firmware/memmap.c 2012-06-25 04:53:04.000000000 +0900
+++ linux-3.5-rc4/drivers/firmware/memmap.c 2012-06-26 13:47:17.606948898 +0900
@@ -123,6 +123,16 @@ static int firmware_map_add_entry(u64 st
return 0;
}
+/**
+ * firmware_map_remove_entry() - Does the real work to remove a firmware
+ * memmap entry.
+ * @entry: removed entry.
+ **/
+static inline void firmware_map_remove_entry(struct firmware_map_entry *entry)
+{
+ list_del(&entry->list);
+}
+
/*
* Add memmap entry on sysfs
*/
@@ -144,6 +154,31 @@ static int add_sysfs_fw_map_entry(struct
return 0;
}
+/*
+ * Remove memmap entry on sysfs
+ */
+static inline void remove_sysfs_fw_map_entry(struct firmware_map_entry *entry)
+{
+ kobject_del(&entry->kobj);
+}
+
+/*
+ * Search memmap entry
+ */
+
+struct firmware_map_entry * __meminit
+find_firmware_map_entry(u64 start, u64 end, const char *type)
+{
+ struct firmware_map_entry *entry;
+
+ list_for_each_entry(entry, &map_entries, list)
+ if ((entry->start == start) && (entry->end == end) &&
+ (!strcmp(entry->type, type)))
+ return entry;
+
+ return NULL;
+}
+
/**
* firmware_map_add_hotplug() - Adds a firmware mapping entry when we do
* memory hotplug.
@@ -196,6 +231,42 @@ int __init firmware_map_add_early(u64 st
return firmware_map_add_entry(start, end, type, entry);
}
+void release_firmware_map_entry(struct firmware_map_entry *entry)
+{
+ /*
+ * FIXME : There is no idea.
+ * How to free the entry which allocated bootmem?
+ */
+}
+
+/**
+ * firmware_map_remove() - remove a firmware mapping entry
+ * @start: Start of the memory range.
+ * @end: End of the memory range (inclusive).
+ * @type: Type of the memory range.
+ *
+ * removes a firmware mapping entry.
+ *
+ * Returns 0 on success, or -EINVAL if no entry.
+ **/
+int __meminit firmware_map_remove(u64 start, u64 end, const char *type)
+{
+ struct firmware_map_entry *entry;
+
+ entry = find_firmware_map_entry(start, end, type);
+ if (!entry)
+ return -EINVAL;
+
+ /* remove the memmap entry */
+ remove_sysfs_fw_map_entry(entry);
+
+ firmware_map_remove_entry(entry);
+
+ release_firmware_map_entry(entry);
+
+ return 0;
+}
+
/*
* Sysfs functions -------------------------------------------------------------
*/
next prev parent reply other threads:[~2012-06-27 5:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-27 5:39 [RFC PATCH 0/12] memory-hotplug : hot-remove physical memory Yasuaki Ishimatsu
2012-06-27 5:42 ` [RFC PATCH 1/12] memory-hotplug : rename remove_memory to offline_memory Yasuaki Ishimatsu
2012-06-27 6:10 ` David Rientjes
2012-06-27 7:14 ` Wen Congyang
2012-06-27 8:47 ` Wen Congyang
2012-06-28 3:01 ` Yasuaki Ishimatsu
2012-06-28 3:25 ` Wen Congyang
2012-06-28 4:50 ` Yasuaki Ishimatsu
2012-06-27 5:44 ` [RFC PATCH 2/12] memory-hogplug : check memory offline in offline_pages Yasuaki Ishimatsu
2012-06-27 6:16 ` David Rientjes
2012-06-28 7:01 ` Yasuaki Ishimatsu
2012-06-27 8:49 ` Wen Congyang
2012-06-28 5:06 ` Yasuaki Ishimatsu
2012-06-28 5:27 ` KOSAKI Motohiro
2012-06-28 6:01 ` Yasuaki Ishimatsu
2012-06-28 5:26 ` KOSAKI Motohiro
2012-06-28 6:51 ` Yasuaki Ishimatsu
2012-06-30 15:46 ` Jiang Liu
2012-07-02 2:53 ` Yasuaki Ishimatsu
2012-06-30 15:51 ` Jiang Liu
2012-07-02 2:56 ` Yasuaki Ishimatsu
2012-06-27 5:45 ` [RFC PATCH 3/12] memory-hotplug : add physical memory hotplug code to acpi_memory_device_remove Yasuaki Ishimatsu
2012-06-27 5:47 ` Yasuaki Ishimatsu [this message]
2012-06-28 6:32 ` [RFC PATCH 4/12] memory-hotplug : remove /sys/firmware/memmap/X sysfs Wen Congyang
2012-06-28 8:07 ` Yasuaki Ishimatsu
2012-06-28 8:38 ` Wen Congyang
2012-06-29 3:09 ` Yasuaki Ishimatsu
2012-06-27 5:48 ` [RFC PATCH 5/12] memory-hotplug : does not release memory region in PAGES_PER_SECTION chunks Yasuaki Ishimatsu
2012-06-27 5:52 ` [RFC PATCH 6/12] memory-hotplug : remove_memory calls __remove_pages Yasuaki Ishimatsu
2012-06-27 5:53 ` [RFC PATCH 7/12] memory-hotplug : check page type in get_page_bootmem Yasuaki Ishimatsu
2012-06-27 5:54 ` [RFC PATCH 8/12] memory-hotplug : move register_page_bootmem_info_node and put_page_bootmem for sparse-vmemmap Yasuaki Ishimatsu
2012-06-27 5:55 ` [RFC PATCH 9/12] memory-hotplug : implement register_page_bootmem_info_section of sparse-vmemmap Yasuaki Ishimatsu
2012-06-27 5:56 ` [RFC PATCH 10/12] memory-hotplug : free memmap " Yasuaki Ishimatsu
2012-06-30 15:58 ` Jiang Liu
2012-07-02 3:01 ` Yasuaki Ishimatsu
2012-06-27 5:57 ` [RFC PATCH 11/12] memory-hotplug : add node_device_release Yasuaki Ishimatsu
2012-06-27 5:59 ` [RFC PATCH 12/12] memory-hotplug : remove sysfs file of node Yasuaki Ishimatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FEA9E5F.4070205@jp.fujitsu.com \
--to=isimatu.yasuaki@jp.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=minchan.kim@gmail.com \
--cc=paulus@samba.org \
--cc=wency@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).