From: tip-bot for Andi Kleen <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dave.hansen@intel.com, pjt@google.com, mingo@kernel.org,
ak@linux.intel.com, peterz@infradead.org, tglx@linutronix.de,
tim.c.chen@linux.intel.com, keescook@google.com, hpa@zytor.com,
arjan@linux.intel.com, torvalds@linux-foundation.org,
jikos@kernel.org, gregkh@linux-foundation.org,
linux-kernel@vger.kernel.org, luto@amacapital.net,
riel@redhat.com
Subject: [tip:x86/pti] x86/retpoline/irq32: Convert assembler indirect jumps
Date: Wed, 10 Jan 2018 10:17:02 -0800 [thread overview]
Message-ID: <tip-f83bd6a0911450ffe6b76c94dfe4230154256e26@git.kernel.org> (raw)
In-Reply-To: <1515508997-6154-11-git-send-email-dwmw@amazon.co.uk>
Commit-ID: f83bd6a0911450ffe6b76c94dfe4230154256e26
Gitweb: https://git.kernel.org/tip/f83bd6a0911450ffe6b76c94dfe4230154256e26
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Tue, 9 Jan 2018 14:43:16 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 10 Jan 2018 19:09:12 +0100
x86/retpoline/irq32: Convert assembler indirect jumps
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;
}
next prev parent reply other threads:[~2018-01-10 18:22 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-09 14:43 [PATCH v7 00/11] Retpoline: Avoid speculative indirect calls in kernel David Woodhouse
2018-01-09 14:43 ` [PATCH v7 01/11] x86/retpoline: Add initial retpoline support David Woodhouse
2018-01-09 15:55 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:34 ` tip-bot for David Woodhouse
2018-01-10 18:13 ` tip-bot for David Woodhouse
2018-01-10 18:40 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 02/11] x86/retpoline: Temporarily disable objtool when CONFIG_RETPOLINE=y David Woodhouse
2018-01-09 15:56 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-10 5:58 ` [PATCH v7 02/11] " Josh Poimboeuf
2018-01-10 10:12 ` Peter Zijlstra
2018-01-10 17:34 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-10 18:13 ` tip-bot for Andi Kleen
2018-01-10 18:40 ` tip-bot for Andi Kleen
2018-01-09 14:43 ` [PATCH v7 03/11] x86/spectre: Add boot time option to select Spectre v2 mitigation David Woodhouse
2018-01-09 15:56 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:35 ` tip-bot for David Woodhouse
2018-01-10 18:03 ` Tom Lendacky
2018-01-10 18:06 ` Thomas Gleixner
2018-01-10 18:10 ` Thomas Gleixner
2018-01-10 18:14 ` tip-bot for David Woodhouse
2018-01-10 18:33 ` Tom Lendacky
2018-01-10 18:35 ` Thomas Gleixner
2018-01-10 18:41 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 04/11] x86/retpoline/crypto: Convert crypto assembler indirect jumps David Woodhouse
2018-01-09 15:56 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:35 ` tip-bot for David Woodhouse
2018-01-10 18:14 ` tip-bot for David Woodhouse
2018-01-10 18:41 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 05/11] x86/retpoline/entry: Convert entry " David Woodhouse
2018-01-09 15:57 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 3:54 ` [v7, 05/11] " Andrei Vagin
2018-01-10 4:30 ` Andi Kleen
2018-01-10 4:39 ` Dave Hansen
2018-01-10 5:23 ` Andrei Vagin
2018-01-10 17:36 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 18:15 ` tip-bot for David Woodhouse
2018-01-10 18:41 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 06/11] x86/retpoline/ftrace: Convert ftrace " David Woodhouse
2018-01-09 15:57 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:36 ` tip-bot for David Woodhouse
2018-01-10 18:15 ` tip-bot for David Woodhouse
2018-01-10 18:42 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 07/11] x86/retpoline/hyperv: Convert " David Woodhouse
2018-01-09 15:58 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:37 ` tip-bot for David Woodhouse
2018-01-10 18:15 ` tip-bot for David Woodhouse
2018-01-10 18:42 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 08/11] x86/retpoline/xen: Convert Xen hypercall " David Woodhouse
2018-01-09 15:58 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:37 ` tip-bot for David Woodhouse
2018-01-10 18:16 ` tip-bot for David Woodhouse
2018-01-10 18:43 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 09/11] x86/retpoline/checksum32: Convert assembler " David Woodhouse
2018-01-09 15:58 ` [tip:x86/pti] " tip-bot for David Woodhouse
2018-01-10 17:37 ` tip-bot for David Woodhouse
2018-01-10 18:16 ` tip-bot for David Woodhouse
2018-01-10 18:43 ` tip-bot for David Woodhouse
2018-01-09 14:43 ` [PATCH v7 10/11] x86/retpoline/irq32: " David Woodhouse
2018-01-09 15:59 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-10 17:38 ` tip-bot for Andi Kleen
2018-01-10 18:17 ` tip-bot for Andi Kleen [this message]
2018-01-10 18:43 ` tip-bot for Andi Kleen
2018-01-09 14:43 ` [PATCH v7 11/11] x86/retpoline: Avoid return buffer underflows on context switch David Woodhouse
2018-01-09 15:59 ` [tip:x86/pti] " tip-bot for Andi Kleen
2018-01-11 21:46 [PATCH v8 11/12] x86/retpoline/irq32: Convert assembler indirect jumps David Woodhouse
2018-01-11 23:26 ` [tip:x86/pti] " tip-bot for Andi Kleen
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-f83bd6a0911450ffe6b76c94dfe4230154256e26@git.kernel.org \
--to=tipbot@zytor.com \
--cc=ak@linux.intel.com \
--cc=arjan@linux.intel.com \
--cc=dave.hansen@intel.com \
--cc=gregkh@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=jikos@kernel.org \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--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).