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

Commit 36256009 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Alexei Starovoitov
Browse files

bpf, x64: clean up retpoline emission slightly 



Make the RETPOLINE_{RA,ED}X_BPF_JIT() a bit more readable by
cleaning up the macro, aligning comments and spacing.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 631b1e3b

arch/x86/include/asm/nospec-branch.h

+14 −15
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ do { \ 
	EMIT4(0x48, 0x89, 0x04, 0x24); /* mov %rax,(%rsp) */	\

	EMIT1(0xC3);             /* retq */			\

} while (0)

#else

# else /* !CONFIG_X86_64 */

#  define RETPOLINE_EDX_BPF_JIT()				\

do {								\

	EMIT1_off32(0xE8, 7);	 /* call do_rop */		\
@@ -328,12 +328,11 @@ do { \ 
} while (0)

# endif

#else /* !CONFIG_RETPOLINE */



# ifdef CONFIG_X86_64

#  define RETPOLINE_RAX_BPF_JIT_SIZE	2

#  define RETPOLINE_RAX_BPF_JIT()				\

	EMIT2(0xFF, 0xE0);       /* jmp *%rax */

#else

# else /* !CONFIG_X86_64 */

#  define RETPOLINE_EDX_BPF_JIT()				\

	EMIT2(0xFF, 0xE2)        /* jmp *%edx */

# endif