From patchwork Fri Jul 6 09:20:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 1163801 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 7525440135 for ; Fri, 6 Jul 2012 09:19:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753337Ab2GFJSj (ORCPT ); Fri, 6 Jul 2012 05:18:39 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:3578 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751378Ab2GFJSf (ORCPT ); Fri, 6 Jul 2012 05:18:35 -0400 X-IronPort-AV: E=Sophos;i="4.77,537,1336320000"; d="scan'208";a="5343964" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 06 Jul 2012 17:15:12 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q669FtS7009337; Fri, 6 Jul 2012 17:15:56 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012070617155620-558906 ; Fri, 6 Jul 2012 17:15:56 +0800 Message-ID: <4FF6ADD9.7040600@cn.fujitsu.com> Date: Fri, 06 Jul 2012 17:20:25 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 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 Subject: Re: [RFC PATCH v2 4/13] memory-hotplug : remove /sys/firmware/memmap/X sysfs References: <4FF287C3.4030901@jp.fujitsu.com> <4FF28996.10702@jp.fujitsu.com> <4FF2929B.7030004@cn.fujitsu.com> <4FF3CA65.1020300@jp.fujitsu.com> <4FF3CFDC.50802@cn.fujitsu.com> <4FF3DA1E.9060505@jp.fujitsu.com> <4FF41484.3070806@cn.fujitsu.com> <4FF6A17C.6000808@jp.fujitsu.com> In-Reply-To: <4FF6A17C.6000808@jp.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/07/06 17:15:56, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/07/06 17:16:02, Serialize complete at 2012/07/06 17:16:02 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org At 07/06/2012 04:27 PM, Yasuaki Ishimatsu Wrote: > Hi Wen, > > 2012/07/04 19:01, Wen Congyang wrote: >> At 07/04/2012 01:52 PM, Yasuaki Ishimatsu Wrote: >>> Hi Wen, >>> >>> 2012/07/04 14:08, Wen Congyang wrote: >>>> At 07/04/2012 12:45 PM, Yasuaki Ishimatsu Wrote: >>>>> Hi Wen, >>>>> >>>>> 2012/07/03 15:35, Wen Congyang wrote: >>>>>> At 07/03/2012 01:56 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 >>>>>>> Signed-off-by: Yasuaki Ishimatsu >>>>>>> >>>>>>> --- >>>>>>> drivers/firmware/memmap.c | 70 +++++++++++++++++++++++++++++++++++++++++++ >>>>>>> include/linux/firmware-map.h | 6 +++ >>>>>>> mm/memory_hotplug.c | 6 +++ >>>>>>> 3 files changed, 81 insertions(+), 1 deletion(-) >>>>>>> >>>>>>> Index: linux-3.5-rc4/mm/memory_hotplug.c >>>>>>> =================================================================== >>>>>>> --- linux-3.5-rc4.orig/mm/memory_hotplug.c 2012-07-03 14:22:00.190240794 +0900 >>>>>>> +++ linux-3.5-rc4/mm/memory_hotplug.c 2012-07-03 14:22:03.549198802 +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-rc4/include/linux/firmware-map.h >>>>>>> =================================================================== >>>>>>> --- linux-3.5-rc4.orig/include/linux/firmware-map.h 2012-07-03 14:21:45.766421116 +0900 >>>>>>> +++ linux-3.5-rc4/include/linux/firmware-map.h 2012-07-03 14:22:03.550198789 +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-07-03 14:21:45.761421180 +0900 >>>>>>> +++ linux-3.5-rc4/drivers/firmware/memmap.c 2012-07-03 14:22:03.569198549 +0900 >>>>>>> @@ -79,7 +79,16 @@ static const struct sysfs_ops memmap_att >>>>>>> .show = memmap_attr_show, >>>>>>> }; >>>>>>> >>>>>>> +static void release_firmware_map_entry(struct kobject *kobj) >>>>>>> +{ >>>>>>> + /* >>>>>>> + * FIXME : There is no idea. >>>>>>> + * How to free the entry which allocated bootmem? >>>>>>> + */ >>>>>> >>>>>> I find a function free_bootmem(), but I am not sure whether it can work here. >>>>> >>>>> It cannot work here. >>>>> >>>>>> Another problem: how to check whether the entry uses bootmem? >>>>> >>>>> When firmware_map_entry is allocated by kzalloc(), the page has PG_slab. >>>> >>>> This is not true. In my test, I find the page does not have PG_slab sometimes. >>> >>> I think that it depends on the allocated size. firmware_map_entry size is >>> smaller than PAGE_SIZE. So the page has PG_Slab. >> >> In my test, I add printk in the function firmware_map_add_hotplug() to display >> page's flags. And sometimes the page is not allocated by slab(I use PageSlab() >> to verify it). > > How did you check it? Could you send your debug patch? When the memory is not allocated from slab, the flags is 0x10000000008000. From 8dd51368d6c03edf7edc89cab17441e3741c39c7 Mon Sep 17 00:00:00 2001 From: Wen Congyang Date: Wed, 4 Jul 2012 16:05:26 +0800 Subject: [PATCH] debug --- drivers/firmware/memmap.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c index adc0710..993ba3f 100644 --- a/drivers/firmware/memmap.c +++ b/drivers/firmware/memmap.c @@ -21,6 +21,7 @@ #include #include #include +#include /* * Data types ------------------------------------------------------------------ @@ -160,11 +161,17 @@ static int add_sysfs_fw_map_entry(struct firmware_map_entry *entry) int __meminit firmware_map_add_hotplug(u64 start, u64 end, const char *type) { struct firmware_map_entry *entry; + struct page *entry_page; entry = kzalloc(sizeof(struct firmware_map_entry), GFP_ATOMIC); if (!entry) return -ENOMEM; + entry_page = virt_to_page(entry); + printk(KERN_WARNING "flags: %lx\n", entry_page->flags); + if (PageSlab(entry_page)) { + printk(KERN_WARNING "page is allocated from slab\n"); + } firmware_map_add_entry(start, end, type, entry); /* create the memmap entry */ add_sysfs_fw_map_entry(entry);