Commit 46d28947 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Borislav Petkov
Browse files

x86/extable: Rework the exception table mechanics 



The exception table entries contain the instruction address, the fixup
address and the handler address. All addresses are relative. Storing the
handler address has a few downsides:

 1) Most handlers need to be exported

 2) Handlers can be defined everywhere and there is no overview about the
    handler types

 3) MCE needs to check the handler type to decide whether an in kernel #MC
    can be recovered. The functionality of the handler itself is not in any
    way special, but for these checks there need to be separate functions
    which in the worst case have to be exported.

    Some of these 'recoverable' exception fixups are pretty obscure and
    just reuse some other handler to spare code. That obfuscates e.g. the
    #MC safe copy functions. Cleaning that up would require more handlers
    and exports

Rework the exception fixup mechanics by storing a fixup type number instead
of the handler address and invoke the proper handler for each fixup
type. Also teach the extable sort to leave the type field alone.

This makes most handlers static except for special cases like the MCE
MSR fixup and the BPF fixup. This allows to add more types for cleaning up
the obscure places without adding more handler code and exports.

There is a marginal code size reduction for a production config and it
removes _eight_ exported symbols.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lkml.kernel.org/r/20210908132525.211958725@linutronix.de
parent 083b32d6

arch/x86/include/asm/asm.h

+12 −10
Original line number Diff line number Diff line
@@ -122,14 +122,17 @@ 


#ifdef __KERNEL__



# include <asm/extable_fixup_types.h>



/* Exception table entry */

#ifdef __ASSEMBLY__

# define _ASM_EXTABLE_HANDLE(from, to, handler)			\



# define _ASM_EXTABLE_TYPE(from, to, type)			\

	.pushsection "__ex_table","a" ;				\

	.balign 4 ;						\

	.long (from) - . ;					\

	.long (to) - . ;					\

	.long (handler) - . ;					\

	.long type ;						\

	.popsection



# ifdef CONFIG_KPROBES
@@ -143,13 +146,13 @@ 
# endif



#else /* ! __ASSEMBLY__ */

# define _EXPAND_EXTABLE_HANDLE(x) #x

# define _ASM_EXTABLE_HANDLE(from, to, handler)			\



# define _ASM_EXTABLE_TYPE(from, to, type)			\

	" .pushsection \"__ex_table\",\"a\"\n"			\

	" .balign 4\n"						\

	" .long (" #from ") - .\n"				\

	" .long (" #to ") - .\n"				\

	" .long (" _EXPAND_EXTABLE_HANDLE(handler) ") - .\n"	\

	" .long " __stringify(type) " \n"			\

	" .popsection\n"



/* For C file, we already have NOKPROBE_SYMBOL macro */
@@ -165,17 +168,16 @@ register unsigned long current_stack_pointer asm(_ASM_SP); 
#endif /* __ASSEMBLY__ */



#define _ASM_EXTABLE(from, to)					\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_default)

	_ASM_EXTABLE_TYPE(from, to, EX_TYPE_DEFAULT)



#define _ASM_EXTABLE_UA(from, to)				\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_uaccess)

	_ASM_EXTABLE_TYPE(from, to, EX_TYPE_UACCESS)



#define _ASM_EXTABLE_CPY(from, to)				\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_copy)

	_ASM_EXTABLE_TYPE(from, to, EX_TYPE_COPY)



#define _ASM_EXTABLE_FAULT(from, to)				\

	_ASM_EXTABLE_HANDLE(from, to, ex_handler_fault)

	_ASM_EXTABLE_TYPE(from, to, EX_TYPE_FAULT)



#endif /* __KERNEL__ */



#endif /* _ASM_X86_ASM_H */

arch/x86/include/asm/extable.h

+28 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_X86_EXTABLE_H

#define _ASM_X86_EXTABLE_H



#include <asm/extable_fixup_types.h>



/*

 * The exception table consists of triples of addresses relative to the

 * exception table entry itself. The first address is of an instruction

 * that is allowed to fault, the second is the target at which the program

 * should continue. The third is a handler function to deal with the fault

 * caused by the instruction in the first field.

 * The exception table consists of two addresses relative to the

 * exception table entry itself and a type selector field.

 *

 * The first address is of an instruction that is allowed to fault, the

 * second is the target at which the program should continue.

 *

 * The type entry is used by fixup_exception() to select the handler to

 * deal with the fault caused by the instruction in the first field.

 *

 * All the routines below use bits of fixup code that are out of line

 * with the main instruction path.  This means when everything is well,
@@ -15,7 +21,7 @@ 
 */



struct exception_table_entry {

	int insn, fixup, handler;

	int insn, fixup, type;

};

struct pt_regs;
@@ -25,21 +31,27 @@ struct pt_regs; 
	do {							\

		(a)->fixup = (b)->fixup + (delta);		\

		(b)->fixup = (tmp).fixup - (delta);		\

		(a)->handler = (b)->handler + (delta);		\

		(b)->handler = (tmp).handler - (delta);		\

		(a)->type = (b)->type;				\

		(b)->type = (tmp).type;				\

	} while (0)



enum handler_type {

	EX_HANDLER_NONE,

	EX_HANDLER_FAULT,

	EX_HANDLER_UACCESS,

	EX_HANDLER_OTHER

};



extern int fixup_exception(struct pt_regs *regs, int trapnr,

			   unsigned long error_code, unsigned long fault_addr);

extern int fixup_bug(struct pt_regs *regs, int trapnr);

extern enum handler_type ex_get_fault_handler_type(unsigned long ip);

extern int ex_get_fixup_type(unsigned long ip);

extern void early_fixup_exception(struct pt_regs *regs, int trapnr);



#ifdef CONFIG_X86_MCE

extern void ex_handler_msr_mce(struct pt_regs *regs, bool wrmsr);

#else

static inline void ex_handler_msr_mce(struct pt_regs *regs, bool wrmsr) { }

#endif



#if defined(CONFIG_BPF_JIT) && defined(CONFIG_X86_64)

bool ex_handler_bpf(const struct exception_table_entry *x, struct pt_regs *regs);

#else

static inline bool ex_handler_bpf(const struct exception_table_entry *x,

				  struct pt_regs *regs) { return false; }

#endif



#endif

arch/x86/include/asm/extable_fixup_types.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_X86_EXTABLE_FIXUP_TYPES_H

#define _ASM_X86_EXTABLE_FIXUP_TYPES_H



#define	EX_TYPE_NONE			 0

#define	EX_TYPE_DEFAULT			 1

#define	EX_TYPE_FAULT			 2

#define	EX_TYPE_UACCESS			 3

#define	EX_TYPE_COPY			 4

#define	EX_TYPE_CLEAR_FS		 5

#define	EX_TYPE_FPU_RESTORE		 6

#define	EX_TYPE_WRMSR			 7

#define	EX_TYPE_RDMSR			 8

#define	EX_TYPE_BPF			 9



#define	EX_TYPE_WRMSR_IN_MCE		10

#define	EX_TYPE_RDMSR_IN_MCE		11



#endif

arch/x86/include/asm/fpu/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ extern void save_fpregs_to_fpstate(struct fpu *fpu); 
#define kernel_insn(insn, output, input...)				\

	asm volatile("1:" #insn "\n\t"					\

		     "2:\n"						\

		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_fprestore)	\

		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_FPU_RESTORE)	\

		     : output : input)



static inline int fnsave_to_user_sigframe(struct fregs_state __user *fx)
@@ -253,7 +253,7 @@ static inline void fxsave(struct fxregs_state *fx) 
				 XRSTORS, X86_FEATURE_XSAVES)		\

		     "\n"						\

		     "3:\n"						\

		     _ASM_EXTABLE_HANDLE(661b, 3b, ex_handler_fprestore)\

		     _ASM_EXTABLE_TYPE(661b, 3b, EX_TYPE_FPU_RESTORE)	\

		     :							\

		     : "D" (st), "m" (*st), "a" (lmask), "d" (hmask)	\

		     : "memory")

arch/x86/include/asm/msr.h

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static __always_inline unsigned long long __rdmsr(unsigned int msr) 


	asm volatile("1: rdmsr\n"

		     "2:\n"

		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_rdmsr_unsafe)

		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_RDMSR)

		     : EAX_EDX_RET(val, low, high) : "c" (msr));



	return EAX_EDX_VAL(val, low, high);
@@ -102,7 +102,7 @@ static __always_inline void __wrmsr(unsigned int msr, u32 low, u32 high) 
{

	asm volatile("1: wrmsr\n"

		     "2:\n"

		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)

		     _ASM_EXTABLE_TYPE(1b, 2b, EX_TYPE_WRMSR)

		     : : "c" (msr), "a"(low), "d" (high) : "memory");

}