Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965935AbeAOMlX (ORCPT + 1 other); Mon, 15 Jan 2018 07:41:23 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:62695 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965884AbeAOMlS (ORCPT ); Mon, 15 Jan 2018 07:41:18 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35325135" From: Chao Fan To: , , , , , , , CC: , , Chao Fan Subject: [PATCH v6 2/5] kaslr: give a warning if movable_node specified without kaslr_mem= Date: Mon, 15 Jan 2018 20:40:13 +0800 Message-ID: <20180115124016.17683-3-fanc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180115124016.17683-1-fanc.fnst@cn.fujitsu.com> References: <20180115124016.17683-1-fanc.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: A4BFE48AEA0D.AC1C9 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: fanc.fnst@cn.fujitsu.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Signed-off-by: Chao Fan --- arch/x86/boot/compressed/kaslr.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index b071f6edd7b2..38816d3f8865 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -282,6 +282,16 @@ static int handle_mem_filter(void) !strstr(args, "kaslr_mem=")) return 0; +#ifdef CONFIG_MEMORY_HOTPLUG + /* + * Check if "kaslr_mem=" specified when "movable_node" found. If not, + * just give warrning. Otherwise memory hotplug could be + * affected if kernel put on movable memory regions. + */ + if (strstr(args, "movable_node") && !strstr(args, "kaslr_mem=")) + warn("kaslr_mem= should specified when using movable_node.\n"); +#endif + tmp_cmdline = malloc(len + 1); if (!tmp_cmdline) error("Failed to allocate space for tmp_cmdline"); -- 2.14.3