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,
rientjes@google.com, cl@linux.com, akpm@linux-foundation.org,
liuj97@gmail.com
Subject: [RFC PATCH v3 4/13] memory-hotplug : remove /sys/firmware/memmap/X sysfs
Date: Mon, 9 Jul 2012 19:26:02 +0900 [thread overview]
Message-ID: <4FFAB1BA.9040801@jp.fujitsu.com> (raw)
In-Reply-To: <4FFAB0A2.8070304@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: David Rientjes <rientjes@google.com>
CC: Jiang Liu <liuj97@gmail.com>
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 | 78 ++++++++++++++++++++++++++++++++++++++++++-
include/linux/firmware-map.h | 6 +++
mm/memory_hotplug.c | 6 ++-
3 files changed, 88 insertions(+), 2 deletions(-)
Index: linux-3.5-rc6/mm/memory_hotplug.c
===================================================================
--- linux-3.5-rc6.orig/mm/memory_hotplug.c 2012-07-09 18:23:13.323844923 +0900
+++ linux-3.5-rc6/mm/memory_hotplug.c 2012-07-09 18:23:19.522767424 +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 - 1, "System RAM");
+ unlock_memory_hotplug();
+ return 0;
}
EXPORT_SYMBOL_GPL(remove_memory);
Index: linux-3.5-rc6/include/linux/firmware-map.h
===================================================================
--- linux-3.5-rc6.orig/include/linux/firmware-map.h 2012-07-09 18:23:09.532892314 +0900
+++ linux-3.5-rc6/include/linux/firmware-map.h 2012-07-09 18:23:19.523767412 +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-rc6/drivers/firmware/memmap.c
===================================================================
--- linux-3.5-rc6.orig/drivers/firmware/memmap.c 2012-07-09 18:23:09.532892314 +0900
+++ linux-3.5-rc6/drivers/firmware/memmap.c 2012-07-09 18:25:46.371931554 +0900
@@ -21,6 +21,7 @@
#include <linux/types.h>
#include <linux/bootmem.h>
#include <linux/slab.h>
+#include <linux/mm.h>
/*
* Data types ------------------------------------------------------------------
@@ -79,7 +80,22 @@ static const struct sysfs_ops memmap_att
.show = memmap_attr_show,
};
+#define to_memmap_entry(obj) container_of(obj, struct firmware_map_entry, kobj)
+
+static void release_firmware_map_entry(struct kobject *kobj)
+{
+ struct firmware_map_entry *entry = to_memmap_entry(kobj);
+ struct page *head_page;
+
+ head_page = virt_to_head_page(entry);
+ if (PageSlab(head_page))
+ kfree(entry);
+
+ /* There is no way to free memory allocated from bootmem*/
+}
+
static struct kobj_type memmap_ktype = {
+ .release = release_firmware_map_entry,
.sysfs_ops = &memmap_attr_ops,
.default_attrs = def_attrs,
};
@@ -123,6 +139,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 +170,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_put(&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 +247,32 @@ int __init firmware_map_add_early(u64 st
return firmware_map_add_entry(start, end, type, entry);
}
+/**
+ * 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);
+
+ return 0;
+}
+
/*
* Sysfs functions -------------------------------------------------------------
*/
@@ -218,7 +295,6 @@ static ssize_t type_show(struct firmware
}
#define to_memmap_attr(_attr) container_of(_attr, struct memmap_attribute, attr)
-#define to_memmap_entry(obj) container_of(obj, struct firmware_map_entry, kobj)
static ssize_t memmap_attr_show(struct kobject *kobj,
struct attribute *attr, char *buf)
next prev parent reply other threads:[~2012-07-09 10:26 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 10:21 [RFC PATCH v3 0/13] memory-hotplug : hot-remove physical memory Yasuaki Ishimatsu
2012-07-09 10:23 ` [RFC PATCH v3 1/13] memory-hotplug : rename remove_memory to offline_memory Yasuaki Ishimatsu
2012-07-09 10:24 ` [RFC PATCH v3 2/13] memory-hotplug : add physical memory hotplug code to acpi_memory_device_remove Yasuaki Ishimatsu
2012-07-13 3:26 ` Wen Congyang
2012-07-17 0:46 ` Yasuaki Ishimatsu
2012-07-13 3:35 ` Wen Congyang
2012-07-17 1:44 ` Yasuaki Ishimatsu
2012-07-17 1:54 ` Yasuaki Ishimatsu
2012-07-17 2:32 ` Wen Congyang
2012-07-17 3:08 ` Yasuaki Ishimatsu
2012-07-17 3:32 ` Wen Congyang
2012-07-17 4:51 ` Yasuaki Ishimatsu
2012-07-17 5:17 ` Wen Congyang
2012-07-17 5:19 ` Yasuaki Ishimatsu
2012-07-13 10:40 ` Wen Congyang
2012-07-17 1:10 ` Yasuaki Ishimatsu
2012-07-09 10:25 ` [RFC PATCH v3 3/13] memory-hotplug : unify argument of firmware_map_add_early/hotplug Yasuaki Ishimatsu
2012-07-11 15:30 ` Dave Hansen
2012-07-12 4:52 ` Yasuaki Ishimatsu
2012-07-12 13:40 ` Dave Hansen
2012-07-13 4:34 ` Yasuaki Ishimatsu
2012-07-13 5:11 ` Yasuaki Ishimatsu
2012-07-09 10:26 ` Yasuaki Ishimatsu [this message]
2012-07-13 9:10 ` [RFC PATCH v3 4/13] memory-hotplug : remove /sys/firmware/memmap/X sysfs Wen Congyang
2012-07-17 0:28 ` Yasuaki Ishimatsu
2012-07-16 2:32 ` Wen Congyang
2012-07-17 0:30 ` Yasuaki Ishimatsu
2012-07-09 10:26 ` [RFC PATCH v3 5/13] memory-hotplug : does not release memory region in PAGES_PER_SECTION chunks Yasuaki Ishimatsu
2012-07-13 3:42 ` Wen Congyang
2012-07-09 10:27 ` [RFC PATCH v3 6/13] memory-hotplug : add memory_block_release Yasuaki Ishimatsu
2012-07-09 10:28 ` [RFC PATCH v3 7/13] memory-hotplug : remove_memory calls __remove_pages Yasuaki Ishimatsu
2012-07-09 10:29 ` [RFC PATCH v3 8/13] memory-hotplug : check page type in get_page_bootmem Yasuaki Ishimatsu
2012-07-09 10:30 ` [RFC PATCH v3 9/13] memory-hotplug : move register_page_bootmem_info_node and put_page_bootmem for sparse-vmemmap Yasuaki Ishimatsu
2012-07-09 10:32 ` [RFC PATCH v3 10/13] memory-hotplug : implement register_page_bootmem_info_section of sparse-vmemmap Yasuaki Ishimatsu
2012-07-09 10:33 ` [RFC PATCH v3 11/13] memory-hotplug : free memmap " Yasuaki Ishimatsu
2012-07-11 5:06 ` Wen Congyang
2012-07-11 5:52 ` Yasuaki Ishimatsu
2012-07-11 6:25 ` Wen Congyang
2012-07-11 6:48 ` Yasuaki Ishimatsu
2012-07-11 7:27 ` Wen Congyang
2012-07-09 10:34 ` [RFC PATCH v3 12/13] memory-hotplug : add node_device_release Yasuaki Ishimatsu
2012-07-09 10:35 ` [RFC PATCH v3 13/13] memory-hotplug : remove sysfs file of node Yasuaki Ishimatsu
2012-07-09 15:18 ` [RFC PATCH v3 0/13] memory-hotplug : hot-remove physical memory Christoph Lameter
2012-07-10 9:58 ` Yasuaki Ishimatsu
2012-07-10 16:50 ` Jiang Liu
2012-07-11 0:09 ` Yasuaki Ishimatsu
2012-07-11 0:21 ` Jiang Liu
2012-07-11 0:54 ` Yasuaki Ishimatsu
2012-07-11 14:24 ` Jiang Liu
2012-07-11 1:52 ` Wen Congyang
2012-07-11 2:24 ` Wen Congyang
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=4FFAB1BA.9040801@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=liuj97@gmail.com \
--cc=minchan.kim@gmail.com \
--cc=paulus@samba.org \
--cc=rientjes@google.com \
--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).