From: Mike Galbraith <umgwanakikbuti@gmail.com>
To: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>,
linux-efi@vger.kernel.org, Peter Jones <pjones@redhat.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [tip regression] efi: Allow drivers to reserve boot services forever == toxic
Date: Sun, 18 Sep 2016 08:09:32 +0200 [thread overview]
Message-ID: <1474178972.3817.2.camel@gmail.com> (raw)
In-Reply-To: <20160917195853.GG16797@codeblueprint.co.uk>
On Sat, 2016-09-17 at 20:58 +0100, Matt Fleming wrote:
> These addresses are pretty low. Can you try the hacky patch plus
> Ricardo's change in commit 3dad6f7f6975 ("x86/efi: Defer efi_esrt_init
> until after memblock_x86_fill"). He fixed a bug where it's possible to
> run out of memblock regions.
---
arch/x86/platform/efi/quirks.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -201,8 +201,12 @@ void __init efi_arch_mem_reserve(phys_ad
return;
}
+//XXX size += addr % EFI_PAGE_SIZE;
+//MATT size = round_up(size, EFI_PAGE_SIZE);
+//XXX addr = round_down(addr, EFI_PAGE_SIZE);
+
mr.range.start = addr;
- mr.range.end = addr + size;
+ mr.range.end = addr + size;//MATT - 1;
mr.attribute = md.attribute | EFI_MEMORY_RUNTIME;
num_entries = efi_memmap_split_count(&md, &mr.range);
@@ -225,7 +229,12 @@ void __init efi_arch_mem_reserve(phys_ad
efi_memmap_insert(&efi.memmap, new, &mr);
early_memunmap(new, new_size);
+#if 0
efi_memmap_install(new_phys, num_entries);
+#endif
+ printk(KERN_DEBUG "MIKE md.phys_addr:0x%Lx md.virt_addr:0x%Lx md.num_pages:%Ld\n", md.phys_addr, md.virt_addr, md.num_pages);
+ printk(KERN_DEBUG "MIKE mr.range.start:0x%Lx mr.range.end:0x%Lx\n", mr.range.start, mr.range.end);
+ printk(KERN_DEBUG "MIKE efi_memmap_install(0x%Lx, %d);\n", new_phys, num_entries);
}
/*
tip v4.8-rc6-654-g0d941b5745e4
virgin
[ 0.000000] MIKE md.phys_addr:0xded81000 md.virt_addr:0x0 md.num_pages:520
[ 0.000000] MIKE mr.range.start:0xdef87998 mr.range.end:0xdef879d0
[ 0.000000] MIKE efi_memmap_install(0x9d640, 51);
+MATT changes
[ 0.000000] MIKE md.phys_addr:0xded81000 md.virt_addr:0x0 md.num_pages:520
[ 0.000000] MIKE mr.range.start:0xdef87998 mr.range.end:0xdef88997
[ 0.000000] MIKE efi_memmap_install(0x9d600, 53);
+MATT changes + XXX changes (boots/works without #if 0)
[ 0.000000] MIKE md.phys_addr:0xded81000 md.virt_addr:0x0 md.num_pages:520
[ 0.000000] MIKE mr.range.start:0xdef87000 mr.range.end:0xdef87fff
[ 0.000000] MIKE efi_memmap_install(0x9d640, 51);
next prev parent reply other threads:[~2016-09-18 6:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 6:05 [tip regression] efi: Allow drivers to reserve boot services forever == toxic Mike Galbraith
2016-09-16 9:31 ` Matt Fleming
2016-09-16 10:00 ` Mike Galbraith
2016-09-16 14:30 ` Matt Fleming
2016-09-16 14:45 ` Mark Rutland
2016-09-16 18:26 ` Mike Galbraith
2016-09-19 8:56 ` Mark Rutland
2016-09-16 16:34 ` Mike Galbraith
2016-09-17 19:58 ` Matt Fleming
2016-09-18 6:09 ` Mike Galbraith [this message]
2016-09-19 11:15 ` Matt Fleming
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=1474178972.3817.2.camel@gmail.com \
--to=umgwanakikbuti@gmail.com \
--cc=ard.biesheuvel@linaro.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@elte.hu \
--cc=pjones@redhat.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).