Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp5595723imm; Mon, 23 Jul 2018 02:33:07 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcb9JqHXs0Hr73dVJRDdb9v26M63yuzohRyPQbCHU/OxXJNID+7WTimDczpP12J1R99oIRa X-Received: by 2002:a63:6fcc:: with SMTP id k195-v6mr11622231pgc.135.1532338387515; Mon, 23 Jul 2018 02:33:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532338387; cv=none; d=google.com; s=arc-20160816; b=1BhHOu3AOKW1hnYbVR4HBgjLKZFoxSn7PyN91/S9ZMkWOTfSpma84cb+nkGs4KVDLs wRqDDokS2T2OVhSlV4r3RmbYnxOzFCW8KyBLdI8Z5LPPzvHVaWhzXzB2gFa6efisG/iq ugDmBCrbRQMZlq3n5Qnr6yot1NbIG49PJXjy/h9upMYFawASxiV/Wgcb4xBwKpu3nSf7 fXs/UpEeMrc2aEGfKQPg9cF1dI6mdjThGJVpZk3QeNKKQ2fZoAh7oDvM5m+l6Q/9vTTu n5k42C6HGVAk+3JEFm4GTZCBobXw8GO++M9Wm1XVMKJvLUvKV1TXRpX9RKg4ZSIabF3w U6gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=/6PVv872lwMx6X71RfmUW4qvMbX1d20BEw1H6YrS0K4=; b=KEqDxdOAMsLzKmgdGjoa9s2PNs0QUTzF6Rp7AyLtThsj6xBv8MeIk6DcV3mCdAv5+X DoOzAgmrv0CClVuPJ7Wh+JYhGLKVOhm8o72H2hUH+f5yrYAaoMuWZIIp/HtNGN73r7HV QEFTf41lCgeVhsp/cBG2ZCU8gT0QGWGDPKjeviuWJZb+XA+1b68+bty4K5BVpAY3ptu+ HbbsaKUuYk7xL755qQIDCUVbuccoz+M9tCATV3SVe9e8zePYjNbdjuRcKrDLwwWXJ6D2 4mSKiHOCOI93URRxQlx0YApW+LiwFdY3sFESNhlf1vdR9R89tMfkwrrICOG82MXC6YdK ZGLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a1-v6si8032820pli.472.2018.07.23.02.32.53; Mon, 23 Jul 2018 02:33:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388257AbeGWKbo (ORCPT + 99 others); Mon, 23 Jul 2018 06:31:44 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:25501 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388151AbeGWKbo (ORCPT ); Mon, 23 Jul 2018 06:31:44 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="42543718" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 23 Jul 2018 17:31:13 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id A59E04B66A22; Mon, 23 Jul 2018 17:31:14 +0800 (CST) Received: from localhost (10.167.225.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.399.0; Mon, 23 Jul 2018 17:31:15 +0800 From: Chao Fan To: , , , , , , , CC: , , , Chao Fan Subject: [PATCH v4 3/4] x86/boot/KASLR: Walk srat tables to filter immovable memory Date: Mon, 23 Jul 2018 17:29:07 +0800 Message-ID: <20180723092908.32656-4-fanc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723092908.32656-1-fanc.fnst@cn.fujitsu.com> References: <20180723092908.32656-1-fanc.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: A59E04B66A22.AAA63 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: fanc.fnst@cn.fujitsu.com X-Spam-Status: No Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If 'CONFIG_MEMORY_HOTREMOVE' specified, walk the acpi srat memory tables, store the immovable memory regions, so that kaslr can get the information abouth where can be selected or not. If 'CONFIG_MEMORY_HOTREMOVE' not specified, go on the old code. Signed-off-by: Chao Fan --- arch/x86/boot/compressed/kaslr.c | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 531c9876f573..4705682caf1f 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -31,6 +31,7 @@ #include "misc.h" #include "error.h" +#include "acpitb.h" #include "../string.h" #include @@ -104,6 +105,14 @@ static bool memmap_too_large; /* Store memory limit specified by "mem=nn[KMG]" or "memmap=nn[KMG]" */ unsigned long long mem_limit = ULLONG_MAX; +#ifdef CONFIG_MEMORY_HOTREMOVE +/* Store the immovable memory regions */ +struct mem_vector immovable_mem[MAX_NUMNODES*2]; + +/* Store the amount of immovable memory regions */ +static int num_immovable_mem; +#endif + enum mem_avoid_index { MEM_AVOID_ZO_RANGE = 0, @@ -298,6 +307,47 @@ static int handle_mem_options(void) return 0; } +#ifdef CONFIG_MEMORY_HOTREMOVE +/* + * According to ACPI table, filter the immvoable memory regions + * and store them in immovable_mem[]. + */ +static void handle_immovable_mem(void) +{ + struct acpi_table_header *table_header; + struct acpi_subtable_header *table; + struct acpi_srat_mem_affinity *ma; + unsigned long table_size; + unsigned long table_end; + int i = 0; + + 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)); + + table_size = sizeof(struct acpi_subtable_header); + while (((unsigned long)table) + table->length < table_end) { + if (table->type == 1) { + 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++; + } + } + table = (struct acpi_subtable_header *) + ((unsigned long)table + table->length); + } + num_immovable_mem = i; +} +#endif + /* * In theory, KASLR can put the kernel anywhere in the range of [16M, 64T). * The mem_avoid array is used to store the ranges that need to be avoided @@ -421,6 +471,11 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size, /* Mark the memmap regions we need to avoid */ handle_mem_options(); +#ifdef CONFIG_MEMORY_HOTREMOVE + /* Mark the immovable regions we need to choose */ + handle_immovable_mem(); +#endif + #ifdef CONFIG_X86_VERBOSE_BOOTUP /* Make sure video RAM can be used. */ add_identity_map(0, PMD_SIZE); -- 2.17.1