From: Baoquan He <bhe@redhat.com>
To: Chao Fan <fanc.fnst@cn.fujitsu.com>
Cc: linux-kernel@vger.kernel.org, x86@kernel.org, hpa@zytor.com,
tglx@linutronix.de, mingo@redhat.com, keescook@chromium.org,
yasu.isimatu@gmail.com, indou.takao@jp.fujitsu.com,
caoj.fnst@cn.fujitsu.com, douly.fnst@cn.fujitsu.com
Subject: Re: [PATCH v2 2/4] kaslr: select the memory region in immovable node to process
Date: Thu, 9 Nov 2017 16:21:32 +0800 [thread overview]
Message-ID: <20171109082132.GJ22644@x1> (raw)
In-Reply-To: <20171101113203.27741-3-fanc.fnst@cn.fujitsu.com>
Hi Chao,
On 11/01/17 at 07:32pm, Chao Fan wrote:
> Compare the region of memmap entry and immovable_mem, then choose the
> intersection to process_mem_region.
>
> Since the interrelationship between e820 or efi entries and memory
> region in immovable_mem is different:
Could you paste a bootlog with efi=debug specified in cmdline on the
system you tested? I want to check what kind of intersection between
them. The adding makes code pretty ugly, want to make sure if we have
to do like this.
Thanks
Baoquan
> One memory region in one node may contain several entries of e820 or
> efi sometimes, and one entry of e820 or efi may contain the memory in
> different nodes sometimes.
> It may split one node or one entry to several regions.
>
> Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com>
> ---
> arch/x86/boot/compressed/kaslr.c | 60 ++++++++++++++++++++++++++++++++++------
> 1 file changed, 52 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
> index 0a591c0023f1..fcd640fdeaed 100644
> --- a/arch/x86/boot/compressed/kaslr.c
> +++ b/arch/x86/boot/compressed/kaslr.c
> @@ -634,6 +634,54 @@ static void process_mem_region(struct mem_vector *entry,
> }
> }
>
> +static bool select_immovable_node(struct mem_vector region,
> + unsigned long long minimum,
> + unsigned long long image_size)
> +{
> + int i;
> +
> + /* If no immovable_mem stored, use region directly */
> + if (num_immovable_region == 0) {
> + process_mem_region(®ion, minimum, image_size);
> +
> + if (slot_area_index == MAX_SLOT_AREA) {
> + debug_putstr("Aborted memmap scan (slot_areas full)!\n");
> + return 1;
> + }
> + } else {
> + /*
> + * Walk all immovable regions, and filter the intersection
> + * to process_mem_region.
> + */
> + for (i = 0; i < num_immovable_region; i++) {
> + struct mem_vector entry;
> + unsigned long long start, end, select_end, region_end;
> +
> + region_end = region.start + region.size - 1;
> + start = immovable_mem[i].start;
> + end = start + immovable_mem[i].size - 1;
> +
> + if (region_end < start || region.start > end)
> + continue;
> +
> + /* May split one region to several entries. */
> + entry.start = start > region.start ?
> + start : region.start;
> + select_end = end > region_end ? region_end : end;
> +
> + entry.size = select_end - entry.start + 1;
> +
> + process_mem_region(&entry, minimum, image_size);
> +
> + if (slot_area_index == MAX_SLOT_AREA) {
> + debug_putstr("Aborted memmap scan (slot_areas full)!\n");
> + return 1;
> + }
> + }
> + }
> + return 0;
> +}
> +
> #ifdef CONFIG_EFI
> /*
> * Returns true if mirror region found (and must have been processed
> @@ -699,11 +747,9 @@ 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 (select_immovable_node(region, minimum, image_size))
> break;
> - }
> }
> return true;
> }
> @@ -730,11 +776,9 @@ 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 (select_immovable_node(region, minimum, image_size))
> break;
> - }
> }
> }
>
> --
> 2.13.6
>
>
>
next prev parent reply other threads:[~2017-11-09 8:21 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-01 11:31 [PATCH v2 0/4] kaslr: extend movable_node to movable_node=nn[KMG]@ss[KMG] Chao Fan
2017-11-01 11:32 ` [PATCH v2 1/4] kaslr: parse the extended movable_node=nn[KMG]@ss[KMG] Chao Fan
2017-11-13 8:10 ` Baoquan He
2017-11-13 8:42 ` Chao Fan
2017-11-01 11:32 ` [PATCH v2 2/4] kaslr: select the memory region in immovable node to process Chao Fan
2017-11-09 8:21 ` Baoquan He [this message]
2017-11-10 1:14 ` Chao Fan
2017-11-10 3:03 ` Chao Fan
2017-11-10 3:14 ` Baoquan He
2017-11-10 4:20 ` Chao Fan
2017-11-10 6:02 ` Chao Fan
2017-11-13 8:31 ` Baoquan He
2017-11-13 9:18 ` Chao Fan
2017-11-13 9:26 ` Baoquan He
2017-11-13 9:50 ` Chao Fan
2017-11-13 11:02 ` Baoquan He
2017-11-01 11:32 ` [PATCH v2 3/4] document: change the document for the extended movable_node Chao Fan
2017-11-01 11:32 ` [PATCH v2 4/4] kaslr: clean up a useless variable and some usless space Chao Fan
2017-11-13 8:32 ` Baoquan He
2017-11-13 9:19 ` 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=20171109082132.GJ22644@x1 \
--to=bhe@redhat.com \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=douly.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=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yasu.isimatu@gmail.com \
/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).