From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELtohH8CpuqThPA9yDXa9Wartr6SeQt5NvJnA4eyzssEk4YaJdAQXKh+XZhw5bTC4J9SVkIo ARC-Seal: i=1; a=rsa-sha256; t=1520824088; cv=none; d=google.com; s=arc-20160816; b=bMiZS9VCTI+kZVlfOj4UKucKOIjbm0vpOvr+AJYW2GVxKi6Kw6d+oGm4xtitxwPDGh IO+GyHHGPetyTsIHJthOGbLp94iyS/MDA+Y6LRoAi5STMJhwHqYrMZuMGgf/xXQLapMt wDUkWprecs1mApnGoWrKCrfEe7OlnTkvGS0yqkA1ebZa1X7g6gJlGjKZ1TjOQjW7AGTV 9VELrWNPT2lUexmUnhaiplTMaPesOHjMtW4AzHpy62LmVrQ6BMY5aMAQHR8eoLY9ZVqy Opfrh4ZgoXHWlJpginvCJRz/0tijpdKl5YnVTeDXgHf6P/mVAMwNLrwVLDnkmEduq24B 5ugQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:subject:message-id:date:cc:to:from:mime-version :content-transfer-encoding:content-disposition :arc-authentication-results; bh=c2T5YRHLeOG8HxEuQlzay7gjE3BlwFMnOw/fa1XZa9U=; b=TH8IHMNQMCmhAf8mEE9HAG4xhODrb467vH6XiyUjairUZHhyQaqo6RWPjfov8AW64U hGXSpUysJrgxk+gn/GmhtAp1ICW93aKSFdpDbowiN7ZfbCTs4AqX0H7uWBaBghVycLp+ AENy07u6JCHxbjviZUGl+cAwYv8eaTS4EK2ibHgrHKtXHPYLEkxI1iEs7uufcxiIFKET xCOa8eABMXdurS1bBMUgAzdeqw8XUcuIYDEFecLKcjIkwFPovtE3vZiaTvkgDV6LkNZq XuTYms2RMs20tBmJGr3w8VWESRoN+ujo9OlIqt1FTuAhpUFNHWgremBc1ohzWKsOoecw XOoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ben@decadent.org.uk designates 88.96.1.126 as permitted sender) smtp.mailfrom=ben@decadent.org.uk Authentication-Results: mx.google.com; spf=pass (google.com: domain of ben@decadent.org.uk designates 88.96.1.126 as permitted sender) smtp.mailfrom=ben@decadent.org.uk Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Paul Turner" , "Linus Torvalds" , "Peter Zijlstra" , gnomes@lxorguk.ukuu.org.uk, "Tim Chen" , "Ingo Molnar" , "David Woodhouse" , "Andi Kleen" , "Rik van Riel" , "Thomas Gleixner" , "Dave Hansen" , "Greg Kroah-Hartman" , "Jiri Kosina" , "Josh Poimboeuf" , "Andy Lutomirski" , "Kees Cook" , "Arjan van de Ven" , thomas.lendacky@amd.com Date: Mon, 12 Mar 2018 03:03:34 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 064/104] x86/retpoline/checksum32: Convert assembler indirect jumps In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594699639123527975?= X-GMAIL-MSGID: =?utf-8?q?1594699639123527975?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.2.101-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: David Woodhouse commit 5096732f6f695001fa2d6f1335a2680b37912c69 upstream. 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: Josh Poimboeuf Cc: thomas.lendacky@amd.com 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/1515707194-20531-11-git-send-email-dwmw@amazon.co.uk [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- arch/x86/lib/checksum_32.S | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/arch/x86/lib/checksum_32.S +++ b/arch/x86/lib/checksum_32.S @@ -28,7 +28,8 @@ #include #include #include - +#include + /* * computes a partial checksum, e.g. for TCP/UDP fragments */ @@ -164,7 +165,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 @@ -466,7 +467,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)