From: Chao Fan <fanc.fnst@cn.fujitsu.com>
To: Baoquan He <bhe@redhat.com>
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>, <msys.mizuma@gmail.com>,
<indou.takao@jp.fujitsu.com>, <caoj.fnst@cn.fujitsu.com>
Subject: Re: [PATCH v9 8/8] x86/boot/KASLR: Limit kaslr to choosing the immovable memory
Date: Mon, 22 Oct 2018 18:13:30 +0800 [thread overview]
Message-ID: <20181022101329.GC7641@localhost.localdomain> (raw)
In-Reply-To: <20181018042123.GD1885@192.168.1.4>
On Thu, Oct 18, 2018 at 12:21:23PM +0800, Baoquan He wrote:
>On 10/17/18 at 06:20pm, Chao Fan wrote:
>> If CONFIG_MEMORY_HOTREMOVE enabled and the amount of immovable
>> memory regions is not zero. Calculate the intersection between memory
>
>This if conditional adverbial clauses is not an complete sentence.
>
>> regions from e820/efi memory table and immovable memory regions.
> ^ get?
>>
>> 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 0c3567bc231c..3ebb150f61eb 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];
>
>Sorry, Chao. I may not follow your old patch change, why the length of
>immovable_mem is MAX_NUMNODES*2, is there any reason or basis?
>
>> +#endif
>> +
>>
>> enum mem_avoid_index {
>> MEM_AVOID_ZO_RANGE = 0,
>> @@ -577,9 +582,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;
>> @@ -655,6 +660,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.
>
>Could you explain more about what is the old code in otherwise case you
>want to go on?
Sure,
1. 'movable_node' not specified in cmdline.
2. CONFIG_HOT_REMOVE not difned.
3. Just one node in this machine.
>
>> + */
>> + 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);
>
>Obviously, your patch log only covers this place of code. About renaming
>process_mem_region() to slot_count(), and add another level of wrapper
>process_mem_region(), may also need be mentioned in patch log.
>
Sorry for missing the comment.
Rename process_mem_region to slots_count to match slots_fetch_random,
and name new function as process_mem_region.
Thanks,
Chao Fan
>> +
>> + 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
>> @@ -720,11 +776,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;
>> }
>> @@ -751,11 +804,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.2
>>
>>
>>
>
>
next prev parent reply other threads:[~2018-10-22 10:14 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 10:20 [PATCH v9 0/8] x86/boot/KASLR: Parse ACPI table and limit kaslr in immovable memory Chao Fan
2018-10-17 10:20 ` [PATCH v9 1/8] x86/boot: Introduce cmdline_find_option_arg()to detect if option=arg in cmdline Chao Fan
2018-10-18 4:01 ` Baoquan He
2018-10-18 6:15 ` Chao Fan
2018-10-17 10:20 ` [PATCH v9 2/8] x86/boot: Copy kstrtoull() to compressed period Chao Fan
2018-10-18 4:03 ` Baoquan He
2018-10-18 5:51 ` Chao Fan
2018-10-18 6:01 ` Baoquan He
2018-10-18 6:08 ` Chao Fan
2018-10-17 10:20 ` [PATCH v9 3/8] x86/boot: Add efi_get_rsdp_addr() to dig out RSDP from EFI table Chao Fan
2018-10-18 4:35 ` Baoquan He
2018-10-18 5:54 ` Chao Fan
2018-10-18 5:56 ` Baoquan He
2018-10-18 6:10 ` Chao Fan
2018-10-17 10:20 ` [PATCH v9 4/8] x86/boot: Add bios_get_rsdp_addr() to search RSDP in memory Chao Fan
2018-10-17 10:20 ` [PATCH v9 5/8] x86/boot: Add get_acpi_rsdp() to parse RSDP in cmdlien from kexec Chao Fan
2018-10-21 2:26 ` Baoquan He
2018-10-22 5:30 ` Fan, Chao
2018-10-22 6:06 ` Baoquan He
2018-10-22 7:30 ` Chao Fan
2018-10-22 7:36 ` Baoquan He
2018-10-17 10:20 ` [PATCH v9 6/8] x86/boot: Dig out SRAT table from RSDP and find immovable memory Chao Fan
2018-10-18 6:12 ` Chao Fan
2018-10-21 2:34 ` Baoquan He
2018-10-22 5:29 ` Fan, Chao
2018-10-22 6:08 ` Baoquan He
2018-10-17 10:20 ` [PATCH v9 7/8] x86/boot/KASLR: Walk srat tables to filter " Chao Fan
2018-10-18 4:23 ` Baoquan He
2018-10-18 5:56 ` Chao Fan
2018-10-17 10:20 ` [PATCH v9 8/8] x86/boot/KASLR: Limit kaslr to choosing the " Chao Fan
2018-10-18 4:21 ` Baoquan He
2018-10-22 10:13 ` Chao Fan [this message]
2018-10-22 10:24 ` Baoquan He
2018-10-22 10:49 ` Chao Fan
2018-10-18 3:59 ` [PATCH v9 0/8] x86/boot/KASLR: Parse ACPI table and limit kaslr in " Baoquan He
2018-10-18 5:48 ` 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=20181022101329.GC7641@localhost.localdomain \
--to=fanc.fnst@cn.fujitsu.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=hpa@zytor.com \
--cc=indou.takao@jp.fujitsu.com \
--cc=keescook@chromium.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=msys.mizuma@gmail.com \
--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).