From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx163.postini.com [74.125.245.163]) by kanga.kvack.org (Postfix) with SMTP id 4B31F6B005D for ; Tue, 4 Dec 2012 05:11:12 -0500 (EST) Message-ID: <50BDCC05.7090800@cn.fujitsu.com> Date: Tue, 04 Dec 2012 18:10:13 +0800 From: Tang Chen MIME-Version: 1.0 Subject: Re: [Patch v4 12/12] memory-hotplug: free node_data when a node is offlined References: <1354010422-19648-1-git-send-email-wency@cn.fujitsu.com> <1354010422-19648-13-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1354010422-19648-13-git-send-email-wency@cn.fujitsu.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: owner-linux-mm@kvack.org List-ID: To: Wen Congyang Cc: 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, David Rientjes , Jiang Liu , Len Brown , benh@kernel.crashing.org, paulus@samba.org, Christoph Lameter , Minchan Kim , Andrew Morton , KOSAKI Motohiro , Yasuaki Ishimatsu , Jianguo Wu On 11/27/2012 06:00 PM, Wen Congyang wrote: > We call hotadd_new_pgdat() to allocate memory to store node_data. So we > should free it when removing a node. > > 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: Yasuaki Ishimatsu > Signed-off-by: Wen Congyang Reviewed-by: Tang Chen > --- > 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 449663e..d1451ab 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1309,9 +1309,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); > @@ -1338,6 +1341,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) -- 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