From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Liu Subject: Re: [RFC PATCH v4 1/13] memory-hotplug : rename remove_memory to offline_memory Date: Thu, 19 Jul 2012 16:19:38 +0800 Message-ID: References: <50068974.1070409@jp.fujitsu.com> <50068A6E.5050904@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: In-Reply-To: <50068A6E.5050904@jp.fujitsu.com> Sender: owner-linux-mm@kvack.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, wency@cn.fujitsu.com List-Id: linux-acpi@vger.kernel.org Hi Yasuaki, On Wed, Jul 18, 2012 at 6:05 PM, Yasuaki Ishimatsu wrote: > remove_memory() does not remove memory but just offlines memory. The patch > changes name of it to offline_memory(). Since offline_memory() just align the start/end pfn and there is no matched online_memory() function, i think it's better to remove this function and add the alignment into offline_pages(). > > 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/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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/drivers/acpi/acpi_memhotplug.c 2012-07-03 14:21:49.458374960 +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-07-03 14:21:46.095417003 +0900 > +++ linux-3.5-rc4/drivers/base/memory.c 2012-07-03 14:21:49.459374948 +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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/mm/memory_hotplug.c 2012-07-03 14:21:49.466374860 +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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/include/linux/memory_hotplug.h 2012-07-03 14:21:49.471374796 +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, 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 -- Regards, --Bob -- 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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753577Ab2GSIT6 (ORCPT ); Thu, 19 Jul 2012 04:19:58 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:54675 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752041Ab2GSITs (ORCPT ); Thu, 19 Jul 2012 04:19:48 -0400 MIME-Version: 1.0 In-Reply-To: <50068A6E.5050904@jp.fujitsu.com> References: <50068974.1070409@jp.fujitsu.com> <50068A6E.5050904@jp.fujitsu.com> Date: Thu, 19 Jul 2012 16:19:38 +0800 Message-ID: Subject: Re: [RFC PATCH v4 1/13] memory-hotplug : rename remove_memory to offline_memory From: Bob Liu 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, wency@cn.fujitsu.com Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Yasuaki, On Wed, Jul 18, 2012 at 6:05 PM, Yasuaki Ishimatsu wrote: > remove_memory() does not remove memory but just offlines memory. The patch > changes name of it to offline_memory(). Since offline_memory() just align the start/end pfn and there is no matched online_memory() function, i think it's better to remove this function and add the alignment into offline_pages(). > > 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/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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/drivers/acpi/acpi_memhotplug.c 2012-07-03 14:21:49.458374960 +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-07-03 14:21:46.095417003 +0900 > +++ linux-3.5-rc4/drivers/base/memory.c 2012-07-03 14:21:49.459374948 +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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/mm/memory_hotplug.c 2012-07-03 14:21:49.466374860 +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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/include/linux/memory_hotplug.h 2012-07-03 14:21:49.471374796 +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, 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 -- Regards, --Bob From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id CCE562C0193 for ; Thu, 19 Jul 2012 18:19:51 +1000 (EST) Received: by wibhq4 with SMTP id hq4so1775968wib.14 for ; Thu, 19 Jul 2012 01:19:47 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <50068A6E.5050904@jp.fujitsu.com> References: <50068974.1070409@jp.fujitsu.com> <50068A6E.5050904@jp.fujitsu.com> Date: Thu, 19 Jul 2012 16:19:38 +0800 Message-ID: Subject: Re: [RFC PATCH v4 1/13] memory-hotplug : rename remove_memory to offline_memory From: Bob Liu To: Yasuaki Ishimatsu Content-Type: text/plain; charset=UTF-8 Cc: len.brown@intel.com, wency@cn.fujitsu.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: , Hi Yasuaki, On Wed, Jul 18, 2012 at 6:05 PM, Yasuaki Ishimatsu wrote: > remove_memory() does not remove memory but just offlines memory. The patch > changes name of it to offline_memory(). Since offline_memory() just align the start/end pfn and there is no matched online_memory() function, i think it's better to remove this function and add the alignment into offline_pages(). > > 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/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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/drivers/acpi/acpi_memhotplug.c 2012-07-03 14:21:49.458374960 +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-07-03 14:21:46.095417003 +0900 > +++ linux-3.5-rc4/drivers/base/memory.c 2012-07-03 14:21:49.459374948 +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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/mm/memory_hotplug.c 2012-07-03 14:21:49.466374860 +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-07-03 14:21:46.102416917 +0900 > +++ linux-3.5-rc4/include/linux/memory_hotplug.h 2012-07-03 14:21:49.471374796 +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, 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 -- Regards, --Bob