linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Wen Congyang <wency@cn.fujitsu.com>
To: x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	linuxppc-dev@lists.ozlabs.org, linux-acpi@vger.kernel.org,
	linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
	linux-ia64@vger.kernel.org, cmetcalf@tilera.com,
	sparclinux@vger.kernel.org
Cc: Len Brown <len.brown@intel.com>,
	Wen Congyang <wency@cn.fujitsu.com>,
	Jianguo Wu <wujianguo@huawei.com>,
	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>,
	Christoph Lameter <cl@linux.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jiang Liu <liuj97@gmail.com>
Subject: [PATCH v3 12/12] memory-hotplug: free node_data when a node is offlined
Date: Thu, 1 Nov 2012 17:44:43 +0800	[thread overview]
Message-ID: <1351763083-7905-13-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1351763083-7905-1-git-send-email-wency@cn.fujitsu.com>

We call hotadd_new_pgdat() to allocate memory to store node_data. So we
should free it when removing a node.

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>
CC: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
 mm/memory_hotplug.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index d965da3..e281c31 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1320,9 +1320,12 @@ static int check_cpu_on_node(void *data)
 /* offline the node if all memory sections of this node are removed */
 static void try_offline_node(int nid)
 {
+	pg_data_t *pgdat = NODE_DATA(nid);
 	unsigned long start_pfn = NODE_DATA(nid)->node_start_pfn;
-	unsigned long end_pfn = start_pfn + NODE_DATA(nid)->node_spanned_pages;
+	unsigned long end_pfn = start_pfn + pgdat->node_spanned_pages;
 	unsigned long pfn;
+	struct page *pgdat_page = virt_to_page(pgdat);
+	int i;
 
 	for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
 		unsigned long section_nr = pfn_to_section_nr(pfn);
@@ -1349,6 +1352,21 @@ static void try_offline_node(int nid)
 	 */
 	node_set_offline(nid);
 	unregister_one_node(nid);
+
+	if (!PageSlab(pgdat_page) && !PageCompound(pgdat_page))
+		/* node data is allocated from boot memory */
+		return;
+
+	/* free waittable in each zone */
+	for (i = 0; i < MAX_NR_ZONES; i++) {
+		struct zone *zone = pgdat->node_zones + i;
+
+		if (zone->wait_table)
+			vfree(zone->wait_table);
+	}
+
+	arch_refresh_nodedata(nid, NULL);
+	arch_free_nodedata(pgdat);
 }
 
 int __ref remove_memory(int nid, u64 start, u64 size)
-- 
1.8.0

  parent reply	other threads:[~2012-11-01  9:48 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-01  9:44 [PATCH v3 00/12] memory-hotplug: hot-remove physical memory Wen Congyang
2012-11-01  9:44 ` [PATCH v3 01/12] memory-hotplug: try to offline the memory twice to avoid dependence Wen Congyang
2012-11-01  9:44 ` [PATCH v3 02/12] memory-hotplug: check whether all memory blocks are offlined or not when removing memory Wen Congyang
2012-11-01  9:44 ` [PATCH v3 03/12] memory-hotplug: remove redundant codes Wen Congyang
2012-11-01  9:44 ` [PATCH v3 04/12] memory-hotplug: remove /sys/firmware/memmap/X sysfs Wen Congyang
2012-11-01  9:44 ` [PATCH v3 05/12] memory-hotplug: introduce new function arch_remove_memory() for removing page table depends on architecture Wen Congyang
2012-11-01  9:44 ` [PATCH v3 06/12] memory-hotplug: unregister memory section on SPARSEMEM_VMEMMAP Wen Congyang
2012-11-20  6:22   ` Jaegeuk Hanse
2012-11-20  6:55     ` Wen Congyang
2012-11-20  6:58       ` Jaegeuk Hanse
2012-11-20  9:37         ` Wen Congyang
2012-11-20 11:03           ` Jaegeuk Hanse
2012-11-20 11:16   ` Jaegeuk Hanse
2012-11-21  3:05     ` Wen Congyang
2012-11-21  4:22       ` Jaegeuk Hanse
2012-11-21  4:42         ` Wen Congyang
2012-11-21  5:03           ` Jaegeuk Hanse
2012-11-21  5:12             ` Wen Congyang
2012-11-21  5:28             ` Wen Congyang
2012-11-01  9:44 ` [PATCH v3 07/12] memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap Wen Congyang
2012-11-01  9:44 ` [PATCH v3 08/12] memory-hotplug: remove memmap " Wen Congyang
2012-11-27  5:47   ` Jianguo Wu
2012-11-27  6:39     ` Wen Congyang
2012-11-27  6:49     ` Wen Congyang
2012-11-27  7:14       ` Jianguo Wu
2012-11-01  9:44 ` [PATCH v3 09/12] memory-hotplug: remove page table of x86_64 architecture Wen Congyang
2012-11-01  9:44 ` [PATCH v3 10/12] memory-hotplug: memory_hotplug: clear zone when removing the memory Wen Congyang
2012-11-01  9:44 ` [PATCH v3 11/12] memory-hotplug: remove sysfs file of node Wen Congyang
2012-11-19 10:08   ` Yasuaki Ishimatsu
2012-11-20  9:35     ` Wen Congyang
2012-11-26 14:27   ` Jianguo Wu
2012-11-27  2:24     ` Wen Congyang
2012-11-01  9:44 ` Wen Congyang [this message]
2012-11-16 11:55 ` [PATCH v3 00/12] memory-hotplug: hot-remove physical memory Wen Congyang
2012-11-22  1:33 ` 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=1351763083-7905-13-git-send-email-wency@cn.fujitsu.com \
    --to=wency@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=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).