| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1341576018-10721-6-git-send-email-fweisbec@gmail.com> Date: Fri, 6 Jul 2012 14:00:17 +0200 From: Frederic Weisbecker <fweisbec@...il.com> To: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com> Cc: LKML <linux-kernel@...r.kernel.org>, Frederic Weisbecker <fweisbec@...il.com>, Alessio Igor Bogani <abogani@...nel.org>, Andrew Morton <akpm@...ux-foundation.org>, Avi Kivity <avi@...hat.com>, Chris Metcalf <cmetcalf@...era.com>, Christoph Lameter <cl@...ux.com>, Geoff Levand <geoff@...radead.org>, Gilad Ben Yossef <gilad@...yossef.com>, Hakan Akkan <hakanakkan@...il.com>, "H. Peter Anvin" <hpa@...or.com>, Ingo Molnar <mingo@...nel.org>, Josh Triplett <josh@...htriplett.org>, Kevin Hilman <khilman@...com>, Max Krasnyansky <maxk@...lcomm.com>, Peter Zijlstra <peterz@...radead.org>, Stephen Hemminger <shemminger@...tta.com>, Steven Rostedt <rostedt@...dmis.org>, Sven-Thorsten Dietrich <thebigcorporation@...il.com>, Thomas Gleixner <tglx@...utronix.de> Subject: [PATCH 5/6] x86: Kernel entry/exit hooks for RCU Hook on kernel boundaries from syscall/exception entry/exit and irq exit to implement RCU userspace extended quiescent state. Signed-off-by: Frederic Weisbecker <fweisbec@...il.com> Cc: Alessio Igor Bogani <abogani@...nel.org> Cc: Andrew Morton <akpm@...ux-foundation.org> Cc: Avi Kivity <avi@...hat.com> Cc: Chris Metcalf <cmetcalf@...era.com> Cc: Christoph Lameter <cl@...ux.com> Cc: Geoff Levand <geoff@...radead.org> Cc: Gilad Ben Yossef <gilad@...yossef.com> Cc: Hakan Akkan <hakanakkan@...il.com> Cc: H. Peter Anvin <hpa@...or.com> Cc: Ingo Molnar <mingo@...nel.org> Cc: Josh Triplett <josh@...htriplett.org> Cc: Kevin Hilman <khilman@...com> Cc: Max Krasnyansky <maxk@...lcomm.com> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Stephen Hemminger <shemminger@...tta.com> Cc: Steven Rostedt <rostedt@...dmis.org> Cc: Sven-Thorsten Dietrich <thebigcorporation@...il.com> Cc: Thomas Gleixner <tglx@...utronix.de> --- arch/x86/include/asm/rcu.h | 7 +++++++ arch/x86/kernel/entry_64.S | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 arch/x86/include/asm/rcu.h diff --git a/arch/x86/include/asm/rcu.h b/arch/x86/include/asm/rcu.h new file mode 100644 index 0000000..8ad018a --- /dev/null +++ b/arch/x86/include/asm/rcu.h @@ -0,0 +1,7 @@ +#ifdef CONFIG_RCU_USER_QS +# define ENTER_KERNEL callq rcu_user_exit +# define EXIT_KERNEL callq rcu_user_enter +#else +# define ENTER_KERNEL +# define EXIT_KERNEL +#endif diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index e97d42d..677a808 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -56,6 +56,7 @@ #include <asm/ftrace.h> #include <asm/percpu.h> #include <asm/asm.h> +#include <asm/rcu.h> #include <linux/err.h> /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */ @@ -517,6 +518,22 @@ GLOBAL(system_call_after_swapgs) movq %rax,ORIG_RAX-ARGOFFSET(%rsp) movq %rcx,RIP-ARGOFFSET(%rsp) CFI_REL_OFFSET rip,RIP-ARGOFFSET +#ifdef CONFIG_RCU_USER_QS + ENTER_KERNEL + /* + * Syscall args/scratch reg might have been + * clobbered by rcu_user_exit() call. Restore + * them. + */ + movq RDI-ARGOFFSET(%rsp), %rdi + movq RSI-ARGOFFSET(%rsp), %rsi + movq RDX-ARGOFFSET(%rsp), %rdx + movq R8-ARGOFFSET(%rsp), %r8 + movq R9-ARGOFFSET(%rsp), %r9 + movq ORIG_RAX-ARGOFFSET(%rsp), %rax + movq R10-ARGOFFSET(%rsp), %r10 + movq R11-ARGOFFSET(%rsp), %r11 +#endif testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET) jnz tracesys system_call_fastpath: @@ -544,6 +561,7 @@ sysret_check: movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx andl %edi,%edx jnz sysret_careful + EXIT_KERNEL CFI_REMEMBER_STATE /* * sysretq will re-enable interrupts: @@ -925,6 +943,7 @@ retint_swapgs: /* return to user-space */ */ DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_IRETQ + EXIT_KERNEL SWAPGS jmp restore_args @@ -1101,6 +1120,7 @@ ENTRY(\sym) subq $ORIG_RAX-R15, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry + ENTER_KERNEL DEFAULT_FRAME 0 movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ @@ -1119,6 +1139,7 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF + ENTER_KERNEL movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ call \do_sym @@ -1137,6 +1158,7 @@ ENTRY(\sym) CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid TRACE_IRQS_OFF_DEBUG + ENTER_KERNEL movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist) @@ -1154,6 +1176,7 @@ ENTRY(\sym) subq $ORIG_RAX-R15, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call error_entry + ENTER_KERNEL DEFAULT_FRAME 0 movq %rsp,%rdi /* pt_regs pointer */ movq ORIG_RAX(%rsp),%rsi /* get error code */ @@ -1172,6 +1195,7 @@ ENTRY(\sym) subq $ORIG_RAX-R15, %rsp CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 call save_paranoid + ENTER_KERNEL DEFAULT_FRAME 0 TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ @@ -1437,6 +1461,7 @@ ENTRY(paranoid_exit) testl $3,CS(%rsp) jnz paranoid_userspace paranoid_swapgs: + EXIT_KERNEL TRACE_IRQS_IRETQ 0 SWAPGS_UNSAFE_STACK RESTORE_ALL 8 -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists