Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754227Ab2F0Im4 (ORCPT ); Wed, 27 Jun 2012 04:42:56 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:11016 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753768Ab2F0Imx (ORCPT ); Wed, 27 Jun 2012 04:42:53 -0400 X-IronPort-AV: E=Sophos;i="4.77,483,1336320000"; d="scan'208";a="5273573" Message-ID: <4FEAC891.7030808@cn.fujitsu.com> Date: Wed, 27 Jun 2012 16:47:13 +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, 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 1/12] memory-hotplug : rename remove_memory to offline_memory References: <4FEA9C88.1070800@jp.fujitsu.com> <4FEA9D5C.1080508@jp.fujitsu.com> <4FEAB2E1.3090200@cn.fujitsu.com> In-Reply-To: <4FEAB2E1.3090200@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/06/27 16:42:57, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/06/27 16:43:03, Serialize complete at 2012/06/27 16:43:03 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-2022-JP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5097 Lines: 129 At 06/27/2012 03:14 PM, Wen Congyang Wrote: > At 06/27/2012 01:42 PM, Yasuaki Ishimatsu Wrote: >> remove_memory() does not remove memory but just offlines memory. The patch >> changes name of it to offline_memory(). > > There are 3 functions in the kernel: > 1. add_memory() > 2. online_pages() > 3. remove_memory() > > So I think offline_pages() is better than offline_memory(). There is already a function named offline_pages(). So we should call offline_pages() instead of remove_memory() in memory_block_action(), and there is no need to rename remove_memory(). Thanks Wen Congyang > > Thanks > Wen Congyang >> >> 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/acpi/acpi_memhotplug.c | 2 +- >> drivers/base/memory.c | 4 ++-- >> include/linux/memory_hotplug.h | 2 +- >> mm/memory_hotplug.c | 6 +++--- >> 4 files changed, 7 insertions(+), 7 deletions(-) >> >> Index: linux-3.5-rc4/drivers/acpi/acpi_memhotplug.c >> =================================================================== >> --- linux-3.5-rc4.orig/drivers/acpi/acpi_memhotplug.c 2012-06-25 04:53:04.000000000 +0900 >> +++ linux-3.5-rc4/drivers/acpi/acpi_memhotplug.c 2012-06-26 13:48:38.263940481 +0900 >> @@ -318,7 +318,7 @@ static int acpi_memory_disable_device(st >> */ >> list_for_each_entry_safe(info, n, &mem_device->res_list, list) { >> if (info->enabled) { >> - result = remove_memory(info->start_addr, info->length); >> + result = offline_memory(info->start_addr, info->length); >> if (result) >> return result; >> } >> Index: linux-3.5-rc4/drivers/base/memory.c >> =================================================================== >> --- linux-3.5-rc4.orig/drivers/base/memory.c 2012-06-25 04:53:04.000000000 +0900 >> +++ linux-3.5-rc4/drivers/base/memory.c 2012-06-26 13:48:46.072842803 +0900 >> @@ -266,8 +266,8 @@ memory_block_action(unsigned long phys_i >> break; >> case MEM_OFFLINE: >> start_paddr = page_to_pfn(first_page) << PAGE_SHIFT; >> - ret = remove_memory(start_paddr, >> - nr_pages << PAGE_SHIFT); >> + ret = offline_memory(start_paddr, >> + nr_pages << PAGE_SHIFT); >> break; >> default: >> WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: " >> Index: linux-3.5-rc4/mm/memory_hotplug.c >> =================================================================== >> --- linux-3.5-rc4.orig/mm/memory_hotplug.c 2012-06-25 04:53:04.000000000 +0900 >> +++ linux-3.5-rc4/mm/memory_hotplug.c 2012-06-26 13:48:46.072842803 +0900 >> @@ -990,7 +990,7 @@ out: >> return ret; >> } >> >> -int remove_memory(u64 start, u64 size) >> +int offline_memory(u64 start, u64 size) >> { >> unsigned long start_pfn, end_pfn; >> >> @@ -999,9 +999,9 @@ int remove_memory(u64 start, u64 size) >> return offline_pages(start_pfn, end_pfn, 120 * HZ); >> } >> #else >> -int remove_memory(u64 start, u64 size) >> +int offline_memory(u64 start, u64 size) >> { >> return -EINVAL; >> } >> #endif /* CONFIG_MEMORY_HOTREMOVE */ >> -EXPORT_SYMBOL_GPL(remove_memory); >> +EXPORT_SYMBOL_GPL(offline_memory); >> Index: linux-3.5-rc4/include/linux/memory_hotplug.h >> =================================================================== >> --- linux-3.5-rc4.orig/include/linux/memory_hotplug.h 2012-06-25 04:53:04.000000000 +0900 >> +++ linux-3.5-rc4/include/linux/memory_hotplug.h 2012-06-26 13:48:38.264940468 +0900 >> @@ -233,7 +233,7 @@ static inline int is_mem_section_removab >> extern int mem_online_node(int nid); >> extern int add_memory(int nid, u64 start, u64 size); >> extern int arch_add_memory(int nid, u64 start, u64 size); >> -extern int remove_memory(u64 start, u64 size); >> +extern int offline_memory(u64 start, u64 size); >> extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn, >> int nr_pages); >> extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms); >> >> >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ >> > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/