Skip to content

Commit

Permalink
Revert "x86/retpoline/checksum32: Convert assembler indirect jumps"
Browse files Browse the repository at this point in the history
This reverts commit 5391428.

Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  • Loading branch information
Sasha Levin committed Mar 27, 2018
1 parent 2ae2efd commit 9f63c24
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions arch/x86/lib/checksum_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
#include <asm/dwarf2.h>
#include <asm/errno.h>
#include <asm/asm.h>
#include <asm/nospec-branch.h>


/*
* computes a partial checksum, e.g. for TCP/UDP fragments
*/
Expand Down Expand Up @@ -160,7 +159,7 @@ ENTRY(csum_partial)
negl %ebx
lea 45f(%ebx,%ebx,2), %ebx
testl %esi, %esi
JMP_NOSPEC %ebx
jmp *%ebx

# Handle 2-byte-aligned regions
20: addw (%esi), %ax
Expand Down Expand Up @@ -447,7 +446,7 @@ ENTRY(csum_partial_copy_generic)
andl $-32,%edx
lea 3f(%ebx,%ebx), %ebx
testl %esi, %esi
JMP_NOSPEC %ebx
jmp *%ebx
1: addl $64,%esi
addl $64,%edi
SRC(movb -32(%edx),%bl) ; SRC(movb (%edx),%bl)
Expand Down

0 comments on commit 9f63c24

Please sign in to comment.