Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933451AbbFJHLM (ORCPT ); Wed, 10 Jun 2015 03:11:12 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34094 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964792AbbFJHKz (ORCPT ); Wed, 10 Jun 2015 03:10:55 -0400 Date: Wed, 10 Jun 2015 00:09:52 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, rostedt@goodmis.org, luto@amacapital.net, torvalds@linux-foundation.org, oleg@redhat.com, dvlasenk@redhat.com, wad@chromium.org, linux-kernel@vger.kernel.org, ast@plumgrid.com, akpm@linux-foundation.org, fweisbec@gmail.com, keescook@chromium.org, tglx@linutronix.de, bp@alien8.de Reply-To: oleg@redhat.com, dvlasenk@redhat.com, wad@chromium.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, ast@plumgrid.com, keescook@chromium.org, fweisbec@gmail.com, tglx@linutronix.de, bp@alien8.de, mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, rostedt@goodmis.org, luto@amacapital.net, torvalds@linux-foundation.org In-Reply-To: <1433876051-26604-2-git-send-email-dvlasenk@redhat.com> References: <1433876051-26604-2-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/32: Explain reloading of registers after __audit_syscall_entry() Git-Commit-ID: 1536bb46fac7672ef04aaaa6a3b07848314263bc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3458 Lines: 93 Commit-ID: 1536bb46fac7672ef04aaaa6a3b07848314263bc Gitweb: http://git.kernel.org/tip/1536bb46fac7672ef04aaaa6a3b07848314263bc Author: Denys Vlasenko AuthorDate: Tue, 9 Jun 2015 20:54:08 +0200 Committer: Ingo Molnar CommitDate: Wed, 10 Jun 2015 08:42:13 +0200 x86/asm/entry/32: Explain reloading of registers after __audit_syscall_entry() Here it is not obvious why we load pt_regs->cx to %esi etc. Lets improve comments. Explain that here we combine two things: first, we reload registers since some of them are clobbered by the C function we just called; and we also convert 32-bit syscall params to 64-bit C ABI, because we are going to jump back to syscall dispatch code. Move reloading of 6th argument into the macro instead of having it after each of two macro invocations. No actual code changes here. Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Cc: Will Drewry Link: http://lkml.kernel.org/r/1433876051-26604-2-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64_compat.S | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index 2c44180..0fa108c 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -185,12 +185,18 @@ sysexit_from_sys_call: movl %ebx, %esi /* 2nd arg: 1st syscall arg */ movl %eax, %edi /* 1st arg: syscall number */ call __audit_syscall_entry - movl ORIG_RAX(%rsp), %eax /* reload syscall number */ - movl %ebx, %edi /* reload 1st syscall arg */ - movl RCX(%rsp), %esi /* reload 2nd syscall arg */ - movl RDX(%rsp), %edx /* reload 3rd syscall arg */ - movl RSI(%rsp), %ecx /* reload 4th syscall arg */ - movl RDI(%rsp), %r8d /* reload 5th syscall arg */ + /* + * We are going to jump back to syscall dispatch. + * Prepare syscall args as required by 64-bit C ABI. + * Clobbered registers are loaded from pt_regs on stack. + */ + movl ORIG_RAX(%rsp), %eax /* syscall number */ + movl %ebx, %edi /* arg1 */ + movl RCX(%rsp), %esi /* arg2 */ + movl RDX(%rsp), %edx /* arg3 */ + movl RSI(%rsp), %ecx /* arg4 */ + movl RDI(%rsp), %r8d /* arg5 */ + movl %ebp, %r9d /* arg6 */ .endm .macro auditsys_exit exit @@ -221,7 +227,6 @@ sysexit_from_sys_call: sysenter_auditsys: auditsys_entry_common - movl %ebp, %r9d /* reload 6th syscall arg */ jmp sysenter_dispatch sysexit_audit: @@ -379,7 +384,6 @@ sysretl_from_sys_call: #ifdef CONFIG_AUDITSYSCALL cstar_auditsys: auditsys_entry_common - movl %ebp, %r9d /* reload 6th syscall arg */ jmp cstar_dispatch sysretl_audit: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/