From: Chao Fan <fanc.fnst@cn.fujitsu.com> To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-efi@vger.kernel.org, linux-acpi@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, keescook@chromium.org, bhe@redhat.com Cc: rjw@rjwysocki.net, lenb@kernel.org, ard.biesheuvel@linaro.org, indou.takao@jp.fujitsu.com, caoj.fnst@cn.fujitsu.com Subject: [PATCH v8 3/3] x86/boot/KASLR: Limit kaslr to choosing the immovable memory Date: Wed, 10 Oct 2018 16:41:19 +0800 [thread overview] Message-ID: <20181010084119.17539-4-fanc.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20181010084119.17539-1-fanc.fnst@cn.fujitsu.com> If CONFIG_MEMORY_HOTREMOVE enabled and the amount of immovable memory regions is not zero. Calculate the intersection between memory regions from e820/efi memory table and immovable memory regions. Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> --- arch/x86/boot/compressed/kaslr.c | 72 +++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 11 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 573e582e8709..61486aad39b6 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -101,6 +101,11 @@ static bool memmap_too_large; /* Store memory limit specified by "mem=nn[KMG]" or "memmap=nn[KMG]" */ static unsigned long long mem_limit = ULLONG_MAX; +#ifdef CONFIG_MEMORY_HOTREMOVE +/* Store the immovable memory regions */ +extern struct mem_vector immovable_mem[MAX_NUMNODES*2]; +#endif + enum mem_avoid_index { MEM_AVOID_ZO_RANGE = 0, @@ -575,9 +580,9 @@ static unsigned long slots_fetch_random(void) return 0; } -static void process_mem_region(struct mem_vector *entry, - unsigned long minimum, - unsigned long image_size) +static void slots_count(struct mem_vector *entry, + unsigned long minimum, + unsigned long image_size) { struct mem_vector region, overlap; unsigned long start_orig, end; @@ -653,6 +658,57 @@ static void process_mem_region(struct mem_vector *entry, } } +static bool process_mem_region(struct mem_vector *region, + unsigned long long minimum, + unsigned long long image_size) +{ + int i; + /* + * If no immovable memory found, or MEMORY_HOTREMOVE disabled, + * walk all the regions, so use region directely. + */ + if (num_immovable_mem == 0) { + slots_count(region, minimum, image_size); + + if (slot_area_index == MAX_SLOT_AREA) { + debug_putstr("Aborted e820/efi memmap scan (slot_areas full)!\n"); + return 1; + } + return 0; + } + +#ifdef CONFIG_MEMORY_HOTREMOVE + /* + * If immovable memory found, filter the intersection between + * immovable memory and region to slots_count. + * Otherwise, go on old code. + */ + for (i = 0; i < num_immovable_mem; i++) { + struct mem_vector entry; + unsigned long long start, end, entry_end, region_end; + + if (!mem_overlaps(region, &immovable_mem[i])) + continue; + + start = immovable_mem[i].start; + end = start + immovable_mem[i].size; + region_end = region->start + region->size; + + entry.start = clamp(region->start, start, end); + entry_end = clamp(region_end, start, end); + entry.size = entry_end - entry.start; + + slots_count(&entry, minimum, image_size); + + if (slot_area_index == MAX_SLOT_AREA) { + debug_putstr("Aborted e820/efi memmap scan (slot_areas full)!\n"); + return 1; + } + } + return 0; +#endif +} + #ifdef CONFIG_EFI /* * Returns true if mirror region found (and must have been processed @@ -718,11 +774,8 @@ process_efi_entries(unsigned long minimum, unsigned long image_size) region.start = md->phys_addr; region.size = md->num_pages << EFI_PAGE_SHIFT; - process_mem_region(®ion, minimum, image_size); - if (slot_area_index == MAX_SLOT_AREA) { - debug_putstr("Aborted EFI scan (slot_areas full)!\n"); + if (process_mem_region(®ion, minimum, image_size)) break; - } } return true; } @@ -749,11 +802,8 @@ static void process_e820_entries(unsigned long minimum, continue; region.start = entry->addr; region.size = entry->size; - process_mem_region(®ion, minimum, image_size); - if (slot_area_index == MAX_SLOT_AREA) { - debug_putstr("Aborted e820 scan (slot_areas full)!\n"); + if (process_mem_region(®ion, minimum, image_size)) break; - } } } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Chao Fan <fanc.fnst@cn.fujitsu.com> To: <linux-kernel@vger.kernel.org>, <x86@kernel.org>, <linux-efi@vger.kernel.org>, <linux-acpi@vger.kernel.org>, <tglx@linutronix.de>, <mingo@redhat.com>, <hpa@zytor.com>, <keescook@chromium.org>, <bhe@redhat.com> Cc: <rjw@rjwysocki.net>, <lenb@kernel.org>, <ard.biesheuvel@linaro.org>, <indou.takao@jp.fujitsu.com>, <caoj.fnst@cn.fujitsu.com> Subject: [PATCH v8 3/3] x86/boot/KASLR: Limit kaslr to choosing the immovable memory Date: Wed, 10 Oct 2018 16:41:19 +0800 [thread overview] Message-ID: <20181010084119.17539-4-fanc.fnst@cn.fujitsu.com> (raw) In-Reply-To: <20181010084119.17539-1-fanc.fnst@cn.fujitsu.com> If CONFIG_MEMORY_HOTREMOVE enabled and the amount of immovable memory regions is not zero. Calculate the intersection between memory regions from e820/efi memory table and immovable memory regions. Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> --- arch/x86/boot/compressed/kaslr.c | 72 +++++++++++++++++++++++++++----- 1 file changed, 61 insertions(+), 11 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 573e582e8709..61486aad39b6 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -101,6 +101,11 @@ static bool memmap_too_large; /* Store memory limit specified by "mem=nn[KMG]" or "memmap=nn[KMG]" */ static unsigned long long mem_limit = ULLONG_MAX; +#ifdef CONFIG_MEMORY_HOTREMOVE +/* Store the immovable memory regions */ +extern struct mem_vector immovable_mem[MAX_NUMNODES*2]; +#endif + enum mem_avoid_index { MEM_AVOID_ZO_RANGE = 0, @@ -575,9 +580,9 @@ static unsigned long slots_fetch_random(void) return 0; } -static void process_mem_region(struct mem_vector *entry, - unsigned long minimum, - unsigned long image_size) +static void slots_count(struct mem_vector *entry, + unsigned long minimum, + unsigned long image_size) { struct mem_vector region, overlap; unsigned long start_orig, end; @@ -653,6 +658,57 @@ static void process_mem_region(struct mem_vector *entry, } } +static bool process_mem_region(struct mem_vector *region, + unsigned long long minimum, + unsigned long long image_size) +{ + int i; + /* + * If no immovable memory found, or MEMORY_HOTREMOVE disabled, + * walk all the regions, so use region directely. + */ + if (num_immovable_mem == 0) { + slots_count(region, minimum, image_size); + + if (slot_area_index == MAX_SLOT_AREA) { + debug_putstr("Aborted e820/efi memmap scan (slot_areas full)!\n"); + return 1; + } + return 0; + } + +#ifdef CONFIG_MEMORY_HOTREMOVE + /* + * If immovable memory found, filter the intersection between + * immovable memory and region to slots_count. + * Otherwise, go on old code. + */ + for (i = 0; i < num_immovable_mem; i++) { + struct mem_vector entry; + unsigned long long start, end, entry_end, region_end; + + if (!mem_overlaps(region, &immovable_mem[i])) + continue; + + start = immovable_mem[i].start; + end = start + immovable_mem[i].size; + region_end = region->start + region->size; + + entry.start = clamp(region->start, start, end); + entry_end = clamp(region_end, start, end); + entry.size = entry_end - entry.start; + + slots_count(&entry, minimum, image_size); + + if (slot_area_index == MAX_SLOT_AREA) { + debug_putstr("Aborted e820/efi memmap scan (slot_areas full)!\n"); + return 1; + } + } + return 0; +#endif +} + #ifdef CONFIG_EFI /* * Returns true if mirror region found (and must have been processed @@ -718,11 +774,8 @@ process_efi_entries(unsigned long minimum, unsigned long image_size) region.start = md->phys_addr; region.size = md->num_pages << EFI_PAGE_SHIFT; - process_mem_region(®ion, minimum, image_size); - if (slot_area_index == MAX_SLOT_AREA) { - debug_putstr("Aborted EFI scan (slot_areas full)!\n"); + if (process_mem_region(®ion, minimum, image_size)) break; - } } return true; } @@ -749,11 +802,8 @@ static void process_e820_entries(unsigned long minimum, continue; region.start = entry->addr; region.size = entry->size; - process_mem_region(®ion, minimum, image_size); - if (slot_area_index == MAX_SLOT_AREA) { - debug_putstr("Aborted e820 scan (slot_areas full)!\n"); + if (process_mem_region(®ion, minimum, image_size)) break; - } } } -- 2.17.1
next prev parent reply other threads:[~2018-10-10 8:41 UTC|newest] Thread overview: 75+ 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 ` Chao Fan 2018-10-10 8:41 ` [PATCH v8 1/3] x86/boot: Add acpitb.c to parse acpi tables Chao Fan 2018-10-10 8:41 ` Chao Fan 2018-10-11 10:57 ` Borislav Petkov 2018-10-12 1:56 ` Chao Fan 2018-10-12 1:56 ` Chao Fan 2018-10-12 9:36 ` 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-12 10:03 ` Chao Fan 2018-10-16 2:48 ` 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-17 1:10 ` Chao Fan 2018-10-15 20:26 ` Masayoshi Mizuma 2018-10-16 1:50 ` Chao Fan 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 ` Chao Fan 2018-10-10 8:41 ` Chao Fan [this message] 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 8:59 ` Borislav Petkov 2018-10-10 9:06 ` Baoquan He 2018-10-10 9:12 ` Chao Fan 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-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 2018-10-23 2:48 ` Chao Fan 2018-10-23 2:48 ` Chao Fan 2018-10-24 19:21 ` Masayoshi Mizuma 2018-10-25 1:22 ` Chao Fan 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-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-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 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 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=20181010084119.17539-4-fanc.fnst@cn.fujitsu.com \ --to=fanc.fnst@cn.fujitsu.com \ --cc=ard.biesheuvel@linaro.org \ --cc=bhe@redhat.com \ --cc=caoj.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@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.