From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: Dave Young <dyoung@redhat.com> Cc: "Matt Fleming" <matt@codeblueprint.co.uk>, "linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "x86@kernel.org" <x86@kernel.org>, "Nicolai Stange" <nicstange@gmail.com>, "Ingo Molnar" <mingo@kernel.org>, "Thomas Gleixner" <tglx@linutronix.de>, "hpa@zytor.com" <hpa@zytor.com>, "Dan Williams" <dan.j.williams@intel.com>, "Mika Penttilä" <mika.penttila@nextfour.com>, bhsharma@redhat.com Subject: Re: [PATCH 1/4] efi/x86: make efi_memmap_reserve only insert into boot mem areas Date: Thu, 12 Jan 2017 16:15:59 +0000 [thread overview] Message-ID: <CAKv+Gu-cdhvAM2Vkqv8uokZAqD3k0kLbGu1UYwgQOYj5Es0g=g@mail.gmail.com> (raw) In-Reply-To: <20170112094214.860924858@redhat.com> Hello Dave, On 12 January 2017 at 09:41, Dave Young <dyoung@redhat.com> wrote: > There are memory ranges like below when I testing early efi_mem_reserve: > > efi: mem62: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem63: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem64: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem65: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem66: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem67: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > Did you spot Peter's patch to prune invalid memmap entries? https://git.kernel.org/cgit/linux/kernel/git/efi/efi.git/commit/?h=next&id=b2a91a35445229 I would expect this patch to no longer be necessary with that in place, no? > So efi_memmap_insert will run into inserting same region multiple times, > also because efi_memmap_insert does not consider the duplicate ranges it will > cause memmap buffer overflow due to the size is pre-calculated, and kernel boot > fail with a panic. We did not detect such issue because current users of > efi_mem_insert do it very late after switching to virtual mode, at that time > the new cooked efi.memmap contains only runtime needed memory ranges. > > efi_mem_reserve cares only about boot services regions and maybe loader areas. > So add a new argument to efi_memmap_insert for this purpose. > > Later patches depend on this one for moving bgrt reservation to early code. > > Signed-off-by: Dave Young <dyoung@redhat.com> > --- > arch/x86/platform/efi/quirks.c | 2 +- > drivers/firmware/efi/fake_mem.c | 3 ++- > drivers/firmware/efi/memmap.c | 8 +++++++- > include/linux/efi.h | 4 ++-- > 4 files changed, 12 insertions(+), 5 deletions(-) > > --- linux-x86.orig/drivers/firmware/efi/memmap.c > +++ linux-x86/drivers/firmware/efi/memmap.c > @@ -213,7 +213,7 @@ int __init efi_memmap_split_count(efi_me > * to see how large @buf needs to be. > */ > void __init efi_memmap_insert(struct efi_memory_map *old_memmap, void *buf, > - struct efi_mem_range *mem) > + struct efi_mem_range *mem, bool boot_only) > { > u64 m_start, m_end, m_attr; > efi_memory_desc_t *md; > @@ -246,6 +246,12 @@ void __init efi_memmap_insert(struct efi > start = md->phys_addr; > end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1; > > + if (boot_only && !(md->type == EFI_LOADER_DATA || > + md->type == EFI_LOADER_CODE || > + md->type == EFI_BOOT_SERVICES_CODE || > + md->type == EFI_BOOT_SERVICES_DATA)) > + continue; > + > if (m_start <= start && end <= m_end) > md->attribute |= m_attr; > > --- linux-x86.orig/arch/x86/platform/efi/quirks.c > +++ linux-x86/arch/x86/platform/efi/quirks.c > @@ -226,7 +226,7 @@ void __init efi_arch_mem_reserve(phys_ad > return; > } > > - efi_memmap_insert(&efi.memmap, new, &mr); > + efi_memmap_insert(&efi.memmap, new, &mr, true); > early_memunmap(new, new_size); > > efi_memmap_install(new_phys, num_entries); > --- linux-x86.orig/drivers/firmware/efi/fake_mem.c > +++ linux-x86/drivers/firmware/efi/fake_mem.c > @@ -85,7 +85,8 @@ void __init efi_fake_memmap(void) > } > > for (i = 0; i < nr_fake_mem; i++) > - efi_memmap_insert(&efi.memmap, new_memmap, &fake_mems[i]); > + efi_memmap_insert(&efi.memmap, new_memmap, &fake_mems[i], > + false); > > /* swap into new EFI memmap */ > early_memunmap(new_memmap, efi.memmap.desc_size * new_nr_map); > --- linux-x86.orig/include/linux/efi.h > +++ linux-x86/include/linux/efi.h > @@ -957,8 +957,8 @@ extern int __init efi_memmap_install(phy > extern int __init efi_memmap_split_count(efi_memory_desc_t *md, > struct range *range); > extern void __init efi_memmap_insert(struct efi_memory_map *old_memmap, > - void *buf, struct efi_mem_range *mem); > - > + void *buf, struct efi_mem_range *mem, > + bool boot_only); > extern int efi_config_init(efi_config_table_type_t *arch_tables); > #ifdef CONFIG_EFI_ESRT > extern void __init efi_esrt_init(void); > >
WARNING: multiple messages have this Message-ID (diff)
From: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> To: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: "Matt Fleming" <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>, "linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" <linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, "x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" <x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, "Nicolai Stange" <nicstange-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, "Ingo Molnar" <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, "Thomas Gleixner" <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, "hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>, "Dan Williams" <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>, "Mika Penttilä" <mika.penttila-MRsr7dthA9VWk0Htik3J/w@public.gmane.org>, bhsharma-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Subject: Re: [PATCH 1/4] efi/x86: make efi_memmap_reserve only insert into boot mem areas Date: Thu, 12 Jan 2017 16:15:59 +0000 [thread overview] Message-ID: <CAKv+Gu-cdhvAM2Vkqv8uokZAqD3k0kLbGu1UYwgQOYj5Es0g=g@mail.gmail.com> (raw) In-Reply-To: <20170112094214.860924858-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Hello Dave, On 12 January 2017 at 09:41, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: > There are memory ranges like below when I testing early efi_mem_reserve: > > efi: mem62: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem63: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem64: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem65: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem66: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > efi: mem67: [Reserved | | | | | | | | | | | | ] range=[0x0000000000000000-0xffffffffffffffff] (0MB) > Did you spot Peter's patch to prune invalid memmap entries? https://git.kernel.org/cgit/linux/kernel/git/efi/efi.git/commit/?h=next&id=b2a91a35445229 I would expect this patch to no longer be necessary with that in place, no? > So efi_memmap_insert will run into inserting same region multiple times, > also because efi_memmap_insert does not consider the duplicate ranges it will > cause memmap buffer overflow due to the size is pre-calculated, and kernel boot > fail with a panic. We did not detect such issue because current users of > efi_mem_insert do it very late after switching to virtual mode, at that time > the new cooked efi.memmap contains only runtime needed memory ranges. > > efi_mem_reserve cares only about boot services regions and maybe loader areas. > So add a new argument to efi_memmap_insert for this purpose. > > Later patches depend on this one for moving bgrt reservation to early code. > > Signed-off-by: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> > --- > arch/x86/platform/efi/quirks.c | 2 +- > drivers/firmware/efi/fake_mem.c | 3 ++- > drivers/firmware/efi/memmap.c | 8 +++++++- > include/linux/efi.h | 4 ++-- > 4 files changed, 12 insertions(+), 5 deletions(-) > > --- linux-x86.orig/drivers/firmware/efi/memmap.c > +++ linux-x86/drivers/firmware/efi/memmap.c > @@ -213,7 +213,7 @@ int __init efi_memmap_split_count(efi_me > * to see how large @buf needs to be. > */ > void __init efi_memmap_insert(struct efi_memory_map *old_memmap, void *buf, > - struct efi_mem_range *mem) > + struct efi_mem_range *mem, bool boot_only) > { > u64 m_start, m_end, m_attr; > efi_memory_desc_t *md; > @@ -246,6 +246,12 @@ void __init efi_memmap_insert(struct efi > start = md->phys_addr; > end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1; > > + if (boot_only && !(md->type == EFI_LOADER_DATA || > + md->type == EFI_LOADER_CODE || > + md->type == EFI_BOOT_SERVICES_CODE || > + md->type == EFI_BOOT_SERVICES_DATA)) > + continue; > + > if (m_start <= start && end <= m_end) > md->attribute |= m_attr; > > --- linux-x86.orig/arch/x86/platform/efi/quirks.c > +++ linux-x86/arch/x86/platform/efi/quirks.c > @@ -226,7 +226,7 @@ void __init efi_arch_mem_reserve(phys_ad > return; > } > > - efi_memmap_insert(&efi.memmap, new, &mr); > + efi_memmap_insert(&efi.memmap, new, &mr, true); > early_memunmap(new, new_size); > > efi_memmap_install(new_phys, num_entries); > --- linux-x86.orig/drivers/firmware/efi/fake_mem.c > +++ linux-x86/drivers/firmware/efi/fake_mem.c > @@ -85,7 +85,8 @@ void __init efi_fake_memmap(void) > } > > for (i = 0; i < nr_fake_mem; i++) > - efi_memmap_insert(&efi.memmap, new_memmap, &fake_mems[i]); > + efi_memmap_insert(&efi.memmap, new_memmap, &fake_mems[i], > + false); > > /* swap into new EFI memmap */ > early_memunmap(new_memmap, efi.memmap.desc_size * new_nr_map); > --- linux-x86.orig/include/linux/efi.h > +++ linux-x86/include/linux/efi.h > @@ -957,8 +957,8 @@ extern int __init efi_memmap_install(phy > extern int __init efi_memmap_split_count(efi_memory_desc_t *md, > struct range *range); > extern void __init efi_memmap_insert(struct efi_memory_map *old_memmap, > - void *buf, struct efi_mem_range *mem); > - > + void *buf, struct efi_mem_range *mem, > + bool boot_only); > extern int efi_config_init(efi_config_table_type_t *arch_tables); > #ifdef CONFIG_EFI_ESRT > extern void __init efi_esrt_init(void); > >
next prev parent reply other threads:[~2017-01-12 16:16 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-12 9:41 [PATCH 0/4] efi/x86: move efi bgrt init code to early init Dave Young 2017-01-12 9:41 ` [PATCH 1/4] efi/x86: make efi_memmap_reserve only insert into boot mem areas Dave Young 2017-01-12 9:41 ` Dave Young 2017-01-12 11:15 ` Nicolai Stange 2017-01-12 11:15 ` Nicolai Stange 2017-01-12 21:29 ` Dave Young 2017-01-12 21:29 ` Dave Young 2017-01-27 14:48 ` Matt Fleming 2017-01-27 17:04 ` Ard Biesheuvel 2017-01-27 17:04 ` Ard Biesheuvel 2017-01-27 22:13 ` Matt Fleming 2017-01-27 22:13 ` Matt Fleming 2017-01-27 22:15 ` Ard Biesheuvel 2017-01-27 22:15 ` Ard Biesheuvel 2017-01-12 16:15 ` Ard Biesheuvel [this message] 2017-01-12 16:15 ` Ard Biesheuvel 2017-01-12 21:20 ` Dave Young 2017-01-12 21:20 ` Dave Young 2017-01-13 8:10 ` Dave Young 2017-01-12 9:41 ` [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young 2017-01-12 9:56 ` Dave Young 2017-01-12 11:54 ` Nicolai Stange 2017-01-12 11:54 ` Nicolai Stange 2017-01-12 21:39 ` Dave Young 2017-01-12 23:11 ` Nicolai Stange 2017-01-12 23:11 ` Nicolai Stange 2017-01-13 2:21 ` Dave Young 2017-01-13 3:04 ` Dave Young 2017-01-13 3:04 ` Dave Young 2017-01-13 12:21 ` Nicolai Stange 2017-01-13 12:21 ` Nicolai Stange 2017-01-16 2:55 ` Dave Young 2017-01-16 2:55 ` Dave Young 2017-01-12 16:20 ` Ard Biesheuvel 2017-01-12 16:20 ` Ard Biesheuvel 2017-01-12 21:33 ` Dave Young 2017-01-12 21:33 ` Dave Young 2017-01-16 15:15 ` Bhupesh Sharma 2017-01-17 17:00 ` Ard Biesheuvel 2017-01-12 9:41 ` [PATCH 3/4] efi/x86: move efi_print_memmap to drivers/firmware/efi/memmap.c Dave Young 2017-01-12 9:41 ` Dave Young 2017-01-12 12:08 ` Nicolai Stange 2017-01-12 21:40 ` Dave Young 2017-01-12 9:41 ` [PATCH 4/4] efi/x86: add debug code to print cooked memmap Dave Young 2017-01-12 16:18 ` Ard Biesheuvel
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='CAKv+Gu-cdhvAM2Vkqv8uokZAqD3k0kLbGu1UYwgQOYj5Es0g=g@mail.gmail.com' \ --to=ard.biesheuvel@linaro.org \ --cc=bhsharma@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=dyoung@redhat.com \ --cc=hpa@zytor.com \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=matt@codeblueprint.co.uk \ --cc=mika.penttila@nextfour.com \ --cc=mingo@kernel.org \ --cc=nicstange@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: 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.