From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753479AbeAJStD (ORCPT + 1 other); Wed, 10 Jan 2018 13:49:03 -0500 Received: from terminus.zytor.com ([65.50.211.136]:33727 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751787AbeAJStB (ORCPT ); Wed, 10 Jan 2018 13:49:01 -0500 Date: Wed, 10 Jan 2018 10:43:28 -0800 From: tip-bot for David Woodhouse Message-ID: Cc: torvalds@linux-foundation.org, hpa@zytor.com, tim.c.chen@linux.intel.com, arjan@linux.intel.com, luto@amacapital.net, jikos@kernel.org, riel@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, pjt@google.com, keescook@google.com, ak@linux.intel.com, gregkh@linux-foundation.org, dave.hansen@intel.com, dwmw@amazon.co.uk, peterz@infradead.org, tglx@linutronix.de Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, pjt@google.com, keescook@google.com, ak@linux.intel.com, gregkh@linux-foundation.org, dave.hansen@intel.com, dwmw@amazon.co.uk, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, hpa@zytor.com, tim.c.chen@linux.intel.com, arjan@linux.intel.com, luto@amacapital.net, jikos@kernel.org, riel@redhat.com In-Reply-To: <1515508997-6154-10-git-send-email-dwmw@amazon.co.uk> References: <1515508997-6154-10-git-send-email-dwmw@amazon.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/retpoline/checksum32: Convert assembler indirect jumps Git-Commit-ID: 96f71b3a482e918991d165eb7a6b42eb9a9ef735 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 Return-Path: Commit-ID: 96f71b3a482e918991d165eb7a6b42eb9a9ef735 Gitweb: https://git.kernel.org/tip/96f71b3a482e918991d165eb7a6b42eb9a9ef735 Author: David Woodhouse AuthorDate: Tue, 9 Jan 2018 14:43:15 +0000 Committer: Thomas Gleixner CommitDate: Wed, 10 Jan 2018 19:36:25 +0100 x86/retpoline/checksum32: Convert assembler indirect jumps Convert all indirect jumps in 32bit checksum assembler code to use non-speculative sequences when CONFIG_RETPOLINE is enabled. Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner Acked-by: Arjan van de Ven Acked-by: Ingo Molnar Cc: gnomes@lxorguk.ukuu.org.uk Cc: Rik van Riel Cc: Andi Kleen Cc: Peter Zijlstra Cc: Linus Torvalds Cc: Jiri Kosina Cc: Andy Lutomirski Cc: Dave Hansen Cc: Kees Cook Cc: Tim Chen Cc: Greg Kroah-Hartman Cc: Paul Turner Link: https://lkml.kernel.org/r/1515508997-6154-10-git-send-email-dwmw@amazon.co.uk --- 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 #include #include - +#include + /* * 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)