Commit 6649fa87 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/ibt,kvm: Add ENDBR to fastops 



Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20220308154318.168850084@infradead.org
parent 214b9a83

arch/x86/kvm/emulate.c

+4 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ 
#define X16(x...) X8(x), X8(x)



#define NR_FASTOP (ilog2(sizeof(ulong)) + 1)

#define FASTOP_SIZE 8

#define FASTOP_SIZE (8 * (1 + HAS_KERNEL_IBT))



struct opcode {

	u64 flags;
@@ -311,7 +311,8 @@ static int fastop(struct x86_emulate_ctxt *ctxt, fastop_t fop); 
#define __FOP_FUNC(name) \

	".align " __stringify(FASTOP_SIZE) " \n\t" \

	".type " name ", @function \n\t" \

	name ":\n\t"

	name ":\n\t" \

	ASM_ENDBR



#define FOP_FUNC(name) \

	__FOP_FUNC(#name)
@@ -433,6 +434,7 @@ static int fastop(struct x86_emulate_ctxt *ctxt, fastop_t fop); 
	".align 4 \n\t" \

	".type " #op ", @function \n\t" \

	#op ": \n\t" \

	ASM_ENDBR \

	#op " %al \n\t" \

	__FOP_RET(#op)