Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1394969
| From | tip-bot for Brian Gerst <tipbot@zytor.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [tip:x86/asm] x86/entry, sched/x86: Don't save/restore EFLAGS on task switch |
| Date | 2016-05-05 11:40 +0200 |
| Message-ID | <rvnVg-5Rb-17@gated-at.bofh.it> (permalink) |
| References | <rvhwt-7Y4-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Commit-ID: 092c74e420952c7cb68141731f2b562245b51eeb
Gitweb: http://git.kernel.org/tip/092c74e420952c7cb68141731f2b562245b51eeb
Author: Brian Gerst <brgerst@gmail.com>
AuthorDate: Wed, 4 May 2016 22:44:36 -0400
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 5 May 2016 08:37:30 +0200
x86/entry, sched/x86: Don't save/restore EFLAGS on task switch
Now that NT is filtered by the SYSENTER entry code, it is safe to skip saving and
restoring flags on task switch. Also remove a leftover reset of flags on 64-bit
fork.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1462416278-11974-2-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/entry/entry_32.S | 4 ----
arch/x86/entry/entry_64.S | 3 ---
arch/x86/include/asm/switch_to.h | 4 +---
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index 10868aa..c84d99b 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -209,8 +209,6 @@ ENTRY(ret_from_fork)
call schedule_tail
GET_THREAD_INFO(%ebp)
popl %eax
- pushl $0x0202 # Reset kernel eflags
- popfl
/* When we fork, we trace the syscall return in the child, too. */
movl %esp, %eax
@@ -223,8 +221,6 @@ ENTRY(ret_from_kernel_thread)
call schedule_tail
GET_THREAD_INFO(%ebp)
popl %eax
- pushl $0x0202 # Reset kernel eflags
- popfl
movl PT_EBP(%esp), %eax
call *PT_EBX(%esp)
movl $0, PT_EAX(%esp)
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 6344629..9ee0da1 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -372,9 +372,6 @@ END(ptregs_\func)
ENTRY(ret_from_fork)
LOCK ; btr $TIF_FORK, TI_flags(%r8)
- pushq $0x0002
- popfq /* reset kernel eflags */
-
call schedule_tail /* rdi: 'prev' task parameter */
testb $3, CS(%rsp) /* from kernel_thread? */
diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
index 751bf4b..8f321a1 100644
--- a/arch/x86/include/asm/switch_to.h
+++ b/arch/x86/include/asm/switch_to.h
@@ -39,8 +39,7 @@ do { \
*/ \
unsigned long ebx, ecx, edx, esi, edi; \
\
- asm volatile("pushfl\n\t" /* save flags */ \
- "pushl %%ebp\n\t" /* save EBP */ \
+ asm volatile("pushl %%ebp\n\t" /* save EBP */ \
"movl %%esp,%[prev_sp]\n\t" /* save ESP */ \
"movl %[next_sp],%%esp\n\t" /* restore ESP */ \
"movl $1f,%[prev_ip]\n\t" /* save EIP */ \
@@ -49,7 +48,6 @@ do { \
"jmp __switch_to\n" /* regparm call */ \
"1:\t" \
"popl %%ebp\n\t" /* restore EBP */ \
- "popfl\n" /* restore flags */ \
\
/* output parameters */ \
: [prev_sp] "=m" (prev->thread.sp), \
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/3] Misc x86 cleanups Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
[PATCH 1/3] x86: Don't save/restore EFLAGS on task switch Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
Re: [PATCH 1/3] x86: Don't save/restore EFLAGS on task switch Andy Lutomirski <luto@amacapital.net> - 2016-05-05 05:30 +0200
[tip:x86/asm] x86/entry, sched/x86: Don't save/restore EFLAGS on task switch tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-05-05 11:40 +0200
[PATCH 2/3] x86-32: Remove GET_THREAD_INFO from entry code Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
Re: [PATCH 2/3] x86-32: Remove GET_THREAD_INFO from entry code Andy Lutomirski <luto@amacapital.net> - 2016-05-05 05:30 +0200
[tip:x86/asm] x86/entry/32: Remove GET_THREAD_INFO() from entry code tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-05-05 11:40 +0200
[PATCH 3/3] x86-32: Remove asmlinkage_protect Brian Gerst <brgerst@gmail.com> - 2016-05-05 04:50 +0200
Re: [PATCH 3/3] x86-32: Remove asmlinkage_protect Andy Lutomirski <luto@amacapital.net> - 2016-05-05 05:30 +0200
[tip:x86/asm] x86/entry/32: Remove asmlinkage_protect() tip-bot for Brian Gerst <tipbot@zytor.com> - 2016-05-05 11:40 +0200
csiph-web