From: Masayoshi Mizuma <msys.mizuma@gmail.com>
To: Borislav Petkov <bp@alien8.de>
Cc: Baoquan He <bhe@redhat.com>, Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Chao Fan <fanc.fnst@cn.fujitsu.com>,
linux-kernel@vger.kernel.org, x86@kernel.org,
linux-efi@vger.kernel.org, linux-acpi@vger.kernel.org,
mingo@redhat.com, hpa@zytor.com, keescook@chromium.org,
rjw@rjwysocki.net, lenb@kernel.org, ard.biesheuvel@linaro.org,
indou.takao@jp.fujitsu.com, caoj.fnst@cn.fujitsu.com
Subject: Re: [PATCH v8 0/3] x86/boot/KASLR: Parse ACPI table and limit kaslr in immovable memory
Date: Mon, 22 Oct 2018 11:42:05 -0400 [thread overview]
Message-ID: <20181022154204.kagmdb55jtoez4ca@gabell> (raw)
In-Reply-To: <20181016195902.GK5212@zn.tnic>
Hi Boris,
On Tue, Oct 16, 2018 at 09:59:02PM +0200, Borislav Petkov wrote:
> On Tue, Oct 16, 2018 at 03:54:30PM -0400, Masayoshi Mizuma wrote:
> > Ah, sorry, I misunderstood your suggetion...
> > In parse_setup_data(), the data is picked up from boot_params,
>
> Yes, this is the pointer to the setup_data linked list head. See
>
> Documentation/ABI/testing/sysfs-kernel-boot_params
> Documentation/x86/boot.txt
>
> for more information and basically grep the tree for examples.
I'm trying to store the SRAT info and pass it to kernel_randomize_memory(),
looks like add_e820ext()/parse_setup_data().
Is the approach useful only EFI environment? I'm not sure how I
allocate memory to store the data in legacy bios environment...
On EFI, I can use efi_call_early(allocate_pool, EFI_LOADER_DATA, ...).
Am I missing something? I would appreciate if you could help my
understanding.
Following patch is a prototype for EFI enviromnent.
---
arch/x86/boot/compressed/acpitb.c | 23 ++++++++++-
arch/x86/boot/compressed/eboot.c | 36 +++++++++++++++++
arch/x86/include/uapi/asm/bootparam.h | 1 +
arch/x86/mm/kaslr.c | 58 ++++++++++++++++++++++++++-
4 files changed, 116 insertions(+), 2 deletions(-)
diff --git a/arch/x86/boot/compressed/acpitb.c b/arch/x86/boot/compressed/acpitb.c
index d119663..b79560c 100644
--- a/arch/x86/boot/compressed/acpitb.c
+++ b/arch/x86/boot/compressed/acpitb.c
@@ -309,6 +309,20 @@ static struct acpi_table_header *get_acpi_srat_table(void)
return NULL;
}
+static void store_possible_addr(unsigned long long possible)
+{
+ struct setup_data *data;
+
+ data = (struct setup_data *)(unsigned long)boot_params->hdr.setup_data;
+ while (data) {
+ if (data->type == SETUP_KASLR) {
+ *(unsigned long long *)data->data = possible;
+ return;
+ }
+ data = (struct setup_data *)(unsigned long)data->next;
+ }
+}
+
/*
* According to ACPI table, filter the immvoable memory regions
* and store them in immovable_mem[].
@@ -319,6 +333,7 @@ void get_immovable_mem(void)
struct acpi_subtable_header *table;
struct acpi_srat_mem_affinity *ma;
unsigned long table_end;
+ unsigned long long possible_addr, max_possible_addr = 0;
int i = 0;
if (!cmdline_find_option_bool("movable_node") ||
@@ -338,7 +353,12 @@ void get_immovable_mem(void)
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)) {
+
+ if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) {
+ possible_addr = ma->base_address + ma->length;
+ if (possible_addr > max_possible_addr)
+ max_possible_addr = possible_addr;
+ } else {
immovable_mem[i].start = ma->base_address;
immovable_mem[i].size = ma->length;
i++;
@@ -351,4 +371,5 @@ void get_immovable_mem(void)
((unsigned long)table + table->length);
}
num_immovable_mem = i;
+ store_possible_addr(max_possible_addr);
}
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 1458b17..9b95fba 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -192,6 +192,40 @@ static void setup_efi_pci(struct boot_params *params)
efi_call_early(free_pool, pci_handle);
}
+#ifdef CONFIG_RANDOMIZE_MEMORY
+static void setup_kaslr(struct boot_params *params)
+{
+ struct setup_data *kaslr_data = NULL;
+ struct setup_data *data;
+ unsigned long size;
+ efi_status_t status;
+
+ size = sizeof(struct setup_data) + sizeof(unsigned long long);
+
+ status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
+ size, (void **)&kaslr_data);
+ if (status != EFI_SUCCESS) {
+ efi_printk(sys_table, "Failed to allocate memory for 'kaslr_data'\n");
+ return;
+ }
+
+ kaslr_data->type = SETUP_KASLR;
+ kaslr_data->next = 0;
+ kaslr_data->len = size;
+
+ data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
+ if (data)
+ data->next = (unsigned long)kaslr_data;
+ else {
+ while (data->next)
+ data = (struct setup_data *)(unsigned long)data->next;
+ data->next = (unsigned long)kaslr_data;
+ }
+}
+#else
+static void setup_kaslr(struct boot_params *params) {}
+#endif
+
static void retrieve_apple_device_properties(struct boot_params *boot_params)
{
efi_guid_t guid = APPLE_PROPERTIES_PROTOCOL_GUID;
@@ -770,6 +804,8 @@ efi_main(struct efi_config *c, struct boot_params *boot_params)
setup_efi_pci(boot_params);
+ setup_kaslr(boot_params);
+
setup_quirks(boot_params);
status = efi_call_early(allocate_pool, EFI_LOADER_DATA,
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index a06cbf0..0a44d83 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -10,6 +10,7 @@
#define SETUP_EFI 4
#define SETUP_APPLE_PROPERTIES 5
#define SETUP_JAILHOUSE 6
+#define SETUP_KASLR 7
/* ram_size flags */
#define RAMDISK_IMAGE_START_MASK 0x07FF
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 61db77b..6f91cf4 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -28,6 +28,7 @@
#include <asm/pgtable.h>
#include <asm/setup.h>
#include <asm/kaslr.h>
+#include <linux/io.h>
#include "mm_internal.h"
@@ -69,6 +70,61 @@ static inline bool kaslr_memory_enabled(void)
return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN);
}
+#ifdef CONFIG_MEMORY_HOTPLUG
+static unsigned long long __init get_max_possible_addr(void)
+{
+ struct setup_data *data;
+ u64 pa_data;
+ unsigned long long max = 0;
+
+ pa_data = boot_params.hdr.setup_data;
+ while (pa_data) {
+ data = early_memremap(pa_data, sizeof(*data));
+ if (!data)
+ return 0;
+
+ if (data->type == SETUP_KASLR) {
+ max = *(unsigned long long *)data->data;
+ early_memunmap(data, sizeof(*data));
+ return max;
+ }
+ pa_data = data->next;
+ early_memunmap(data, sizeof(*data));
+ }
+
+ return max;
+}
+
+static unsigned int __init kaslr_padding(void)
+{
+ unsigned long long max_possible_addr;
+ unsigned long long max_possible_phys, max_actual_phys, threshold;
+ unsigned int rand_mem_physical_padding =
+ CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+
+ max_possible_addr = get_max_possible_addr();
+ if (!max_possible_addr)
+ goto out;
+
+ max_actual_phys = roundup(PFN_PHYS(max_pfn), 1ULL << TB_SHIFT);
+ max_possible_phys = roundup(max_possible_addr,
+ 1ULL << TB_SHIFT);
+ threshold = max_actual_phys +
+ ((unsigned long long)rand_mem_physical_padding << TB_SHIFT);
+
+ if (max_possible_phys > threshold)
+ rand_mem_physical_padding =
+ (max_possible_phys - max_actual_phys) >> TB_SHIFT;
+out:
+ return rand_mem_physical_padding;
+}
+#else
+static unsigned int __init kaslr_padding(void)
+{
+ return CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+}
+#endif
+
/* Initialize base and padding for each memory region randomized with KASLR */
void __init kernel_randomize_memory(void)
{
@@ -102,7 +158,7 @@ void __init kernel_randomize_memory(void)
*/
BUG_ON(kaslr_regions[0].base != &page_offset_base);
memory_tb = DIV_ROUND_UP(max_pfn << PAGE_SHIFT, 1UL << TB_SHIFT) +
- CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+ kaslr_padding();
/* Adapt phyiscal memory region size based on available memory */
if (memory_tb < kaslr_regions[0].size_tb)
--
Thanks!
Masa
next prev parent reply other threads:[~2018-10-22 15:42 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 8:41 [PATCH v8 0/3] x86/boot/KASLR: Parse ACPI table and limit kaslr in immovable memory Chao Fan
2018-10-10 8:41 ` [PATCH v8 1/3] x86/boot: Add acpitb.c to parse acpi tables Chao Fan
2018-10-11 10:57 ` Borislav Petkov
2018-10-12 1:56 ` Chao Fan
2018-10-12 9:36 ` Chao Fan
2018-10-12 9:46 ` Borislav Petkov
2018-10-12 10:03 ` Chao Fan
2018-10-16 2:48 ` Chao Fan
2018-10-16 12:40 ` Borislav Petkov
2018-10-17 1:10 ` Chao Fan
2018-10-15 20:26 ` Masayoshi Mizuma
2018-10-16 1:50 ` Chao Fan
2018-10-10 8:41 ` [PATCH v8 2/3] x86/boot/KASLR: Walk srat tables to filter immovable memory Chao Fan
2018-10-10 8:41 ` [PATCH v8 3/3] x86/boot/KASLR: Limit kaslr to choosing the " Chao Fan
2018-10-10 8:59 ` [PATCH v8 0/3] x86/boot/KASLR: Parse ACPI table and limit kaslr in " Borislav Petkov
2018-10-10 9:06 ` Baoquan He
2018-10-10 9:12 ` Chao Fan
2018-10-10 9:21 ` Baoquan He
2018-10-10 9:14 ` Thomas Gleixner
2018-10-10 9:19 ` Borislav Petkov
2018-10-10 9:30 ` Baoquan He
2018-10-10 19:44 ` Masayoshi Mizuma
2018-10-11 0:29 ` Baoquan He
2018-10-11 5:51 ` Chao Fan
2018-10-13 20:19 ` Masayoshi Mizuma
2018-10-13 20:34 ` Borislav Petkov
2018-10-13 21:45 ` Masayoshi Mizuma
2018-10-13 22:05 ` Borislav Petkov
2018-10-15 0:50 ` Masayoshi Mizuma
2018-10-16 15:13 ` Masayoshi Mizuma
2018-10-16 19:11 ` Borislav Petkov
2018-10-16 19:54 ` Masayoshi Mizuma
2018-10-16 19:59 ` Borislav Petkov
2018-10-22 15:42 ` Masayoshi Mizuma [this message]
2018-10-23 2:48 ` Chao Fan
2018-10-24 19:21 ` Masayoshi Mizuma
2018-10-25 1:22 ` Chao Fan
2018-10-25 10:33 ` Borislav Petkov
2018-10-25 13:40 ` Masayoshi Mizuma
2018-11-06 12:10 ` Borislav Petkov
2018-11-06 14:07 ` Baoquan He
2018-11-07 1:21 ` Chao Fan
2018-11-06 18:45 ` Borislav Petkov
2018-11-06 19:36 ` Masayoshi Mizuma
2018-11-06 20:45 ` Borislav Petkov
2018-11-06 22:21 ` Masayoshi Mizuma
2018-11-08 10:51 ` Borislav Petkov
2018-11-10 10:54 ` Borislav Petkov
2018-11-11 13:45 ` Masayoshi Mizuma
2019-02-05 15:05 ` Masayoshi Mizuma
2019-02-08 18:26 ` Borislav Petkov
2019-02-09 0:24 ` Masayoshi Mizuma
2019-02-11 1:46 ` Chao Fan
2019-02-11 20:11 ` Masayoshi Mizuma
2018-10-10 17:16 ` Borislav Petkov
2018-10-11 1:30 ` Chao Fan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181022154204.kagmdb55jtoez4ca@gabell \
--to=msys.mizuma@gmail.com \
--cc=ard.biesheuvel@linaro.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=fanc.fnst@cn.fujitsu.com \
--cc=hpa@zytor.com \
--cc=indou.takao@jp.fujitsu.com \
--cc=keescook@chromium.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).