From: Andy Lutomirski <luto@kernel.org>
To: x86@kernel.org
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Denys Vlasenko <dvlasenk@redhat.com>,
Borislav Petkov <bp@alien8.de>, Andy Lutomirski <luto@kernel.org>
Subject: [PATCH] x86/asm/entry/64: Disentangle error_entry/exit gsbase/ebx/usermode code
Date: Tue, 9 Jun 2015 12:36:01 -0700 [thread overview]
Message-ID: <f1be898ab93360169fb845ab85185948832209ee.1433878454.git.luto@kernel.org> (raw)
The error_entry/error_exit code to handle gsbase and whether we return
to user mdoe was a mess:
- error_sti was misnamed. In particular, it did not enable interrupts.
- Error handling for gs_change was hopelessly tangled the normal
usermode path. Separate it out. This saves a branch in normal
entries from kernel mode.
- The comments were bad.
Fix it up. As a nice side effect, there's now a code path that happens
on error entries from user mode. We'll use it soon.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
---
arch/x86/entry/entry_64.S | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index bd97161f90cb..3462a4f09425 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -1135,7 +1135,7 @@ END(paranoid_exit)
/*
* Save all registers in pt_regs, and switch gs if needed.
- * Return: ebx=0: need swapgs on exit, ebx=1: otherwise
+ * Return: ebx=0: came from user mode; ebx=1: otherwise
*/
ENTRY(error_entry)
cld
@@ -1144,9 +1144,11 @@ ENTRY(error_entry)
xorl %ebx, %ebx
testb $3, CS+8(%rsp)
jz error_kernelspace
-error_swapgs:
+
+ /* We entered from user mode */
SWAPGS
-error_sti:
+
+error_entry_done:
TRACE_IRQS_OFF
ret
@@ -1165,8 +1167,15 @@ error_kernelspace:
cmpq %rax, RIP+8(%rsp)
je bstep_iret
cmpq $gs_change, RIP+8(%rsp)
- je error_swapgs
- jmp error_sti
+ jne error_entry_done
+
+ /*
+ * hack: gs_change can fail with user gsbase. If this happens, fix up
+ * gsbase and proceed. We'll fix up the exception and land in
+ * gs_change's error handler with kernel gsbase.
+ */
+ SWAPGS
+ jmp error_entry_done
bstep_iret:
/* Fix truncated RIP */
@@ -1174,16 +1183,30 @@ bstep_iret:
/* fall through */
error_bad_iret:
+ /*
+ * We came from an IRET to user mode, so we have user gsbase.
+ * Switch to kernel gsbase.
+ */
SWAPGS
+
+ /*
+ * Pretend that the exception came from user mode: set up pt_regs
+ * as if we faulted immediately after IRET and zero ebx so that
+ * error_exit knows that we will returning to user mode.
+ */
mov %rsp, %rdi
call fixup_bad_iret
mov %rax, %rsp
- decl %ebx /* Return to usergs */
- jmp error_sti
+ decl %ebx
+ jmp error_entry_done
END(error_entry)
-/* On entry, ebx is "no swapgs" flag (1: don't need swapgs, 0: need it) */
+/*
+ * On entry, ebx is "return to kernel" flag
+ * 1: don't need swapgs
+ * 0: need swapgs and standard preparation for return to usermode
+ */
ENTRY(error_exit)
movl %ebx, %eax
RESTORE_EXTRA_REGS
--
2.4.2
next reply other threads:[~2015-06-09 19:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-09 19:36 Andy Lutomirski [this message]
2015-06-10 7:10 ` [tip:x86/asm] x86/asm/entry/64: Disentangle error_entry/ exit gsbase/ebx/usermode code tip-bot for Andy Lutomirski
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=f1be898ab93360169fb845ab85185948832209ee.1433878454.git.luto@kernel.org \
--to=luto@kernel.org \
--cc=bp@alien8.de \
--cc=dvlasenk@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--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: 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).