From: tip-bot for Andy Lutomirski <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, brgerst@gmail.com,
torvalds@linux-foundation.org, hpa@zytor.com, luto@kernel.org,
bpetkov@suse.de, linux-kernel@vger.kernel.org,
peterz@infradead.org, dave.hansen@intel.com, tglx@linutronix.de,
bp@suse.de
Subject: [tip:x86/asm] x86/entry/64: Use pop instead of movq in syscall_return_via_sysret
Date: Thu, 2 Nov 2017 03:51:08 -0700 [thread overview]
Message-ID: <tip-4fbb39108f972437c44e5ffa781b56635d496826@git.kernel.org> (raw)
In-Reply-To: <6609b7f74ab31c36604ad746e019ea8495aec76c.1509609304.git.luto@kernel.org>
Commit-ID: 4fbb39108f972437c44e5ffa781b56635d496826
Gitweb: https://git.kernel.org/tip/4fbb39108f972437c44e5ffa781b56635d496826
Author: Andy Lutomirski <luto@kernel.org>
AuthorDate: Thu, 2 Nov 2017 00:59:03 -0700
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 2 Nov 2017 11:04:39 +0100
x86/entry/64: Use pop instead of movq in syscall_return_via_sysret
Saves 64 bytes.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave.hansen@intel.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/6609b7f74ab31c36604ad746e019ea8495aec76c.1509609304.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/entry/entry_64.S | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 15539644..4f9b446 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -315,10 +315,18 @@ return_from_SYSCALL_64:
*/
syscall_return_via_sysret:
/* rcx and r11 are already restored (see code above) */
- RESTORE_EXTRA_REGS
- RESTORE_C_REGS_EXCEPT_RCX_R11
- movq RSP(%rsp), %rsp
UNWIND_HINT_EMPTY
+ POP_EXTRA_REGS
+ popq %rsi /* skip r11 */
+ popq %r10
+ popq %r9
+ popq %r8
+ popq %rax
+ popq %rsi /* skip rcx */
+ popq %rdx
+ popq %rsi
+ popq %rdi
+ movq RSP-ORIG_RAX(%rsp), %rsp
USERGS_SYSRET64
END(entry_SYSCALL_64)
next prev parent reply other threads:[~2017-11-02 10:55 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 7:58 [PATCH v2 00/20] Pile o' entry/exit/sp0 changes Andy Lutomirski
2017-11-02 7:58 ` [PATCH v2 01/20] x86/asm/64: Remove the restore_c_regs_and_iret label Andy Lutomirski
2017-11-02 10:49 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:58 ` [PATCH v2 02/20] x86/asm/64: Split the iret-to-user and iret-to-kernel paths Andy Lutomirski
2017-11-02 10:49 ` [tip:x86/asm] x86/entry/64: Split the IRET-to-user and IRET-to-kernel paths tip-bot for Andy Lutomirski
2017-11-02 10:50 ` [PATCH v2 02/20] x86/asm/64: Split the iret-to-user and iret-to-kernel paths Borislav Petkov
2017-11-02 12:09 ` [PATCH] x86/entry/64: Shorten TEST instructions Borislav Petkov
2017-11-02 12:48 ` [tip:x86/asm] " tip-bot for Borislav Petkov
2017-11-02 7:59 ` [PATCH v2 03/20] x86/asm/64: Move SWAPGS into the common iret-to-usermode path Andy Lutomirski
2017-11-02 10:49 ` [tip:x86/asm] x86/entry/64: Move SWAPGS into the common IRET-to-usermode path tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 04/20] x86/asm/64: Simplify reg restore code in the standard IRET paths Andy Lutomirski
2017-11-02 10:50 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 05/20] x86/asm/64: Shrink paranoid_exit_restore and make labels local Andy Lutomirski
2017-11-02 10:50 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 06/20] x86/asm/64: Use pop instead of movq in syscall_return_via_sysret Andy Lutomirski
2017-11-02 10:51 ` tip-bot for Andy Lutomirski [this message]
2017-11-02 7:59 ` [PATCH v2 07/20] x86/asm/64: Merge the fast and slow SYSRET paths Andy Lutomirski
2017-11-02 10:51 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 08/20] x86/entry/64: Use POP instead of MOV to restore regs on NMI return Andy Lutomirski
2017-11-02 10:51 ` [tip:x86/asm] " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 09/20] x86/entry/64: Remove the RESTORE_..._REGS infrastructure Andy Lutomirski
2017-11-02 10:52 ` [tip:x86/asm] " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 10/20] xen: add xen nmi trap entry Andy Lutomirski
2017-11-02 10:52 ` [tip:x86/asm] xen, x86/entry/64: Add xen NMI " tip-bot for Juergen Gross
2017-11-02 7:59 ` [PATCH v2 11/20] x86/asm/64: De-Xen-ify our NMI code Andy Lutomirski
2017-11-02 10:53 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 12/20] x86/asm/32: Pull MSR_IA32_SYSENTER_CS update code out of native_load_sp0() Andy Lutomirski
2017-11-02 10:53 ` [tip:x86/asm] x86/entry/32: Pull the " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 13/20] x86/asm/64: Pass sp0 directly to load_sp0() Andy Lutomirski
2017-11-02 9:48 ` Ingo Molnar
2017-11-02 9:53 ` Ingo Molnar
2017-11-02 10:32 ` Andy Lutomirski
2017-11-02 10:53 ` [tip:x86/asm] x86/entry/64: Pass SP0 " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 14/20] x86/asm: Add task_top_of_stack() to find the top of a task's stack Andy Lutomirski
2017-11-02 10:54 ` [tip:x86/asm] x86/entry: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 15/20] x86/xen/64: Clean up SP code in cpu_initialize_context() Andy Lutomirski
2017-11-02 9:56 ` Juergen Gross
2017-11-02 10:54 ` [tip:x86/asm] x86/xen/64, x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 16/20] x86/boot/64: Stop initializing TSS.sp0 at boot Andy Lutomirski
2017-11-02 10:55 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 17/20] x86/asm/64: Remove all remaining direct thread_struct::sp0 reads Andy Lutomirski
2017-11-02 10:55 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 18/20] x86/boot/32: Fix cpu_current_top_of_stack initialization at boot Andy Lutomirski
2017-11-02 10:56 ` [tip:x86/asm] x86/entry/32: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 19/20] x86/asm/64: Remove thread_struct::sp0 Andy Lutomirski
2017-11-02 10:56 ` [tip:x86/asm] x86/entry/64: " tip-bot for Andy Lutomirski
2017-11-02 7:59 ` [PATCH v2 20/20] x86/traps: Use a new on_thread_stack() helper to clean up an assertion Andy Lutomirski
2017-11-02 10:56 ` [tip:x86/asm] " 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=tip-4fbb39108f972437c44e5ffa781b56635d496826@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=bpetkov@suse.de \
--cc=brgerst@gmail.com \
--cc=dave.hansen@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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).