From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755427AbeASDfJ (ORCPT ); Thu, 18 Jan 2018 22:35:09 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:35685 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754836AbeASDfG (ORCPT ); Thu, 18 Jan 2018 22:35:06 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35462345" From: Chao Fan To: , , , , , , , CC: , , Chao Fan Subject: [PATCH v8 4/5] x86/KASLR: Skip memory mirror handling if movable_node specified Date: Fri, 19 Jan 2018 11:33:52 +0800 Message-ID: <20180119033352.22112-1-fanc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180117105351.12226-5-fanc.fnst@cn.fujitsu.com> References: <20180117105351.12226-5-fanc.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: 97B3848AEA17.A9E5B 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 In kernel code, if movable_node specified, it will skip the mirror feature. So we should also skip mirror feature in KASLR. Signed-off-by: Chao Fan --- arch/x86/boot/compressed/kaslr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 8703cc764306..e4b487f0b7af 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -692,6 +692,7 @@ static bool process_efi_entries(unsigned long minimum, unsigned long image_size) { struct efi_info *e = &boot_params->efi_info; + char *args = (char *)get_cmd_line_ptr(); bool efi_mirror_found = false; struct mem_vector region; efi_memory_desc_t *md; @@ -725,6 +726,12 @@ process_efi_entries(unsigned long minimum, unsigned long image_size) } } +#ifdef CONFIG_MEMORY_HOTPLUG + /* Skip memory mirror if 'movabale_node' specified */ + if (strstr(args, "movable_node")) + efi_mirror_found = false; +#endif + for (i = 0; i < nr_desc; i++) { md = efi_early_memdesc_ptr(pmap, e->efi_memdesc_size, i); -- 2.14.3