From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0855C43441 for ; Mon, 12 Nov 2018 20:52:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9ADF522360 for ; Mon, 12 Nov 2018 20:52:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vS7nfoO4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9ADF522360 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730465AbeKMGrx (ORCPT ); Tue, 13 Nov 2018 01:47:53 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:44149 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725817AbeKMGrx (ORCPT ); Tue, 13 Nov 2018 01:47:53 -0500 Received: by mail-qk1-f196.google.com with SMTP id n12so15808360qkh.11; Mon, 12 Nov 2018 12:52:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=EyhaaBWejdtPNavc6SvJLFUDLhvZt4KZx1TQfdCh/Eo=; b=vS7nfoO4YriqEgp6uJNQt+Ia+TaDkWkNt5EeHSdYicS6IxFTYx45gm//FjGEk9GB8S WyzV3RSrV/W/NmvIUthBfcVt/ZdDUVIb7MNoGzkv8ESWGm91TwgENXF2WDwoef3yrHin tGVqndZEXULiF0zYYzDsHJvyN3ZdOjGwW6irySw4pEdjRnlAHd0lZ4RNoUlYt5JXtx0E nPNSTHbSd4rAc+42A+G6xVROlinBCP1Vci2A37AniPZaFy6r8Fju8TVUqOynOdZGKxrT kUHp8W8luxVJRRjNaQXcMFbVgmQRdFqaRW/k348vX00zww5+L0sSL+VYHy6ufh9cLM4Z rbaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=EyhaaBWejdtPNavc6SvJLFUDLhvZt4KZx1TQfdCh/Eo=; b=lEkf2qIQzeuFP4EGMCu1DqAx+u3q1Cw4peNQs1Vk+mqXWRpDyoLNV+JNvYtkAgbtSB Lrvdl4iw0Pl4LOngaYb1i3k4EjHmu9jvpLinFFfrt9oQM3zcI37N3bTfZTrDf7YUfAwl jB3MwkUX/m+ZJZ+0k+wv9kVz4zHzH/IbJVx/IvbTfxFanLop1Drw05W4dvWknFZMLVOE NORFAp3IdV8TStGomMm72TZYNt5KOgIXdy2NnS8CQlyQTLofz3WITHyEPAVa3Jyu1xzQ 8uF6gGAFa4GXIo0EhkyEiRR6vTkWZ2kT1qX9Ulfb9+KYz3cq337l45m2GM7v5igxFcSf FGBQ== X-Gm-Message-State: AGRZ1gKqcBTKNlQT3bU7CMkIEziw/keGM+I/3VN+bA6e48mmSb+O5T38 fNNY4umffHx3hSy4jkSIUQ== X-Google-Smtp-Source: AJdET5ca1MCJohOoDGG+ZlLV+iPf9iS2u9SX1yM3Z+jxBdCuk1cU7wZJxkyuxnZSa5J0tuNWQYvTFA== X-Received: by 2002:a0c:cb09:: with SMTP id o9mr2513793qvk.96.1542055976678; Mon, 12 Nov 2018 12:52:56 -0800 (PST) Received: from gabell (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id p3sm11272486qkp.48.2018.11.12.12.52.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Nov 2018 12:52:56 -0800 (PST) Date: Mon, 12 Nov 2018 15:52:54 -0500 From: Masayoshi Mizuma To: Chao Fan Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linux-efi@vger.kernel.org, linux-acpi@vger.kernel.org, bp@alien8.de, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, keescook@chromium.org, bhe@redhat.com, indou.takao@jp.fujitsu.com, caoj.fnst@cn.fujitsu.com Subject: Re: [PATCH v11 4/5] x86/boot: Dig out SRAT table from RSDP and find immovable memory Message-ID: <20181112205253.ji3fm37haferjpqa@gabell> References: <20181112094645.4879-1-fanc.fnst@cn.fujitsu.com> <20181112094645.4879-5-fanc.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181112094645.4879-5-fanc.fnst@cn.fujitsu.com> User-Agent: NeoMutt/20180716 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 12, 2018 at 05:46:44PM +0800, Chao Fan wrote: > To avoid KASLR extracting kernel on movable memory, slove the > conflict between KASLR and movable_node feature, dig the SRAT tables > from RSDP pointer. Walk the SRAT tables and store the immovable > memory regions in immovable_mem[]. > > There are three methods to get RSDP pointer: KEXEC condition, > EFI confition, BIOS condition. > If KEXEC add 'acpi_rsdp' to cmdline, use it. > Otherwise, parse EFI table for RSDP. > Then, search memory for RSDP. > > Imitate from ACPI code, based on acpi_os_get_root_pointer(). > Process: RSDP->RSDT/XSDT->ACPI root table->SRAT. > > Signed-off-by: Chao Fan > --- > arch/x86/boot/compressed/Makefile | 4 + > arch/x86/boot/compressed/acpitb.c | 139 ++++++++++++++++++++++++++++++ > arch/x86/boot/compressed/kaslr.c | 4 - > arch/x86/boot/compressed/misc.h | 15 ++++ > 4 files changed, 158 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile > index 466f66c8a7f8..b51f7629b8ef 100644 > --- a/arch/x86/boot/compressed/Makefile > +++ b/arch/x86/boot/compressed/Makefile > @@ -84,6 +84,10 @@ ifdef CONFIG_X86_64 > vmlinux-objs-y += $(obj)/pgtable_64.o > endif > > +#if (defined CONFIG_MEMORY_HOTREMOVE) && (defined CONFIG_RANDOMIZE_BASE) > +vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/acpitb.o > +#endif > + > $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone > > vmlinux-objs-$(CONFIG_EFI_STUB) += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o \ > diff --git a/arch/x86/boot/compressed/acpitb.c b/arch/x86/boot/compressed/acpitb.c > index 5cfb4efa5a19..161f21a7fb3b 100644 > --- a/arch/x86/boot/compressed/acpitb.c > +++ b/arch/x86/boot/compressed/acpitb.c > @@ -14,6 +14,11 @@ > #define BOOT_STRING > #include "../string.h" > > +#ifdef CONFIG_MEMORY_HOTREMOVE > +/* Store the immovable memory regions */ > +struct mem_vector immovable_mem[MAX_NUMNODES*2]; > +#endif > + > /* Search EFI table for RSDP table. */ > static void efi_get_rsdp_addr(acpi_physical_address *rsdp_addr) > { > @@ -226,3 +231,137 @@ static void get_acpi_rsdp(acpi_physical_address *rsdp_addr) > } > #endif > } > + > +/* > + * Used to dig RSDP table from EFI table or BIOS. > + * If RSDP table found in EFI table, use it. Or search BIOS. > + * Based on acpi_os_get_root_pointer(). > + */ > +static acpi_physical_address get_rsdp_addr(void) > +{ > + acpi_physical_address pa = 0; > + > + get_acpi_rsdp(&pa); > + > + if (!pa) > + efi_get_rsdp_addr(&pa); > + > + if (!pa) > + bios_get_rsdp_addr(&pa); > + > + return pa; > +} > + > +static struct acpi_table_header *get_acpi_srat_table(void) > +{ > + acpi_physical_address acpi_table; > + acpi_physical_address root_table; > + struct acpi_table_header *header; > + struct acpi_table_rsdp *rsdp; > + bool acpi_use_rsdt = false; > + char *signature; > + char arg[10]; > + u8 *entry; > + u32 count; > + u32 size; > + int i, j; > + int ret; > + u32 len; > + > + rsdp = (struct acpi_table_rsdp *)get_rsdp_addr(); > + if (!rsdp) > + return NULL; > + > + ret = cmdline_find_option("acpi", arg, sizeof(arg)); > + if (ret == 4 && !strncmp(arg, "rsdt", 4)) > + acpi_use_rsdt = true; All have to do for ret is checking whether it's above 0, right? So how about the following? if ((cmdline_find_option("acpi", arg, sizeof(arg)) > 0) && !strncmp(arg, "rsdt", 4)) acpi_use_rsdt = true; > + > + /* Get RSDT or XSDT from RSDP. */ > + if (!acpi_use_rsdt && > + rsdp->xsdt_physical_address && rsdp->revision > 1) { > + root_table = rsdp->xsdt_physical_address; > + size = ACPI_XSDT_ENTRY_SIZE; > + } else { > + root_table = rsdp->rsdt_physical_address; > + size = ACPI_RSDT_ENTRY_SIZE; > + } > + > + /* Get ACPI root table from RSDT or XSDT.*/ > + header = (struct acpi_table_header *)root_table; > + len = header->length; > + count = (u32)((len - sizeof(struct acpi_table_header)) / size); > + entry = ACPI_ADD_PTR(u8, header, sizeof(struct acpi_table_header)); > + > + for (i = 0; i < count; i++) { > + u64 address64; > + > + if (size == ACPI_RSDT_ENTRY_SIZE) > + acpi_table = ((acpi_physical_address) > + (*ACPI_CAST_PTR(u32, entry))); > + else { > + *(u64 *)(void *)&address64 = *(u64 *)(void *)entry; > + acpi_table = (acpi_physical_address) address64; > + } > + > + if (acpi_table) { > + header = (struct acpi_table_header *)acpi_table; > + signature = header->signature; this isn't needed. > + > + if (ACPI_COMPARE_NAME(header->signature, ACPI_SIG_SRAT)) > + return header; > + } > + entry += size; > + } > + return NULL; > +} > + > +/* > + * According to ACPI table, filter the immvoable memory regions > + * and store them in immovable_mem[]. > + */ > +void get_immovable_mem(void) > +{ > + struct acpi_table_header *table_header; > + struct acpi_subtable_header *table; > + struct acpi_srat_mem_affinity *ma; > + unsigned long table_end; > + char arg[10]; > + int i = 0; > + int ret; > + > + ret = cmdline_find_option("acpi", arg, sizeof(arg)); > + if (ret == 3 && !strncmp(arg, "off", 3)) > + return; Same as above. if ((cmdline_find_option("acpi", arg, sizeof(arg)) > 0) && !strncmp(arg, "off", 3)) return; > + > + if (!cmdline_find_option_bool("movable_node")) > + return; I think this check isn't needed. The SRAT parsing is needed to the kaslr issue which I'm trying to fix. The issue may happen even if movable_node isn't set. > + > + table_header = get_acpi_srat_table(); > + if (!table_header) > + return; > + > + table_end = (unsigned long)table_header + table_header->length; > + > + table = (struct acpi_subtable_header *) > + ((unsigned long)table_header + sizeof(struct acpi_table_srat)); > + > + while (((unsigned long)table) + > + sizeof(struct acpi_subtable_header) < table_end) { > + if (table->type == ACPI_SRAT_TYPE_MEMORY_AFFINITY) { > + ma = (struct acpi_srat_mem_affinity *)table; > + if (!(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)) { > + immovable_mem[i].start = ma->base_address; > + immovable_mem[i].size = ma->length; > + i++; > + } > + > + if (i >= MAX_NUMNODES*2) { > + debug_putstr("Too many immovable memory regions, aborted.\n"); I'm not sure this statement gets true actually, but if so, should it be set 0 to fallback in process_mem_region()? Thanks, Masa > + break; > + } > + } > + table = (struct acpi_subtable_header *) > + ((unsigned long)table + table->length); > + } > + num_immovable_mem = i; > +} > diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c > index 9ed9709d9947..b251572e77af 100644 > --- a/arch/x86/boot/compressed/kaslr.c > +++ b/arch/x86/boot/compressed/kaslr.c > @@ -87,10 +87,6 @@ static unsigned long get_boot_seed(void) > #define KASLR_COMPRESSED_BOOT > #include "../../lib/kaslr.c" > > -struct mem_vector { > - unsigned long long start; > - unsigned long long size; > -}; > > /* Only supporting at most 4 unusable memmap regions with kaslr */ > #define MAX_MEMMAP_REGIONS 4 > diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h > index a1d5918765f3..4a3645fda0ed 100644 > --- a/arch/x86/boot/compressed/misc.h > +++ b/arch/x86/boot/compressed/misc.h > @@ -77,6 +77,11 @@ void choose_random_location(unsigned long input, > unsigned long *output, > unsigned long output_size, > unsigned long *virt_addr); > +struct mem_vector { > + unsigned long long start; > + unsigned long long size; > +}; > + > /* cpuflags.c */ > bool has_cpuflag(int flag); > #else > @@ -116,3 +121,13 @@ static inline void console_init(void) > void set_sev_encryption_mask(void); > > #endif > + > +/* acpitb.c */ > +#ifdef CONFIG_RANDOMIZE_BASE > +int num_immovable_mem; > +#ifdef CONFIG_MEMORY_HOTREMOVE > +/* Store the amount of immovable memory regions */ > +#define ACPI_MAX_TABLES 128 > +void get_immovable_mem(void); > +#endif > +#endif > -- > 2.19.1 > > >