Commit 369ae6ff authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Borislav Petkov
Browse files

x86/retpoline: Cleanup some #ifdefery 



On it's own not much of a cleanup but it prepares for more/similar
code.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent a883d624

arch/x86/include/asm/disabled-features.h

+8 −1
Original line number Diff line number Diff line
@@ -50,6 +50,13 @@ 
# define DISABLE_PTI		(1 << (X86_FEATURE_PTI & 31))

#endif



#ifdef CONFIG_RETPOLINE

# define DISABLE_RETPOLINE	0

#else

# define DISABLE_RETPOLINE	((1 << (X86_FEATURE_RETPOLINE & 31)) | \

				 (1 << (X86_FEATURE_RETPOLINE_LFENCE & 31)))

#endif



#ifdef CONFIG_INTEL_IOMMU_SVM

# define DISABLE_ENQCMD		0

#else
@@ -82,7 +89,7 @@ 
#define DISABLED_MASK8	(DISABLE_TDX_GUEST)

#define DISABLED_MASK9	(DISABLE_SGX)

#define DISABLED_MASK10	0

#define DISABLED_MASK11	0

#define DISABLED_MASK11	(DISABLE_RETPOLINE)

#define DISABLED_MASK12	0

#define DISABLED_MASK13	0

#define DISABLED_MASK14	0

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

+3 −4
Original line number Diff line number Diff line
@@ -120,17 +120,16 @@ 
	_ASM_PTR " 999b\n\t"					\

	".popsection\n\t"



#ifdef CONFIG_RETPOLINE



typedef u8 retpoline_thunk_t[RETPOLINE_THUNK_SIZE];

extern retpoline_thunk_t __x86_indirect_thunk_array[];



#ifdef CONFIG_RETPOLINE



#define GEN(reg) \

	extern retpoline_thunk_t __x86_indirect_thunk_ ## reg;

#include <asm/GEN-for-each-reg.h>

#undef GEN



extern retpoline_thunk_t __x86_indirect_thunk_array[];



#ifdef CONFIG_X86_64



/*

arch/x86/net/bpf_jit_comp.c

+3 −4
Original line number Diff line number Diff line
@@ -412,16 +412,15 @@ static void emit_indirect_jump(u8 **pprog, int reg, u8 *ip) 
{

	u8 *prog = *pprog;



#ifdef CONFIG_RETPOLINE

	if (cpu_feature_enabled(X86_FEATURE_RETPOLINE_LFENCE)) {

		EMIT_LFENCE();

		EMIT2(0xFF, 0xE0 + reg);

	} else if (cpu_feature_enabled(X86_FEATURE_RETPOLINE)) {

		OPTIMIZER_HIDE_VAR(reg);

		emit_jump(&prog, &__x86_indirect_thunk_array[reg], ip);

	} else

#endif

	} else {

		EMIT2(0xFF, 0xE0 + reg);

	}



	*pprog = prog;

}