From: Yasuaki Ishimatsu <isimatu.yasuaki@jp•fujitsu.com>
To: Ni zhan Chen <nizhan.chen@gmail•com>
Cc: linux-s390@vger•kernel.org, linux-ia64@vger•kernel.org,
wency@cn•fujitsu.com, linux-acpi@vger•kernel.org,
linux-sh@vger•kernel.org, len.brown@intel•com, x86@kernel•org,
linux-kernel@vger•kernel.org, cmetcalf@tilera•com,
linux-mm@kvack•org, paulus@samba•org, minchan.kim@gmail•com,
kosaki.motohiro@jp•fujitsu.com, rientjes@google•com,
sparclinux@vger•kernel.org, cl@linux•com,
linuxppc-dev@lists•ozlabs.org, akpm@linux-foundation•org,
liuj97@gmail•com
Subject: Re: [RFC v9 PATCH 01/21] memory-hotplug: rename remove_memory() to offline_memory()/offline_pages()
Date: Fri, 28 Sep 2012 12:50:00 +0900 [thread overview]
Message-ID: <50651E68.3040208@jp.fujitsu.com> (raw)
In-Reply-To: <506509E4.1090000@gmail.com>
Hi Chen,
2012/09/28 11:22, Ni zhan Chen wrote:
> On 09/05/2012 05:25 PM, wency@cn•fujitsu.com wrote:
>> From: Yasuaki Ishimatsu <isimatu.yasuaki@jp•fujitsu.com>
>>
>> remove_memory() only try to offline pages. It is called in two cases:
>> 1. hot remove a memory device
>> 2. echo offline >/sys/devices/system/memory/memoryXX/state
>>
>> In the 1st case, we should also change memory block's state, and notify
>> the userspace that the memory block's state is changed after offlining
>> pages.
>>
>> So rename remove_memory() to offline_memory()/offline_pages(). And in
>> the 1st case, offline_memory() will be used. The function offline_memory()
>> is not implemented. In the 2nd case, offline_pages() will be used.
>
> But this time there is not a function associated with add_memory.
To associate with add_memory() later, we renamed it.
Thanks,
Yasuaki Ishimatsu
>
>>
>> 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>
>> Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp•fujitsu.com>
>> Signed-off-by: Wen Congyang <wency@cn•fujitsu.com>
>> ---
>> drivers/acpi/acpi_memhotplug.c | 2 +-
>> drivers/base/memory.c | 9 +++------
>> include/linux/memory_hotplug.h | 3 ++-
>> mm/memory_hotplug.c | 22 ++++++++++++++--------
>> 4 files changed, 20 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
>> index 24c807f..2a7beac 100644
>> --- a/drivers/acpi/acpi_memhotplug.c
>> +++ b/drivers/acpi/acpi_memhotplug.c
>> @@ -318,7 +318,7 @@ static int acpi_memory_disable_device(struct acpi_memory_device *mem_device)
>> */
>> 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;
>> }
>> diff --git a/drivers/base/memory.c b/drivers/base/memory.c
>> index 7dda4f7..44e7de6 100644
>> --- a/drivers/base/memory.c
>> +++ b/drivers/base/memory.c
>> @@ -248,26 +248,23 @@ static bool pages_correctly_reserved(unsigned long start_pfn,
>> static int
>> memory_block_action(unsigned long phys_index, unsigned long action)
>> {
>> - unsigned long start_pfn, start_paddr;
>> + unsigned long start_pfn;
>> unsigned long nr_pages = PAGES_PER_SECTION * sections_per_block;
>> struct page *first_page;
>> int ret;
>> first_page = pfn_to_page(phys_index << PFN_SECTION_SHIFT);
>> + start_pfn = page_to_pfn(first_page);
>> switch (action) {
>> case MEM_ONLINE:
>> - start_pfn = page_to_pfn(first_page);
>> -
>> if (!pages_correctly_reserved(start_pfn, nr_pages))
>> return -EBUSY;
>> ret = online_pages(start_pfn, nr_pages);
>> break;
>> case MEM_OFFLINE:
>> - start_paddr = page_to_pfn(first_page) << PAGE_SHIFT;
>> - ret = remove_memory(start_paddr,
>> - nr_pages << PAGE_SHIFT);
>> + ret = offline_pages(start_pfn, nr_pages);
>> break;
>> default:
>> WARN(1, KERN_WARNING "%s(%ld, %ld) unknown action: "
>> diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
>> index 910550f..c183f39 100644
>> --- a/include/linux/memory_hotplug.h
>> +++ b/include/linux/memory_hotplug.h
>> @@ -233,7 +233,8 @@ static inline int is_mem_section_removable(unsigned long pfn,
>> 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_pages(unsigned long start_pfn, unsigned long nr_pages);
>> +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);
>> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
>> index 3ad25f9..bb42316 100644
>> --- a/mm/memory_hotplug.c
>> +++ b/mm/memory_hotplug.c
>> @@ -866,7 +866,7 @@ check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
>> return offlined;
>> }
>> -static int __ref offline_pages(unsigned long start_pfn,
>> +static int __ref __offline_pages(unsigned long start_pfn,
>> unsigned long end_pfn, unsigned long timeout)
>> {
>> unsigned long pfn, nr_pages, expire;
>> @@ -994,18 +994,24 @@ out:
>> return ret;
>> }
>> -int remove_memory(u64 start, u64 size)
>> +int offline_pages(unsigned long start_pfn, unsigned long nr_pages)
>> {
>> - unsigned long start_pfn, end_pfn;
>> + return __offline_pages(start_pfn, start_pfn + nr_pages, 120 * HZ);
>> +}
>> - start_pfn = PFN_DOWN(start);
>> - end_pfn = start_pfn + PFN_DOWN(size);
>> - return offline_pages(start_pfn, end_pfn, 120 * HZ);
>> +int offline_memory(u64 start, u64 size)
>> +{
>> + return -EINVAL;
>> }
>> #else
>> -int remove_memory(u64 start, u64 size)
>> +int offline_pages(unsigned long start, unsigned long size)
>> +{
>> + return -EINVAL;
>> +}
>> +
>> +int offline_memory(u64 start, u64 size)
>> {
>> return -EINVAL;
>> }
>> #endif /* CONFIG_MEMORY_HOTREMOVE */
>> -EXPORT_SYMBOL_GPL(remove_memory);
>> +EXPORT_SYMBOL_GPL(offline_memory);
>
next prev parent reply other threads:[~2012-09-28 3:50 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 9:25 [RFC v9 PATCH 00/21] memory-hotplug: hot-remove physical memory wency
2012-09-05 9:25 ` [RFC v9 PATCH 01/21] memory-hotplug: rename remove_memory() to offline_memory()/offline_pages() wency
2012-09-28 2:22 ` Ni zhan Chen
2012-09-28 3:50 ` Yasuaki Ishimatsu [this message]
2012-09-28 22:15 ` KOSAKI Motohiro
2012-10-02 1:18 ` Yasuaki Ishimatsu
2012-10-02 17:29 ` KOSAKI Motohiro
2012-09-05 9:25 ` [RFC v9 PATCH 02/21] memory-hotplug: implement offline_memory() wency
2012-09-05 9:25 ` [RFC v9 PATCH 03/21] memory-hotplug: store the node id in acpi_memory_device wency
2012-09-28 3:21 ` Ni zhan Chen
2012-10-01 7:38 ` Yasuaki Ishimatsu
2012-09-05 9:25 ` [RFC v9 PATCH 04/21] memory-hotplug: offline and remove memory when removing the memory device wency
2012-09-28 4:48 ` Ni zhan Chen
2012-09-05 9:25 ` [RFC v9 PATCH 05/21] memory-hotplug: check whether memory is present or not wency
2012-09-11 2:15 ` Wen Congyang
2012-09-11 2:24 ` Yasuaki Ishimatsu
2012-09-11 2:46 ` Wen Congyang
2012-09-28 3:37 ` Ni zhan Chen
2012-09-05 9:25 ` [RFC v9 PATCH 06/21] memory-hotplug: export the function acpi_bus_remove() wency
2012-10-02 0:34 ` Ni zhan Chen
2012-10-02 17:28 ` KOSAKI Motohiro
2012-09-05 9:25 ` [RFC v9 PATCH 07/21] memory-hotplug: call acpi_bus_remove() to remove memory device wency
2012-09-05 9:25 ` [RFC v9 PATCH 08/21] memory-hotplug: remove /sys/firmware/memmap/X sysfs wency
2012-09-05 9:25 ` [RFC v9 PATCH 09/21] memory-hotplug: does not release memory region in PAGES_PER_SECTION chunks wency
2012-09-05 9:25 ` [RFC v9 PATCH 10/21] memory-hotplug: add memory_block_release wency
2012-09-05 9:25 ` [RFC v9 PATCH 11/21] memory-hotplug: remove_memory calls __remove_pages wency
2012-09-05 9:25 ` [RFC v9 PATCH 12/21] memory-hotplug: introduce new function arch_remove_memory() wency
2012-09-05 9:25 ` [RFC v9 PATCH 13/21] memory-hotplug: check page type in get_page_bootmem wency
2012-09-29 2:15 ` Ni zhan Chen
2012-10-01 3:03 ` Yasuaki Ishimatsu
2012-10-02 12:24 ` Ni zhan Chen
2012-09-05 9:25 ` [RFC v9 PATCH 14/21] memory-hotplug: move register_page_bootmem_info_node and put_page_bootmem for sparse-vmemmap wency
2012-09-05 9:25 ` [RFC v9 PATCH 15/21] memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap wency
2012-09-05 9:25 ` [RFC v9 PATCH 16/21] memory-hotplug: free memmap " wency
2012-10-02 4:21 ` Ni zhan Chen
2012-10-04 6:26 ` Yasuaki Ishimatsu
2012-10-06 14:18 ` Ni zhan Chen
2012-09-05 9:25 ` [RFC v9 PATCH 17/21] memory_hotplug: clear zone when the memory is removed wency
2012-09-05 9:25 ` [RFC v9 PATCH 18/21] memory-hotplug: add node_device_release wency
2012-09-05 9:25 ` [RFC v9 PATCH 19/21] memory-hotplug: remove sysfs file of node wency
2012-09-05 9:25 ` [RFC v9 PATCH 20/21] memory-hotplug: clear hwpoisoned flag when onlining pages wency
2012-09-06 7:27 ` andywu106建国
2012-09-06 8:41 ` Wen Congyang
2012-09-05 9:25 ` [RFC v9 PATCH 21/21] memory-hotplug: auto offline page_cgroup when onlining memory block failed wency
2012-09-26 16:46 ` [RFC v9 PATCH 00/21] memory-hotplug: hot-remove physical memory Vasilis Liaskovitis
2012-09-27 0:59 ` Wen Congyang
2012-09-27 6:37 ` Wen Congyang
2012-09-27 10:35 ` Vasilis Liaskovitis
2012-09-28 1:41 ` Wen Congyang
2012-10-09 6:16 ` Wen Congyang
2012-10-09 8:11 ` Wen Congyang
2012-09-26 16:58 ` Vasilis Liaskovitis
2012-09-27 1:03 ` Wen Congyang
2012-09-27 8:53 ` Wen Congyang
2012-09-27 10:06 ` Wen Congyang
2012-09-27 11:02 ` Vasilis Liaskovitis
2012-09-29 3:45 ` Ni zhan Chen
2012-09-29 8:19 ` Ni zhan Chen
2012-10-01 4:44 ` Yasuaki Ishimatsu
2012-10-01 23:45 ` Ni zhan Chen
2012-10-02 0:02 ` Yasuaki Ishimatsu
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=50651E68.3040208@jp.fujitsu.com \
--to=isimatu.yasuaki@jp$(echo .)fujitsu.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=cl@linux$(echo .)com \
--cc=cmetcalf@tilera$(echo .)com \
--cc=kosaki.motohiro@jp$(echo .)fujitsu.com \
--cc=len.brown@intel$(echo .)com \
--cc=linux-acpi@vger$(echo .)kernel.org \
--cc=linux-ia64@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=liuj97@gmail$(echo .)com \
--cc=minchan.kim@gmail$(echo .)com \
--cc=nizhan.chen@gmail$(echo .)com \
--cc=paulus@samba$(echo .)org \
--cc=rientjes@google$(echo .)com \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=wency@cn$(echo .)fujitsu.com \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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