From: tip-bot for Guenter Roeck <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: jroedel@suse.de, linux-kernel@vger.kernel.org,
tglx@linutronix.de, linux@roeck-us.net,
ard.biesheuvel@linaro.org, hpa@zytor.com,
torvalds@linux-foundation.org, mingo@kernel.org,
luto@amacapital.net
Subject: [tip:x86/urgent] x86/efi: Load fixmap GDT in efi_call_phys_epilog() before setting %cr3
Date: Wed, 12 Sep 2018 12:57:53 -0700 [thread overview]
Message-ID: <tip-cf40361ede6cf9dc09349e4c049dc0d166ca2d8b@git.kernel.org> (raw)
In-Reply-To: <1536689892-21538-1-git-send-email-linux@roeck-us.net>
Commit-ID: cf40361ede6cf9dc09349e4c049dc0d166ca2d8b
Gitweb: https://git.kernel.org/tip/cf40361ede6cf9dc09349e4c049dc0d166ca2d8b
Author: Guenter Roeck <linux@roeck-us.net>
AuthorDate: Tue, 11 Sep 2018 11:18:12 -0700
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 12 Sep 2018 21:53:34 +0200
x86/efi: Load fixmap GDT in efi_call_phys_epilog() before setting %cr3
Commit eeb89e2bb1ac ("x86/efi: Load fixmap GDT in efi_call_phys_epilog()")
moved loading the fixmap in efi_call_phys_epilog() after load_cr3() since
it was assumed to be more logical.
Turns out this is incorrect: In efi_call_phys_prolog(), the gdt with its
physical address is loaded first, and when the %cr3 is reloaded in _epilog
from initial_page_table to swapper_pg_dir again the gdt is no longer
mapped. This results in a triple fault if an interrupt occurs after
load_cr3() and before load_fixmap_gdt(0). Calling load_fixmap_gdt(0) first
restores the execution order prior to commit eeb89e2bb1ac and fixes the
problem.
Fixes: eeb89e2bb1ac ("x86/efi: Load fixmap GDT in efi_call_phys_epilog()")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: linux-efi@vger.kernel.org
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Joerg Roedel <jroedel@suse.de>
Link: https://lkml.kernel.org/r/1536689892-21538-1-git-send-email-linux@roeck-us.net
---
arch/x86/platform/efi/efi_32.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
index 05ca14222463..9959657127f4 100644
--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
@@ -85,10 +85,9 @@ pgd_t * __init efi_call_phys_prolog(void)
void __init efi_call_phys_epilog(pgd_t *save_pgd)
{
+ load_fixmap_gdt(0);
load_cr3(save_pgd);
__flush_tlb_all();
-
- load_fixmap_gdt(0);
}
void __init efi_runtime_update_mappings(void)
prev parent reply other threads:[~2018-09-12 19:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-11 18:18 [PATCH] x86/efi: Load fixmap GDT in efi_call_phys_epilog() before setting %cr3 Guenter Roeck
2018-09-12 19:57 ` tip-bot for Guenter Roeck [this message]
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=tip-cf40361ede6cf9dc09349e4c049dc0d166ca2d8b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=ard.biesheuvel@linaro.org \
--cc=hpa@zytor.com \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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).