From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Fleming Subject: Re: [PATCH V2] x86/efi: Add missing 1:1 mappings to support buggy firmware Date: Tue, 28 Feb 2017 11:51:04 +0000 Message-ID: <20170228115104.GC28416@codeblueprint.co.uk> References: <1487131421-23703-1-git-send-email-sai.praneeth.prakhya@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1487131421-23703-1-git-send-email-sai.praneeth.prakhya-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Sai Praneeth Prakhya Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "Lee, Chun-Yi" , Borislav Petkov , Ricardo Neri , Ard Biesheuvel , Ravi Shankar , Fenghua Yu List-Id: linux-efi@vger.kernel.org On Tue, 14 Feb, at 08:03:41PM, Sai Praneeth Prakhya wrote: > From: Sai Praneeth > > There are some machines with buggy firmware that access EFI regions in > 1:1 mode (or physical mode) rather than virtual mode even after kernel > being booted. On these machines, if we invoke an EFI runtime service > (that does these buggy accesses) then it causes a page fault and hence > results in kernel hang. The page fault happens because the requested > region doesn't have appropriate page attributes set or the mapping for > the region might be missing. This issue was introduced by commit > 67a9108ed431 ("x86/efi: Build our own page table structures"). Before > this commit, 1:1 mappings for EFI regions were in swapper_pgd and were > not needed to be synced, but this commit introduced efi_pgd which missed > these mappings. The subject line needs to mention EFI_CONVENTIONAL_MEMORY, because we already have 1:1 mappings for some regions, just not for EFI_CONVENTIONAL_MEMORY (by default). Those are the missing mappings. > Below is the edited version of the page fault output that I noticed: > > BUG: unable to handle kernel paging request at 0000000018847980 > IP: [] 0xfffffffef6981ec3 > PGD 4324d3063 PUD 4324e4063 PMD 0 > Oops: 0000 [#1] SMP > Modules linked in: efi_runtime(O) chipsec(O) igb e1000e [last unloaded: > efi_runtime] > CPU: 5 PID: 2308 Comm: fwts Tainted: G W O 4.7.0-yocto-standard #1 > Hardware name: Gigabyte Technology Co., Ltd. Z87X-UD5H/Z87X-UD5H-CF, > BIOS F9 03/18/2014 > task: ffff88041974d900 ti: ffff880418844000 task.ti: ffff880418844000 > RIP: 0010:[] [] 0xfffffffef6981ec3 > RSP: 0018:ffff880418847868 EFLAGS: 00010297 > RAX: 00000000000000e0 RBX: 0000000000000000 RCX: ffff880418847a50 > RDX: 0000000018847980 RSI: ffff880418847a10 RDI: 0000000000000020 > RBP: 0000000000000001 R08: ffff880418847a68 R09: 0000000000000000 > R10: ffff880418847a70 R11: 0000000000000008 R12: ffff88042005c130 > R13: 0000000000000010 R14: ffff880418847e30 R15: 0000000000000000 > FS: 00007fb94251e700(0000) GS:ffff880432b40000(0000) > knlGS:0000000000000000 > CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > CR2: 0000000018847980 CR3: 00000004324d1000 CR4: 00000000001406e0 > DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 > Call Trace: > [] ? __lock_acquire+0x121/0x1480 > [] ? __lock_acquire+0x79f/0x1480 > [] ? efi_call+0x58/0x90 > [] ? virt_efi_set_variable+0x7b/0x190 > [] ? efi_runtime_ioctl+0xe43/0x108c [efi_runtime] > [] ? __might_sleep+0x44/0x80 > [] ? do_vfs_ioctl+0x8e/0x660 > [] ? security_file_ioctl+0x3e/0x60 > [] ? SyS_ioctl+0x74/0x80 > [] ? entry_SYSCALL_64_fastpath+0x18/0xa8 > > I have looked at EFI Memory map for the faulted address and found that > it belongs to memory region of type "Conventional Memory". So, this > firmware bug is not same as accessing EFI_BOOT_SERVICES_* regions after > boot, but firmware accessing *illegal regions* in *1:1 mode*. Can you confirm that the firmware is accessing the corresponding physical address of a virtual address that was passed an argument to the EFI runtime service? In other words, is the firmware accessing memory (via the wrong mapping) that the kernel has passed, or is it accessing memory locations it shouldn't be? > Below shown are the efi_pgd dumps before and after the bad commit. > efi_dump_pagetable() is called before calling efi_merge_regions() in > __efi_enter_virtual_mode() and this kernel is booted on qemu to obtain > page table dumps. > > EFI_PGT_DUMP before commit: > --------------------------- > [0.007041] ---[ User Space ]--- > [0.007427] 0x0000000000000000-0x0000000000200000 2M RW GLB NX pte > [0.008609] 0x0000000000200000-0x0000000000800000 6M RW PSE GLB NX pmd > [0.010069] 0x0000000000800000-0x0000000000808000 32K pte > [0.011068] 0x0000000000808000-0x0000000000810000 32K RW GLB NX pte > [0.012325] 0x0000000000810000-0x0000000000900000 960K pte > [0.013071] 0x0000000000900000-0x0000000000a00000 1M RW GLB NX pte > [0.014579] 0x0000000000a00000-0x000000007e800000 2014M RW PSE GLB NX pmd > [0.015593] 0x000000007e800000-0x000000007e9b6000 1752K RW GLB NX pte > [0.016600] 0x000000007e9b6000-0x000000007e9fe000 288K pte > [0.018003] 0x000000007e9fe000-0x000000007ea00000 8K RW GLB NX pte > [0.019165] 0x000000007ea00000-0x000000007ec00000 2M RW PSE GLB NX pmd > [0.020331] 0x000000007ec00000-0x000000007eda9000 1700K RW GLB NX pte > [0.021483] 0x000000007eda9000-0x000000007ee14000 428K pte > [0.022500] 0x000000007ee14000-0x000000007f000000 1968K RW GLB NX pte > [0.023596] 0x000000007f000000-0x000000007fe00000 14M RW PSE GLB NX pmd > [0.025004] 0x000000007fe00000-0x000000007fe94000 592K RW GLB NX pte > [0.026220] 0x000000007fe94000-0x000000007fef8000 400K pte > [0.027069] 0x000000007fef8000-0x000000007ffd0000 864K RW GLB NX pte > [0.028420] 0x000000007ffd0000-0x000000007fff0000 128K pte > [0.029551] 0x000000007fff0000-0x0000000080000000 64K RW GLB NX pte > [0.030601] 0x0000000080000000-0x0000008000000000 510G pud > [0.031499] 0x0000008000000000-0xffff800000000000 17179737600G pgd > [0.032152] ---[ Kernel Space ]--- > > EFI_PGT_DUMP after commit: > -------------------------- > [0.005620] ---[ User Space ]--- > [0.005838] 0x0000000000000000-0xffff800000000000 16777088T pgd > [0.005873] ---[ Kernel Space ]--- > > While not having these mappings isn't a bug but we need these mappings > to support machines with buggy firmware. If buggy machines do not boot because we do not have these mappings, then yes, it is a bug. > Signed-off-by: Sai Praneeth Prakhya > Cc: Lee, Chun-Yi > Cc: Borislav Petkov > Cc: Ricardo Neri > Cc: Matt Fleming > Cc: Ard Biesheuvel > Cc: Ravi Shankar > Cc: Fenghua Yu > --- > arch/x86/platform/efi/efi_64.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c > index de9652bd19d4..8d2fd6568b91 100644 > --- a/arch/x86/platform/efi/efi_64.c > +++ b/arch/x86/platform/efi/efi_64.c > @@ -139,6 +139,7 @@ int __init efi_alloc_page_tables(void) > pgd_t *pgd; > pud_t *pud; > gfp_t gfp_mask; > + unsigned num_pgds; > > if (efi_enabled(EFI_OLD_MEMMAP)) > return 0; > @@ -158,6 +159,13 @@ int __init efi_alloc_page_tables(void) > > pgd_populate(NULL, pgd, pud); > > + /* > + * Sync 1:1 mappings to support buggy firmware which haven't updated > + * their addresses even after kernel has booted. > + */ > + num_pgds = pgd_index(VMALLOC_START) - pgd_index(PAGE_OFFSET); > + memcpy(efi_pgd, pgd_offset_k(PAGE_OFFSET), sizeof(pgd_t) * num_pgds); > + > return 0; > } > I don't think we should be adding yet another place in the EFI code where we're modifying the page tables. We already have the ability to map EFI_CONVENTIONAL_MEMORY regions inside of efi_map_regions() via the should_map_region() function. Currently, unless you're booting in mixed mode that function will return 'false' if the region type is EFI_CONVENTIONAL_MEMORY, so to get your machine booting you need to do two things, 1) Modify should_map_region() to allow EFI_CONVENTIONAL_MEMORY to be mapped 2) Modify the 64-bit version of efi_map_region() to *only* create 1:1 mapping for EFI_CONVENTIONAL_MEMORY regions.