From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753075AbeARBP1 (ORCPT ); Wed, 17 Jan 2018 20:15:27 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:45625 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752891AbeARBPX (ORCPT ); Wed, 17 Jan 2018 20:15:23 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35427017" Date: Thu, 18 Jan 2018 09:13:57 +0800 From: Chao Fan To: Baoquan He CC: , , , , , , , , Subject: Re: [PATCH v7 4/5] x86/KASLR: Skip memory mirror handling if movable_node specified Message-ID: <20180118011356.GB24593@localhost.localdomain> References: <20180117105351.12226-1-fanc.fnst@cn.fujitsu.com> <20180117105351.12226-5-fanc.fnst@cn.fujitsu.com> <20180117140354.GH2321@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20180117140354.GH2321@localhost.localdomain> User-Agent: Mutt/1.9.1 (2017-09-22) X-Originating-IP: [10.167.225.56] X-yoursite-MailScanner-ID: 6D90C480D736.A8F55 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 On Wed, Jan 17, 2018 at 10:03:54PM +0800, Baoquan He wrote: >On 01/17/18 at 06:53pm, Chao Fan wrote: >> 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 dca846b522fc..84b9db26d026 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 or immovable_mem specified */ > ~~~~~~~~~~~~~ > ^^ need be removed? Yes, sorry for the mistake, I change the old versions and miss some points. Will change that. Thanks, Chao Fan >> + 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 >> >> >> > >