From: David Woodhouse <dwmw@amazon.co.uk> To: Andi Kleen <ak@linux.intel.com> Cc: Paul Turner <pjt@google.com>, LKML <linux-kernel@vger.kernel.org>, Linus Torvalds <torvalds@linux-foundation.org>, Greg Kroah-Hartman <gregkh@linux-foundation.org>, Tim Chen <tim.c.chen@linux.intel.com>, Dave Hansen <dave.hansen@intel.com>, tglx@linutronix.de, Kees Cook <keescook@google.com>, Rik van Riel <riel@redhat.com>, Peter Zijlstra <peterz@infradead.org>, Andy Lutomirski <luto@amacapital.net>, Jiri Kosina <jikos@kernel.org>, gnomes@lxorguk.ukuu.org.uk, x86@kernel.org, thomas.lendacky@amd.com, Josh Poimboeuf <jpoimboe@redhat.com> Subject: [PATCH v8 11/12] x86/retpoline/irq32: Convert assembler indirect jumps Date: Thu, 11 Jan 2018 21:46:33 +0000 Message-ID: <1515707194-20531-12-git-send-email-dwmw@amazon.co.uk> (raw) In-Reply-To: <1515707194-20531-1-git-send-email-dwmw@amazon.co.uk> From: Andi Kleen <ak@linux.intel.com> Convert all indirect jumps in 32bit irq inline asm code to use non speculative sequences. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Arjan van de Ven <arjan@linux.intel.com> Acked-by: Ingo Molnar <mingo@kernel.org> Cc: gnomes@lxorguk.ukuu.org.uk Cc: Rik van Riel <riel@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Jiri Kosina <jikos@kernel.org> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Dave Hansen <dave.hansen@intel.com> Cc: Kees Cook <keescook@google.com> Cc: Tim Chen <tim.c.chen@linux.intel.com> Cc: Greg Kroah-Hartman <gregkh@linux-foundation.org> Cc: Paul Turner <pjt@google.com> Link: https://lkml.kernel.org/r/1515508997-6154-11-git-send-email-dwmw@amazon.co.uk --- arch/x86/kernel/irq_32.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index a83b334..c1bdbd3 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c @@ -20,6 +20,7 @@ #include <linux/mm.h> #include <asm/apic.h> +#include <asm/nospec-branch.h> #ifdef CONFIG_DEBUG_STACKOVERFLOW @@ -55,11 +56,11 @@ DEFINE_PER_CPU(struct irq_stack *, softirq_stack); static void call_on_stack(void *func, void *stack) { asm volatile("xchgl %%ebx,%%esp \n" - "call *%%edi \n" + CALL_NOSPEC "movl %%ebx,%%esp \n" : "=b" (stack) : "0" (stack), - "D"(func) + [thunk_target] "D"(func) : "memory", "cc", "edx", "ecx", "eax"); } @@ -95,11 +96,11 @@ static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc) call_on_stack(print_stack_overflow, isp); asm volatile("xchgl %%ebx,%%esp \n" - "call *%%edi \n" + CALL_NOSPEC "movl %%ebx,%%esp \n" : "=a" (arg1), "=b" (isp) : "0" (desc), "1" (isp), - "D" (desc->handle_irq) + [thunk_target] "D" (desc->handle_irq) : "memory", "cc", "ecx"); return 1; } -- 2.7.4
next prev parent reply index Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-11 21:46 [PATCH v8 00/12] Retpoline: Avoid speculative indirect calls in kernel David Woodhouse 2018-01-11 21:46 ` [PATCH v8 01/12] objtool: Detect jumps to retpoline thunks David Woodhouse 2018-01-11 23:22 ` [tip:x86/pti] " tip-bot for Josh Poimboeuf 2018-01-11 21:46 ` [PATCH v8 02/12] objtool: Allow alternatives to be ignored David Woodhouse 2018-01-11 23:22 ` [tip:x86/pti] " tip-bot for Josh Poimboeuf 2018-01-18 19:09 ` [v8,02/12] " Guenter Roeck 2018-01-18 19:33 ` Josh Poimboeuf 2018-01-18 19:41 ` Guenter Roeck 2018-01-22 19:34 ` David Woodhouse 2018-01-22 20:25 ` Guenter Roeck 2018-01-22 20:27 ` David Woodhouse 2018-01-28 21:06 ` Josh Poimboeuf 2018-01-29 1:26 ` Guenter Roeck 2018-01-29 17:15 ` Guenter Roeck 2018-01-29 17:30 ` Josh Poimboeuf 2018-01-22 19:27 ` Guenter Roeck 2018-01-11 21:46 ` [PATCH v8 03/12] x86/retpoline: Add initial retpoline support David Woodhouse 2018-01-11 23:23 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 23:58 ` [PATCH v8 03/12] " Tom Lendacky 2018-01-12 10:28 ` David Woodhouse 2018-01-12 14:02 ` Tom Lendacky 2018-01-14 15:02 ` Borislav Petkov 2018-01-14 15:53 ` Josh Poimboeuf 2018-01-14 15:59 ` Borislav Petkov 2018-01-11 21:46 ` [PATCH v8 04/12] x86/spectre: Add boot time option to select Spectre v2 mitigation David Woodhouse 2018-01-11 23:23 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-23 22:40 ` [PATCH v8 04/12] " Borislav Petkov 2018-01-23 22:53 ` David Woodhouse 2018-01-23 23:05 ` Andi Kleen 2018-01-23 22:55 ` Jiri Kosina 2018-01-23 23:05 ` Borislav Petkov 2018-01-24 0:32 ` Kees Cook 2018-01-24 9:58 ` Borislav Petkov 2018-01-23 23:06 ` Jiri Kosina 2018-01-23 23:21 ` Andi Kleen 2018-01-23 23:24 ` Jiri Kosina 2018-01-23 23:45 ` Andi Kleen 2018-01-23 23:49 ` Jiri Kosina 2018-01-24 4:26 ` Greg Kroah-Hartman 2018-01-24 9:56 ` Jiri Kosina 2018-01-24 13:58 ` Greg Kroah-Hartman 2018-01-24 14:03 ` Jiri Kosina 2018-01-24 14:22 ` Greg Kroah-Hartman 2018-01-11 21:46 ` [PATCH v8 05/12] x86/retpoline/crypto: Convert crypto assembler indirect jumps David Woodhouse 2018-01-11 23:24 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 21:46 ` [PATCH v8 06/12] x86/retpoline/entry: Convert entry " David Woodhouse 2018-01-11 23:24 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 21:46 ` [PATCH v8 07/12] x86/retpoline/ftrace: Convert ftrace " David Woodhouse 2018-01-11 23:25 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 21:46 ` [PATCH v8 08/12] x86/retpoline/hyperv: Convert " David Woodhouse 2018-01-11 23:25 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 21:46 ` [PATCH v8 09/12] x86/retpoline/xen: Convert Xen hypercall " David Woodhouse 2018-01-11 23:25 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 21:46 ` [PATCH v8 10/12] x86/retpoline/checksum32: Convert assembler " David Woodhouse 2018-01-11 23:26 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 21:46 ` David Woodhouse [this message] 2018-01-11 23:26 ` [tip:x86/pti] x86/retpoline/irq32: " tip-bot for Andi Kleen 2018-01-11 21:46 ` [PATCH v8 12/12] x86/retpoline: Fill return stack buffer on vmexit David Woodhouse 2018-01-11 23:27 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-11 23:51 ` [PATCH v8 12/12] " Andi Kleen 2018-01-12 11:11 ` [PATCH v8.1 " David Woodhouse 2018-01-12 11:15 ` Thomas Gleixner 2018-01-12 11:21 ` Woodhouse, David 2018-01-12 11:37 ` [tip:x86/pti] " tip-bot for David Woodhouse 2018-01-14 14:50 ` Borislav Petkov 2018-01-14 15:28 ` Thomas Gleixner 2018-01-14 15:35 ` Borislav Petkov 2018-01-25 12:07 ` Borislav Petkov 2018-01-25 12:20 ` David Woodhouse 2018-01-25 12:45 ` Borislav Petkov 2018-01-25 15:10 ` Josh Poimboeuf 2018-01-25 15:51 ` Borislav Petkov 2018-01-25 16:03 ` David Woodhouse 2018-01-25 16:56 ` Josh Poimboeuf 2018-01-25 17:00 ` David Woodhouse 2018-01-25 17:05 ` Andy Lutomirski 2018-01-25 17:44 ` Josh Poimboeuf 2018-01-25 18:41 ` Jiri Kosina 2018-01-25 17:10 ` Thomas Gleixner 2018-01-25 17:32 ` Josh Poimboeuf 2018-01-25 17:53 ` Borislav Petkov 2018-01-25 18:04 ` David Woodhouse 2018-01-25 18:32 ` Josh Poimboeuf 2018-01-25 19:07 ` Borislav Petkov 2018-01-25 19:10 ` Borislav Petkov 2020-03-19 4:58 [PATCH v8 11/12] x86/retpoline/irq32: Convert assembler indirect jumps David English
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=1515707194-20531-12-git-send-email-dwmw@amazon.co.uk \ --to=dwmw@amazon.co.uk \ --cc=ak@linux.intel.com \ --cc=dave.hansen@intel.com \ --cc=gnomes@lxorguk.ukuu.org.uk \ --cc=gregkh@linux-foundation.org \ --cc=jikos@kernel.org \ --cc=jpoimboe@redhat.com \ --cc=keescook@google.com \ --cc=linux-kernel@vger.kernel.org \ --cc=luto@amacapital.net \ --cc=peterz@infradead.org \ --cc=pjt@google.com \ --cc=riel@redhat.com \ --cc=tglx@linutronix.de \ --cc=thomas.lendacky@amd.com \ --cc=tim.c.chen@linux.intel.com \ --cc=torvalds@linux-foundation.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
LKML Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \ linux-kernel@vger.kernel.org public-inbox-index lkml Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git