Commit 6873139e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'objtool-core-2020-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool updates from Ingo Molnar:
 "Most of the changes are cleanups and reorganization to make the
  objtool code more arch-agnostic. This is in preparation for non-x86
  support.

  Other changes:

   - KASAN fixes

   - Handle unreachable trap after call to noreturn functions better

   - Ignore unreachable fake jumps

   - Misc smaller fixes & cleanups"

* tag 'objtool-core-2020-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  perf build: Allow nested externs to enable BUILD_BUG() usage
  objtool: Allow nested externs to enable BUILD_BUG()
  objtool: Permit __kasan_check_{read,write} under UACCESS
  objtool: Ignore unreachable trap after call to noreturn functions
  objtool: Handle calling non-function symbols in other sections
  objtool: Ignore unreachable fake jumps
  objtool: Remove useless tests before save_reg()
  objtool: Decode unwind hint register depending on architecture
  objtool: Make unwind hint definitions available to other architectures
  objtool: Only include valid definitions depending on source file type
  objtool: Rename frame.h -> objtool.h
  objtool: Refactor jump table code to support other architectures
  objtool: Make relocation in alternative handling arch dependent
  objtool: Abstract alternative special case handling
  objtool: Move macros describing structures to arch-dependent code
  objtool: Make sync-check consider the target architecture
  objtool: Group headers to check in a single list
  objtool: Define 'struct orc_entry' only when needed
  objtool: Skip ORC entry creation for non-text sections
  objtool: Move ORC logic out of check()
  ...
parents d5660df4 ab0a40ea

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12515,6 +12515,7 @@ M: Josh Poimboeuf <jpoimboe@redhat.com> 
M:	Peter Zijlstra <peterz@infradead.org>

S:	Supported

F:	tools/objtool/

F:	include/linux/objtool.h















OCELOT ETHERNET SWITCH DRIVER















M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>

































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



+1
−1






























Original line number
Diff line number
Diff line








@@ -4,7 +4,7 @@













#define _ASM_X86_NOSPEC_BRANCH_H_































#include <linux/static_key.h>













#include <linux/frame.h>













#include <linux/objtool.h>































#include <asm/alternative.h>















#include <asm/alternative-asm.h>

































arch/x86/include/asm/orc_types.h



+0
−34






























Original line number
Diff line number
Diff line








@@ -39,27 +39,6 @@













#define ORC_REG_SP_INDIRECT		9















#define ORC_REG_MAX			15





























/*













 * ORC_TYPE_CALL: Indicates that sp_reg+sp_offset resolves to PREV_SP (the













 * caller's SP right before it made the call).  Used for all callable













 * functions, i.e. all C code and all callable asm functions.













 *













 * ORC_TYPE_REGS: Used in entry code to indicate that sp_reg+sp_offset points













 * to a fully populated pt_regs from a syscall, interrupt, or exception.













 *













 * ORC_TYPE_REGS_IRET: Used in entry code to indicate that sp_reg+sp_offset













 * points to the iret return frame.













 *













 * The UNWIND_HINT macros are used only for the unwind_hint struct.  They













 * aren't used in struct orc_entry due to size and complexity constraints.













 * Objtool converts them to real types when it converts the hints to orc













 * entries.













 */













#define ORC_TYPE_CALL			0













#define ORC_TYPE_REGS			1













#define ORC_TYPE_REGS_IRET		2













#define UNWIND_HINT_TYPE_RET_OFFSET	3





























#ifndef __ASSEMBLY__















/*















 * This struct is more or less a vastly simplified version of the DWARF Call









@@ -78,19 +57,6 @@ struct orc_entry {













	unsigned	end:1;















} __packed;





























/*













 * This struct is used by asm and inline asm code to manually annotate the













 * location of registers on the stack for the ORC unwinder.













 *













 * Type can be either ORC_TYPE_* or UNWIND_HINT_TYPE_*.













 */













struct unwind_hint {













	u32		ip;













	s16		sp_offset;













	u8		sp_reg;













	u8		type;













	u8		end;













};















#endif /* __ASSEMBLY__ */































#endif /* _ORC_TYPES_H */
























arch/x86/include/asm/unwind_hints.h



+11
−45






























Original line number
Diff line number
Diff line















#ifndef _ASM_X86_UNWIND_HINTS_H















#define _ASM_X86_UNWIND_HINTS_H





























#include <linux/objtool.h>





























#include "orc_types.h"































#ifdef __ASSEMBLY__





























/*













 * In asm, there are two kinds of code: normal C-type callable functions and













 * the rest.  The normal callable functions can be called by other code, and













 * don't do anything unusual with the stack.  Such normal callable functions













 * are annotated with the ENTRY/ENDPROC macros.  Most asm code falls in this













 * category.  In this case, no special debugging annotations are needed because













 * objtool can automatically generate the ORC data for the ORC unwinder to read













 * at runtime.













 *













 * Anything which doesn't fall into the above category, such as syscall and













 * interrupt handlers, tends to not be called directly by other functions, and













 * often does unusual non-C-function-type things with the stack pointer.  Such













 * code needs to be annotated such that objtool can understand it.  The













 * following CFI hint macros are for this type of code.













 *













 * These macros provide hints to objtool about the state of the stack at each













 * instruction.  Objtool starts from the hints and follows the code flow,













 * making automatic CFI adjustments when it sees pushes and pops, filling out













 * the debuginfo as necessary.  It will also warn if it sees any













 * inconsistencies.













 */













.macro UNWIND_HINT sp_reg=ORC_REG_SP sp_offset=0 type=ORC_TYPE_CALL end=0













#ifdef CONFIG_STACK_VALIDATION













.Lunwind_hint_ip_\@:













	.pushsection .discard.unwind_hints













		/* struct unwind_hint */













		.long .Lunwind_hint_ip_\@ - .













		.short \sp_offset













		.byte \sp_reg













		.byte \type













		.byte \end













		.balign 4













	.popsection













#endif













.endm





























.macro UNWIND_HINT_EMPTY













	UNWIND_HINT sp_reg=ORC_REG_UNDEFINED end=1













	UNWIND_HINT sp_reg=ORC_REG_UNDEFINED type=UNWIND_HINT_TYPE_CALL end=1















.endm





























.macro UNWIND_HINT_REGS base=%rsp offset=0 indirect=0 extra=1 iret=0













.macro UNWIND_HINT_REGS base=%rsp offset=0 indirect=0 extra=1 partial=0















	.if \base == %rsp















		.if \indirect















			.set sp_reg, ORC_REG_SP_INDIRECT









@@ -66,24 +32,24 @@





























	.set sp_offset, \offset





























	.if \iret













		.set type, ORC_TYPE_REGS_IRET













	.if \partial













		.set type, UNWIND_HINT_TYPE_REGS_PARTIAL















	.elseif \extra == 0













		.set type, ORC_TYPE_REGS_IRET













		.set type, UNWIND_HINT_TYPE_REGS_PARTIAL















		.set sp_offset, \offset + (16*8)















	.else













		.set type, ORC_TYPE_REGS













		.set type, UNWIND_HINT_TYPE_REGS















	.endif































	UNWIND_HINT sp_reg=sp_reg sp_offset=sp_offset type=type















.endm































.macro UNWIND_HINT_IRET_REGS base=%rsp offset=0













	UNWIND_HINT_REGS base=\base offset=\offset iret=1













	UNWIND_HINT_REGS base=\base offset=\offset partial=1















.endm































.macro UNWIND_HINT_FUNC sp_offset=8













	UNWIND_HINT sp_offset=\sp_offset













	UNWIND_HINT sp_reg=ORC_REG_SP sp_offset=\sp_offset type=UNWIND_HINT_TYPE_CALL















.endm































/*









@@ -92,7 +58,7 @@













 * initial_func_cfi.















 */















.macro UNWIND_HINT_RET_OFFSET sp_offset=8













	UNWIND_HINT type=UNWIND_HINT_TYPE_RET_OFFSET sp_offset=\sp_offset













	UNWIND_HINT sp_reg=ORC_REG_SP type=UNWIND_HINT_TYPE_RET_OFFSET sp_offset=\sp_offset















.endm































#endif /* __ASSEMBLY__ */

































arch/x86/kernel/kprobes/core.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -38,9 +38,9 @@













#include <linux/kdebug.h>















#include <linux/kallsyms.h>















#include <linux/ftrace.h>













#include <linux/frame.h>















#include <linux/kasan.h>















#include <linux/moduleloader.h>













#include <linux/objtool.h>















#include <linux/vmalloc.h>















#include <linux/pgtable.h>

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE