public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Yasuaki Ishimatsu <isimatu.yasuaki@jp•fujitsu.com>
To: <linux-mm@kvack•org>, <linux-kernel@vger•kernel.org>,
	<linuxppc-dev@lists•ozlabs.org>, <linux-acpi@vger•kernel.org>
Cc: len.brown@intel•com, wency@cn•fujitsu.com, paulus@samba•org,
	minchan.kim@gmail•com, kosaki.motohiro@jp•fujitsu.com,
	cl@linux•com, akpm@linux-foundation•org
Subject: [RFC PATCH 5/12] memory-hotplug : does not release memory region in PAGES_PER_SECTION chunks
Date: Wed, 27 Jun 2012 14:48:31 +0900	[thread overview]
Message-ID: <4FEA9EAF.1060608@jp.fujitsu.com> (raw)
In-Reply-To: <4FEA9C88.1070800@jp.fujitsu.com>

Since applying a patch(de7f0cba96786c), release_mem_region() has been changed
as called in PAGES_PER_SECTION chunks because register_memory_resource() is
called in PAGES_PER_SECTION chunks by add_memory(). But it seems firmware
dependency. If CRS are written in the PAGES_PER_SECTION chunks in ACPI DSDT
Table, register_memory_resource() is called in PAGES_PER_SECTION chunks.
But if CRS are written in the DIMM unit in ACPI DSDT Table,
register_memory_resource() is called in DIMM unit. So release_mem_region()
should not be called in PAGES_PER_SECTION chunks. The patch fixes it.

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>
CC: Wen Congyang <wency@cn•fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp•fujitsu.com>

---
 arch/powerpc/platforms/pseries/hotplug-memory.c |   13 +++++++++----
 mm/memory_hotplug.c                             |    4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

Index: linux-3.5-rc4/mm/memory_hotplug.c
===================================================================
--- linux-3.5-rc4.orig/mm/memory_hotplug.c	2012-06-26 13:50:57.075205100 +0900
+++ linux-3.5-rc4/mm/memory_hotplug.c	2012-06-26 13:55:36.152716100 +0900
@@ -358,11 +358,11 @@ int __remove_pages(struct zone *zone, un
 	BUG_ON(phys_start_pfn & ~PAGE_SECTION_MASK);
 	BUG_ON(nr_pages % PAGES_PER_SECTION);

+	release_mem_region(phys_start_pfn << PAGE_SHIFT,  nr_pages * PAGE_SIZE);
+
 	sections_to_remove = nr_pages / PAGES_PER_SECTION;
 	for (i = 0; i < sections_to_remove; i++) {
 		unsigned long pfn = phys_start_pfn + i*PAGES_PER_SECTION;
-		release_mem_region(pfn << PAGE_SHIFT,
-				   PAGES_PER_SECTION << PAGE_SHIFT);
 		ret = __remove_section(zone, __pfn_to_section(pfn));
 		if (ret)
 			break;
Index: linux-3.5-rc4/arch/powerpc/platforms/pseries/hotplug-memory.c
===================================================================
--- linux-3.5-rc4.orig/arch/powerpc/platforms/pseries/hotplug-memory.c	2012-06-26 13:50:57.075205100
+0900
+++ linux-3.5-rc4/arch/powerpc/platforms/pseries/hotplug-memory.c	2012-06-26 13:55:36.153716088 +0900
@@ -77,7 +77,8 @@ static int pseries_remove_memblock(unsig
 {
 	unsigned long start, start_pfn;
 	struct zone *zone;
-	int ret;
+	int i, ret;
+	int sections_to_remove;

 	start_pfn = base >> PAGE_SHIFT;

@@ -97,9 +98,13 @@ static int pseries_remove_memblock(unsig
 	 * to sysfs "state" file and we can't remove sysfs entries
 	 * while writing to it. So we have to defer it to here.
 	 */
-	ret = __remove_pages(zone, start_pfn, memblock_size >> PAGE_SHIFT);
-	if (ret)
-		return ret;
+	sections_to_remove = (memblock_size >> PAGE_SHIFT) / PAGES_PER_SECTION;
+	for (i = 0; i < sections_to_remove; i++) {
+		unsigned long pfn = start_pfn + i * PAGES_PER_SECTION;
+		ret = __remove_pages(zone, start_pfn,  PAGES_PER_SECTION);
+		if (ret)
+			return ret;
+	}

 	/*
 	 * Update memory regions for memory remove

  parent reply	other threads:[~2012-06-27  5:48 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-27  5:39 [RFC PATCH 0/12] memory-hotplug : hot-remove physical memory Yasuaki Ishimatsu
2012-06-27  5:42 ` [RFC PATCH 1/12] memory-hotplug : rename remove_memory to offline_memory Yasuaki Ishimatsu
2012-06-27  6:10   ` David Rientjes
2012-06-27  7:14   ` Wen Congyang
2012-06-27  8:47     ` Wen Congyang
2012-06-28  3:01       ` Yasuaki Ishimatsu
2012-06-28  3:25         ` Wen Congyang
2012-06-28  4:50           ` Yasuaki Ishimatsu
2012-06-27  5:44 ` [RFC PATCH 2/12] memory-hogplug : check memory offline in offline_pages Yasuaki Ishimatsu
2012-06-27  6:16   ` David Rientjes
2012-06-28  7:01     ` Yasuaki Ishimatsu
2012-06-27  8:49   ` Wen Congyang
2012-06-28  5:06     ` Yasuaki Ishimatsu
2012-06-28  5:27       ` KOSAKI Motohiro
2012-06-28  6:01         ` Yasuaki Ishimatsu
2012-06-28  5:26   ` KOSAKI Motohiro
2012-06-28  6:51     ` Yasuaki Ishimatsu
2012-06-30 15:46   ` Jiang Liu
2012-07-02  2:53     ` Yasuaki Ishimatsu
2012-06-30 15:51   ` Jiang Liu
2012-07-02  2:56     ` Yasuaki Ishimatsu
2012-06-27  5:45 ` [RFC PATCH 3/12] memory-hotplug : add physical memory hotplug code to acpi_memory_device_remove Yasuaki Ishimatsu
2012-06-27  5:47 ` [RFC PATCH 4/12] memory-hotplug : remove /sys/firmware/memmap/X sysfs Yasuaki Ishimatsu
2012-06-28  6:32   ` Wen Congyang
2012-06-28  8:07     ` Yasuaki Ishimatsu
2012-06-28  8:38       ` Wen Congyang
2012-06-29  3:09         ` Yasuaki Ishimatsu
2012-06-27  5:48 ` Yasuaki Ishimatsu [this message]
2012-06-27  5:52 ` [RFC PATCH 6/12] memory-hotplug : remove_memory calls __remove_pages Yasuaki Ishimatsu
2012-06-27  5:53 ` [RFC PATCH 7/12] memory-hotplug : check page type in get_page_bootmem Yasuaki Ishimatsu
2012-06-27  5:54 ` [RFC PATCH 8/12] memory-hotplug : move register_page_bootmem_info_node and put_page_bootmem for sparse-vmemmap Yasuaki Ishimatsu
2012-06-27  5:55 ` [RFC PATCH 9/12] memory-hotplug : implement register_page_bootmem_info_section of sparse-vmemmap Yasuaki Ishimatsu
2012-06-27  5:56 ` [RFC PATCH 10/12] memory-hotplug : free memmap " Yasuaki Ishimatsu
2012-06-30 15:58   ` Jiang Liu
2012-07-02  3:01     ` Yasuaki Ishimatsu
2012-06-27  5:57 ` [RFC PATCH 11/12] memory-hotplug : add node_device_release Yasuaki Ishimatsu
2012-06-27  5:59 ` [RFC PATCH 12/12] memory-hotplug : remove sysfs file of node 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=4FEA9EAF.1060608@jp.fujitsu.com \
    --to=isimatu.yasuaki@jp$(echo .)fujitsu.com \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=cl@linux$(echo .)com \
    --cc=kosaki.motohiro@jp$(echo .)fujitsu.com \
    --cc=len.brown@intel$(echo .)com \
    --cc=linux-acpi@vger$(echo .)kernel.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-mm@kvack$(echo .)org \
    --cc=linuxppc-dev@lists$(echo .)ozlabs.org \
    --cc=minchan.kim@gmail$(echo .)com \
    --cc=paulus@samba$(echo .)org \
    --cc=wency@cn$(echo .)fujitsu.com \
    /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