From: Tang Chen <tangchen@cn.fujitsu.com>
To: Wen Congyang <wency@cn.fujitsu.com>
Cc: linux-s390@vger.kernel.org, linux-ia64@vger.kernel.org,
Len Brown <len.brown@intel.com>,
linux-acpi@vger.kernel.org, linux-sh@vger.kernel.org,
x86@kernel.org, linux-kernel@vger.kernel.org,
cmetcalf@tilera.com, Jianguo Wu <wujianguo@huawei.com>,
linux-mm@kvack.org,
Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>,
paulus@samba.org, Minchan Kim <minchan.kim@gmail.com>,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
David Rientjes <rientjes@google.com>,
sparclinux@vger.kernel.org, Christoph Lameter <cl@linux.com>,
linuxppc-dev@lists.ozlabs.org,
Andrew Morton <akpm@linux-foundation.org>,
Jiang Liu <liuj97@gmail.com>
Subject: Re: [Patch v4 03/12] memory-hotplug: remove redundant codes
Date: Tue, 04 Dec 2012 17:22:38 +0800 [thread overview]
Message-ID: <50BDC0DE.4010103@cn.fujitsu.com> (raw)
In-Reply-To: <1354010422-19648-4-git-send-email-wency@cn.fujitsu.com>
On 11/27/2012 06:00 PM, Wen Congyang wrote:
> offlining memory blocks and checking whether memory blocks are offlined
> are very similar. This patch introduces a new function to remove
> redundant codes.
>
> CC: David Rientjes<rientjes@google.com>
> CC: Jiang Liu<liuj97@gmail.com>
> CC: Len Brown<len.brown@intel.com>
> 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>
> CC: Yasuaki Ishimatsu<isimatu.yasuaki@jp.fujitsu.com>
> Signed-off-by: Wen Congyang<wency@cn.fujitsu.com>
Can we merge this patch with [PATCH 03/12] ?
Reviewed-by: Tang Chen <tangchen@cn.fujitsu.com>
> ---
> mm/memory_hotplug.c | 101 ++++++++++++++++++++++++++++------------------------
> 1 file changed, 55 insertions(+), 46 deletions(-)
>
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index b6d1101..6d06488 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -1005,20 +1005,14 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages)
> return __offline_pages(start_pfn, start_pfn + nr_pages, 120 * HZ);
> }
>
> -int remove_memory(u64 start, u64 size)
> +static int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
> + void *arg, int (*func)(struct memory_block *, void *))
> {
> struct memory_block *mem = NULL;
> struct mem_section *section;
> - unsigned long start_pfn, end_pfn;
> unsigned long pfn, section_nr;
> int ret;
> - int return_on_error = 0;
> - int retry = 0;
> -
> - start_pfn = PFN_DOWN(start);
> - end_pfn = start_pfn + PFN_DOWN(size);
>
> -repeat:
> for (pfn = start_pfn; pfn< end_pfn; pfn += PAGES_PER_SECTION) {
> section_nr = pfn_to_section_nr(pfn);
> if (!present_section_nr(section_nr))
> @@ -1035,22 +1029,61 @@ repeat:
> if (!mem)
> continue;
>
> - ret = offline_memory_block(mem);
> + ret = func(mem, arg);
> if (ret) {
> - if (return_on_error) {
> - kobject_put(&mem->dev.kobj);
> - return ret;
> - } else {
> - retry = 1;
> - }
> + kobject_put(&mem->dev.kobj);
> + return ret;
> }
> }
>
> if (mem)
> kobject_put(&mem->dev.kobj);
>
> - if (retry) {
> - return_on_error = 1;
> + return 0;
> +}
> +
> +static int offline_memory_block_cb(struct memory_block *mem, void *arg)
> +{
> + int *ret = arg;
> + int error = offline_memory_block(mem);
> +
> + if (error != 0&& *ret == 0)
> + *ret = error;
> +
> + return 0;
> +}
> +
> +static int is_memblock_offlined_cb(struct memory_block *mem, void *arg)
> +{
> + int ret = !is_memblock_offlined(mem);
> +
> + if (unlikely(ret))
> + pr_warn("removing memory fails, because memory "
> + "[%#010llx-%#010llx] is onlined\n",
> + PFN_PHYS(section_nr_to_pfn(mem->start_section_nr)),
> + PFN_PHYS(section_nr_to_pfn(mem->end_section_nr + 1))-1);
> +
> + return ret;
> +}
> +
> +int remove_memory(u64 start, u64 size)
> +{
> + unsigned long start_pfn, end_pfn;
> + int ret = 0;
> + int retry = 1;
> +
> + start_pfn = PFN_DOWN(start);
> + end_pfn = start_pfn + PFN_DOWN(size);
> +
> +repeat:
> + walk_memory_range(start_pfn, end_pfn,&ret,
> + offline_memory_block_cb);
> + if (ret) {
> + if (!retry)
> + return ret;
> +
> + retry = 0;
> + ret = 0;
> goto repeat;
> }
>
> @@ -1068,37 +1101,13 @@ repeat:
> * memory blocks are offlined.
> */
>
> - for (pfn = start_pfn; pfn< end_pfn; pfn += PAGES_PER_SECTION) {
> - section_nr = pfn_to_section_nr(pfn);
> - if (!present_section_nr(section_nr))
> - continue;
> -
> - section = __nr_to_section(section_nr);
> - /* same memblock? */
> - if (mem)
> - if ((section_nr>= mem->start_section_nr)&&
> - (section_nr<= mem->end_section_nr))
> - continue;
> -
> - mem = find_memory_block_hinted(section, mem);
> - if (!mem)
> - continue;
> -
> - ret = is_memblock_offlined(mem);
> - if (!ret) {
> - pr_warn("removing memory fails, because memory "
> - "[%#010llx-%#010llx] is onlined\n",
> - PFN_PHYS(section_nr_to_pfn(mem->start_section_nr)),
> - PFN_PHYS(section_nr_to_pfn(mem->end_section_nr + 1)) - 1);
> -
> - kobject_put(&mem->dev.kobj);
> - unlock_memory_hotplug();
> - return ret;
> - }
> + ret = walk_memory_range(start_pfn, end_pfn, NULL,
> + is_memblock_offlined_cb);
> + if (ret) {
> + unlock_memory_hotplug();
> + return ret;
> }
>
> - if (mem)
> - kobject_put(&mem->dev.kobj);
> unlock_memory_hotplug();
>
> return 0;
next prev parent reply other threads:[~2012-12-04 9:23 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-27 10:00 [Patch v4 00/12] memory-hotplug: hot-remove physical memory Wen Congyang
2012-11-27 10:00 ` [Patch v4 01/12] memory-hotplug: try to offline the memory twice to avoid dependence Wen Congyang
2012-12-04 9:17 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 02/12] memory-hotplug: check whether all memory blocks are offlined or not when removing memory Wen Congyang
2012-12-04 9:22 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 03/12] memory-hotplug: remove redundant codes Wen Congyang
2012-12-04 9:22 ` Tang Chen [this message]
2012-12-04 10:31 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 04/12] memory-hotplug: remove /sys/firmware/memmap/X sysfs Wen Congyang
2012-11-27 10:00 ` [Patch v4 05/12] memory-hotplug: introduce new function arch_remove_memory() for removing page table depends on architecture Wen Congyang
2012-12-04 9:30 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 06/12] memory-hotplug: unregister memory section on SPARSEMEM_VMEMMAP Wen Congyang
2012-12-04 9:34 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 07/12] memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap Wen Congyang
2012-11-27 10:00 ` [Patch v4 08/12] memory-hotplug: remove memmap " Wen Congyang
2012-11-28 9:40 ` Jianguo Wu
2012-11-30 1:45 ` Wen Congyang
2012-11-30 2:47 ` Jianguo Wu
2012-11-30 2:55 ` Yasuaki Ishimatsu
2012-12-03 2:23 ` Jianguo Wu
2012-12-04 9:13 ` Tang Chen
2012-12-04 12:20 ` Jianguo Wu
2012-12-05 2:07 ` Tang Chen
2012-12-05 3:23 ` Jianguo Wu
2012-12-07 1:42 ` Tang Chen
2012-12-07 2:20 ` Jianguo Wu
2012-12-04 9:47 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 09/12] memory-hotplug: remove page table of x86_64 architecture Wen Congyang
2012-12-07 6:43 ` Tang Chen
2012-12-07 7:06 ` Jianguo Wu
2012-11-27 10:00 ` [Patch v4 10/12] memory-hotplug: memory_hotplug: clear zone when removing the memory Wen Congyang
2012-12-04 10:09 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 11/12] memory-hotplug: remove sysfs file of node Wen Congyang
2012-12-04 10:10 ` Tang Chen
2012-11-27 10:00 ` [Patch v4 12/12] memory-hotplug: free node_data when a node is offlined Wen Congyang
2012-12-04 10:10 ` Tang Chen
2012-11-27 19:27 ` [Patch v4 00/12] memory-hotplug: hot-remove physical memory Andrew Morton
2012-11-27 19:38 ` Rafael J. Wysocki
2012-11-28 0:43 ` Yasuaki Ishimatsu
2012-11-30 6:37 ` Tang Chen
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=50BDC0DE.4010103@cn.fujitsu.com \
--to=tangchen@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=cmetcalf@tilera.com \
--cc=isimatu.yasuaki@jp.fujitsu.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=liuj97@gmail.com \
--cc=minchan.kim@gmail.com \
--cc=paulus@samba.org \
--cc=rientjes@google.com \
--cc=sparclinux@vger.kernel.org \
--cc=wency@cn.fujitsu.com \
--cc=wujianguo@huawei.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).