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
Subject: [PATCH v7 09/11] x86/retpoline/checksum32: Convert assembler indirect jumps
Date: Tue, 9 Jan 2018 14:43:15 +0000 [thread overview]
Message-ID: <1515508997-6154-10-git-send-email-dwmw@amazon.co.uk> (raw)
In-Reply-To: <1515508997-6154-1-git-send-email-dwmw@amazon.co.uk>
Convert all indirect jumps in 32bit checksum assembler code to use
non-speculative sequences when CONFIG_RETPOLINE is enabled.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
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: Andi Kleen <ak@linux.intel.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>
---
arch/x86/lib/checksum_32.S | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
index 4d34bb5..46e71a7 100644
--- a/arch/x86/lib/checksum_32.S
+++ b/arch/x86/lib/checksum_32.S
@@ -29,7 +29,8 @@
#include <asm/errno.h>
#include <asm/asm.h>
#include <asm/export.h>
-
+#include <asm/nospec-branch.h>
+
/*
* computes a partial checksum, e.g. for TCP/UDP fragments
*/
@@ -156,7 +157,7 @@ ENTRY(csum_partial)
negl %ebx
lea 45f(%ebx,%ebx,2), %ebx
testl %esi, %esi
- jmp *%ebx
+ JMP_NOSPEC %ebx
# Handle 2-byte-aligned regions
20: addw (%esi), %ax
@@ -439,7 +440,7 @@ ENTRY(csum_partial_copy_generic)
andl $-32,%edx
lea 3f(%ebx,%ebx), %ebx
testl %esi, %esi
- jmp *%ebx
+ JMP_NOSPEC %ebx
1: addl $64,%esi
addl $64,%edi
SRC(movb -32(%edx),%bl) ; SRC(movb (%edx),%bl)
--
2.7.4
next prev parent reply other threads:[~2018-01-09 14:44 UTC|newest]
Thread overview: 64+ 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 ` David Woodhouse [this message]
2018-01-09 15:58 ` [tip:x86/pti] x86/retpoline/checksum32: Convert assembler " 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
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
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=1515508997-6154-10-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=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=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
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).