This message generated a parse failure. Raw output follows here. Please use 'back' to navigate. From devnull@lkml.org Thu May 16 13:28:50 2024 >From spaans Tue Sep 15 09:59:32 2015 Received: from pop.ziggo.nl [212.54.42.19] by squeeze.vs19.net with POP3 (fetchmail-6.3.21) for (single-drop); Tue, 15 Sep 2015 09:59:32 +0200 (CEST) Received: from md2.tb.mail.iss.local ([212.54.42.150]) by mc5.tb.mail.iss.local (Dovecot) with LMTP id oiKGJ/fN91XrAgAAh0Kp1A for ; Tue, 15 Sep 2015 09:51:31 +0200 Received: from mx22.tb.mail.iss.as9143.net ([212.54.42.150]) by md2.tb.mail.iss.local (Dovecot) with LMTP id M2xQCtsW1VWDSgAAH7GgQA ; Tue, 15 Sep 2015 09:54:40 +0200 Received: from vger.kernel.org ([209.132.180.67]) by mx22.tb.mail.iss.as9143.net with esmtp (Exim 4.82) (envelope-from ) id 1Zbl1X-0004Q1-EP for bmw12-lkml@ziggo.nl; Tue, 15 Sep 2015 09:51:31 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752142AbbIOHvV (ORCPT ); Tue, 15 Sep 2015 03:51:21 -0400 Received: from unicom146.biz-email.net ([210.51.26.146]:4210 "EHLO unicom146.biz-email.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751997AbbIOHvU (ORCPT ); Tue, 15 Sep 2015 03:51:20 -0400 Received: from ([218.57.135.44]) by unicom146.biz-email.net (Antispam) with ASMTP (SSL) id CQO83521; Tue, 15 Sep 2015 15:51:21 +0800 Received: from localhost.localdomain.localdomain (10.165.23.10) by jtjncas01.home.langchao.com (172.30.26.26) with Microsoft SMTP Server (TLS) id 14.2.247.3; Tue, 15 Sep 2015 15:48:58 +0800 From: Changsheng Liu To: , , , Cc: , , , , , , Changsheng Liu Subject: [PATCH V5] mm: memory hot-add: memory can not be added to movable zone defaultly Date: Tue, 15 Sep 2015 03:49:58 -0400 Message-Id: <1442303398-45536-1-git-send-email-liuchangsheng@inspur.com> X-Mailer: git-send-email 1.8.3.1 Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.165.23.10] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-Id: X-Mailing-List: linux-kernel@vger.kernel.org X-Ziggo-spamsetting: Instelling=Gemiddeld Scorelimiet=14 X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.1 cv=bJPrW6KZ c=1 sm=0 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:17 a=F_93P0QhAAAA:8 a=VwQbUJbxAAAA:8 a=cIF5Tx0qAAAA:8 a=BLE8lCvwAAAA:8 a=0jtCW6QvAAAA:8 a=S6Gp8XqlwZQA:10 a=IkcTkHD0fZMA:10 a=ff-B7xzCdYMA:10 a=W0vUJOdyAAAA:8 a=9TU-HWEIip78udMLwlI X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No From: Changsheng Liu After the user config CONFIG_MOVABLE_NODE and movable_node kernel option, When the memory is hot added, should_add_memory_movable() return 0 because all zones including movable zone are empty, so the memory that was hot added will be added to the normal zone and the normal zone will be created firstly. But we want the whole node to be added to movable zone defaultly. So we change should_add_memory_movable(): if the user config CONFIG_MOVABLE_NODE and movable_node kernel option it will always return 1 and all zones is empty at the same time, so that the movable zone will be created firstly and then the whole node will be added to movable zone defaultly. If we want the node to be added to normal zone, we can do it as follows: "echo online_kernel > /sys/devices/system/memory/memoryXXX/state" Signed-off-by: Xiaofeng Yan Signed-off-by: Changsheng Liu Tested-by: Dongdong Fan --- mm/memory_hotplug.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 26fbba7..d39dbb0 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1190,6 +1190,9 @@ static int check_hotplug_memory_range(u64 start, u64 size) /* * If movable zone has already been setup, newly added memory should be check. * If its address is higher than movable zone, it should be added as movable. + * And if system boots up with movable_node and config CONFIG_MOVABLE_NOD and + * added memory does not overlap the zone before MOVABLE_ZONE, + * the memory is added as movable * Without this check, movable zone may overlap with other zone. */ static int should_add_memory_movable(int nid, u64 start, u64 size) @@ -1197,6 +1200,11 @@ static int should_add_memory_movable(int nid, u64 start, u64 size) unsigned long start_pfn = start >> PAGE_SHIFT; pg_data_t *pgdat = NODE_DATA(nid); struct zone *movable_zone = pgdat->node_zones + ZONE_MOVABLE; + struct zone *pre_zone = pgdat->node_zones + (ZONE_MOVABLE - 1); + + if (movable_node_is_enabled() + && zone_end_pfn(pre_zone) <= start_pfn) + return 1; if (zone_is_empty(movable_zone)) return 0; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/