From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wen Congyang Subject: Re: [RFC PATCH v3 4/13] memory-hotplug : remove /sys/firmware/memmap/X sysfs Date: Mon, 16 Jul 2012 10:32:26 +0800 Message-ID: <50037D3A.4090309@cn.fujitsu.com> References: <4FFAB0A2.8070304@jp.fujitsu.com> <4FFAB1BA.9040801@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:12878 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751996Ab2GPC1t (ORCPT ); Sun, 15 Jul 2012 22:27:49 -0400 In-Reply-To: <4FFAB1BA.9040801@jp.fujitsu.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Yasuaki Ishimatsu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org, rientjes@google.com, liuj97@gmail.com, len.brown@intel.com, benh@kernel.crashing.org, paulus@samba.org, cl@linux.com, minchan.kim@gmail.com, akpm@linux-foundation.org, kosaki.motohiro@jp.fujitsu.com At 07/09/2012 06:26 PM, Yasuaki Ishimatsu Wrote: > 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 > CC: Jiang Liu > CC: Len Brown > CC: Benjamin Herrenschmidt > CC: Paul Mackerras > CC: Christoph Lameter > Cc: Minchan Kim > CC: Andrew Morton > CC: KOSAKI Motohiro > CC: Wen Congyang > Signed-off-by: Yasuaki Ishimatsu > > --- > 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 > #include > #include > +#include > > /* > * 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); You should call firmware_map_remove_entry() before remove_sysfs_fw_map_entry(), otherwise it will cause kernel panicked(entry may be freed in remove_sysfs_fw_map_entry()). Thanks Wen Congyang > + > + 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) > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx167.postini.com [74.125.245.167]) by kanga.kvack.org (Postfix) with SMTP id E396B6B004D for ; Sun, 15 Jul 2012 22:27:47 -0400 (EDT) Message-ID: <50037D3A.4090309@cn.fujitsu.com> Date: Mon, 16 Jul 2012 10:32:26 +0800 From: Wen Congyang MIME-Version: 1.0 Subject: Re: [RFC PATCH v3 4/13] memory-hotplug : remove /sys/firmware/memmap/X sysfs References: <4FFAB0A2.8070304@jp.fujitsu.com> <4FFAB1BA.9040801@jp.fujitsu.com> In-Reply-To: <4FFAB1BA.9040801@jp.fujitsu.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-2022-JP Sender: owner-linux-mm@kvack.org List-ID: To: Yasuaki Ishimatsu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org, rientjes@google.com, liuj97@gmail.com, len.brown@intel.com, benh@kernel.crashing.org, paulus@samba.org, cl@linux.com, minchan.kim@gmail.com, akpm@linux-foundation.org, kosaki.motohiro@jp.fujitsu.com At 07/09/2012 06:26 PM, Yasuaki Ishimatsu Wrote: > 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 > CC: Jiang Liu > CC: Len Brown > CC: Benjamin Herrenschmidt > CC: Paul Mackerras > CC: Christoph Lameter > Cc: Minchan Kim > CC: Andrew Morton > CC: KOSAKI Motohiro > CC: Wen Congyang > Signed-off-by: Yasuaki Ishimatsu > > --- > 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 > #include > #include > +#include > > /* > * 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); You should call firmware_map_remove_entry() before remove_sysfs_fw_map_entry(), otherwise it will cause kernel panicked(entry may be freed in remove_sysfs_fw_map_entry()). Thanks Wen Congyang > + > + 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) > > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from song.cn.fujitsu.com (unknown [222.73.24.84]) by ozlabs.org (Postfix) with ESMTP id 8C0702C00DE for ; Mon, 16 Jul 2012 12:27:50 +1000 (EST) Message-ID: <50037D3A.4090309@cn.fujitsu.com> Date: Mon, 16 Jul 2012 10:32:26 +0800 From: Wen Congyang MIME-Version: 1.0 To: Yasuaki Ishimatsu Subject: Re: [RFC PATCH v3 4/13] memory-hotplug : remove /sys/firmware/memmap/X sysfs References: <4FFAB0A2.8070304@jp.fujitsu.com> <4FFAB1BA.9040801@jp.fujitsu.com> In-Reply-To: <4FFAB1BA.9040801@jp.fujitsu.com> Content-Type: text/plain; charset=ISO-2022-JP Cc: len.brown@intel.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, paulus@samba.org, minchan.kim@gmail.com, kosaki.motohiro@jp.fujitsu.com, rientjes@google.com, cl@linux.com, linuxppc-dev@lists.ozlabs.org, akpm@linux-foundation.org, liuj97@gmail.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , At 07/09/2012 06:26 PM, Yasuaki Ishimatsu Wrote: > 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 > CC: Jiang Liu > CC: Len Brown > CC: Benjamin Herrenschmidt > CC: Paul Mackerras > CC: Christoph Lameter > Cc: Minchan Kim > CC: Andrew Morton > CC: KOSAKI Motohiro > CC: Wen Congyang > Signed-off-by: Yasuaki Ishimatsu > > --- > 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 > #include > #include > +#include > > /* > * 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); You should call firmware_map_remove_entry() before remove_sysfs_fw_map_entry(), otherwise it will cause kernel panicked(entry may be freed in remove_sysfs_fw_map_entry()). Thanks Wen Congyang > + > + 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) > >