Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5096732f authored by David Woodhouse's avatar David Woodhouse Committed by Thomas Gleixner
Browse files

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: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Acked-by: default avatarIngo 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: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: thomas.lendacky@amd.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/1515707194-20531-11-git-send-email-dwmw@amazon.co.uk
parent ea08816d

arch/x86/lib/checksum_32.S

+4 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#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)