Skip to content

L
linux
Commit a56ff24e authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'objtool-core-2021-02-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool updates from Thomas Gleixner:

 - Make objtool work for big-endian cross compiles

 - Make stack tracking via stack pointer memory operations match
   push/pop semantics to prepare for architectures w/o PUSH/POP
   instructions.

 - Add support for analyzing alternatives

 - Improve retpoline detection and handling

 - Improve assembly code coverage on x86

 - Provide support for inlined stack switching

* tag 'objtool-core-2021-02-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)
  objtool: Support stack-swizzle
  objtool,x86: Additionally decode: mov %rsp, (%reg)
  x86/unwind/orc: Change REG_SP_INDIRECT
  x86/power: Support objtool validation in hibernate_asm_64.S
  x86/power: Move restore_registers() to top of the file
  x86/power: Annotate indirect branches as safe
  x86/acpi: Support objtool validation in wakeup_64.S
  x86/acpi: Annotate indirect branch as safe
  x86/ftrace: Support objtool vmlinux.o validation in ftrace_64.S
  x86/xen/pvh: Annotate indirect branch as safe
  x86/xen: Support objtool vmlinux.o validation in xen-head.S
  x86/xen: Support objtool validation in xen-asm.S
  objtool: Add xen_start_kernel() to noreturn list
  objtool: Combine UNWIND_HINT_RET_OFFSET and UNWIND_HINT_FUNC
  objtool: Add asm version of STACK_FRAME_NON_STANDARD
  objtool: Assume only ELF functions do sibling calls
  x86/ftrace: Add UNWIND_HINT_FUNC annotation for ftrace_stub
  objtool: Support retpoline jump detection for vmlinux.o
  objtool: Fix ".cold" section suffix check for newer versions of GCC
  objtool: Fix retpoline detection in asm code
  ...
parents 79db4d22 aafeb14e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 962 additions and 597 deletions
arch/x86/include/asm/insn.h
View file @ a56ff24e
...@@ -7,9 +7,12 @@ ...@@ -7,9 +7,12 @@
* Copyright (C) IBM Corporation, 2009 * Copyright (C) IBM Corporation, 2009
*/ */
#include <asm/byteorder.h>
/* insn_attr_t is defined in inat.h */ /* insn_attr_t is defined in inat.h */
#include <asm/inat.h> #include <asm/inat.h>
#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
struct insn_field { struct insn_field {
union { union {
insn_value_t value; insn_value_t value;
...@@ -20,6 +23,48 @@ struct insn_field { ...@@ -20,6 +23,48 @@ struct insn_field {
unsigned char nbytes; unsigned char nbytes;
}; };
static inline void insn_field_set(struct insn_field *p, insn_value_t v,
unsigned char n)
{
p->value = v;
p->nbytes = n;
}
static inline void insn_set_byte(struct insn_field *p, unsigned char n,
insn_byte_t v)
{
p->bytes[n] = v;
}
#else
struct insn_field {
insn_value_t value;
union {
insn_value_t little;
insn_byte_t bytes[4];
};
/* !0 if we've run insn_get_xxx() for this field */
unsigned char got;
unsigned char nbytes;
};
static inline void insn_field_set(struct insn_field *p, insn_value_t v,
unsigned char n)
{
p->value = v;
p->little = __cpu_to_le32(v);
p->nbytes = n;
}
static inline void insn_set_byte(struct insn_field *p, unsigned char n,
insn_byte_t v)
{
p->bytes[n] = v;
p->value = __le32_to_cpu(p->little);
}
#endif
struct insn { struct insn {
struct insn_field prefixes; /* struct insn_field prefixes; /*
* Prefixes * Prefixes
......
arch/x86/include/asm/orc_types.h
View file @ a56ff24e
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#define ORC_REG_MAX 15 #define ORC_REG_MAX 15
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/byteorder.h>
/* /*
* This struct is more or less a vastly simplified version of the DWARF Call * This struct is more or less a vastly simplified version of the DWARF Call
* Frame Information standard. It contains only the necessary parts of DWARF * Frame Information standard. It contains only the necessary parts of DWARF
...@@ -51,10 +53,18 @@ ...@@ -51,10 +53,18 @@
struct orc_entry { struct orc_entry {
s16 sp_offset; s16 sp_offset;
s16 bp_offset; s16 bp_offset;
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned sp_reg:4; unsigned sp_reg:4;
unsigned bp_reg:4; unsigned bp_reg:4;
unsigned type:2; unsigned type:2;
unsigned end:1; unsigned end:1;
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned bp_reg:4;
unsigned sp_reg:4;
unsigned unused:5;
unsigned end:1;
unsigned type:2;
#endif
} __packed; } __packed;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
arch/x86/include/asm/unwind_hints.h
View file @ a56ff24e
...@@ -48,17 +48,8 @@ ...@@ -48,17 +48,8 @@
UNWIND_HINT_REGS base=\base offset=\offset partial=1 UNWIND_HINT_REGS base=\base offset=\offset partial=1
.endm .endm
.macro UNWIND_HINT_FUNC sp_offset=8 .macro UNWIND_HINT_FUNC
UNWIND_HINT sp_reg=ORC_REG_SP sp_offset=\sp_offset type=UNWIND_HINT_TYPE_CALL UNWIND_HINT sp_reg=ORC_REG_SP sp_offset=8 type=UNWIND_HINT_TYPE_FUNC
.endm
/*
* RET_OFFSET: Used on instructions that terminate a function; mostly RETURN
* and sibling calls. On these, sp_offset denotes the expected offset from
* initial_func_cfi.
*/
.macro UNWIND_HINT_RET_OFFSET sp_offset=8
UNWIND_HINT sp_reg=ORC_REG_SP type=UNWIND_HINT_TYPE_RET_OFFSET sp_offset=\sp_offset
.endm .endm
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
arch/x86/kernel/acpi/Makefile
View file @ a56ff24e
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
OBJECT_FILES_NON_STANDARD_wakeup_$(BITS).o := y
obj-$(CONFIG_ACPI) += boot.o obj-$(CONFIG_ACPI) += boot.o
obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_$(BITS).o obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_$(BITS).o
......
arch/x86/kernel/acpi/wakeup_64.S
View file @ a56ff24e
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
.text .text
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/objtool.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/pgtable_types.h> #include <asm/pgtable_types.h>
#include <asm/page_types.h> #include <asm/page_types.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/frame.h> #include <asm/frame.h>
#include <asm/nospec-branch.h>
# Copyright 2003 Pavel Machek <pavel@suse.cz # Copyright 2003 Pavel Machek <pavel@suse.cz
...@@ -39,6 +41,7 @@ SYM_FUNC_START(wakeup_long64) ...@@ -39,6 +41,7 @@ SYM_FUNC_START(wakeup_long64)
movq saved_rbp, %rbp movq saved_rbp, %rbp
movq saved_rip, %rax movq saved_rip, %rax
ANNOTATE_RETPOLINE_SAFE
jmp *%rax jmp *%rax
SYM_FUNC_END(wakeup_long64) SYM_FUNC_END(wakeup_long64)
...@@ -126,6 +129,7 @@ SYM_FUNC_START(do_suspend_lowlevel) ...@@ -126,6 +129,7 @@ SYM_FUNC_START(do_suspend_lowlevel)
FRAME_END FRAME_END
jmp restore_processor_state jmp restore_processor_state
SYM_FUNC_END(do_suspend_lowlevel) SYM_FUNC_END(do_suspend_lowlevel)
STACK_FRAME_NON_STANDARD do_suspend_lowlevel
.data .data
saved_rbp: .quad 0 saved_rbp: .quad 0
......
arch/x86/kernel/ftrace_64.S
View file @ a56ff24e
...@@ -184,6 +184,7 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL) ...@@ -184,6 +184,7 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)
* It is also used to copy the retq for trampolines. * It is also used to copy the retq for trampolines.
*/ */
SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK) SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK)
UNWIND_HINT_FUNC
retq retq
SYM_FUNC_END(ftrace_epilogue) SYM_FUNC_END(ftrace_epilogue)
...@@ -276,7 +277,7 @@ SYM_INNER_LABEL(ftrace_regs_caller_end, SYM_L_GLOBAL) ...@@ -276,7 +277,7 @@ SYM_INNER_LABEL(ftrace_regs_caller_end, SYM_L_GLOBAL)
restore_mcount_regs 8 restore_mcount_regs 8
/* Restore flags */ /* Restore flags */
popfq popfq
UNWIND_HINT_RET_OFFSET UNWIND_HINT_FUNC
jmp ftrace_epilogue jmp ftrace_epilogue
SYM_FUNC_END(ftrace_regs_caller) SYM_FUNC_END(ftrace_regs_caller)
...@@ -333,8 +334,7 @@ SYM_FUNC_START(ftrace_graph_caller) ...@@ -333,8 +334,7 @@ SYM_FUNC_START(ftrace_graph_caller)
retq retq
SYM_FUNC_END(ftrace_graph_caller) SYM_FUNC_END(ftrace_graph_caller)
SYM_CODE_START(return_to_handler) SYM_FUNC_START(return_to_handler)
UNWIND_HINT_EMPTY
subq $24, %rsp subq $24, %rsp
/* Save the return values */ /* Save the return values */
...@@ -349,5 +349,5 @@ SYM_CODE_START(return_to_handler) ...@@ -349,5 +349,5 @@ SYM_CODE_START(return_to_handler)
movq (%rsp), %rax movq (%rsp), %rax
addq $24, %rsp addq $24, %rsp
JMP_NOSPEC rdi JMP_NOSPEC rdi
SYM_CODE_END(return_to_handler) SYM_FUNC_END(return_to_handler)
#endif #endif
arch/x86/kernel/unwind_orc.c
View file @ a56ff24e
...@@ -471,7 +471,7 @@ bool unwind_next_frame(struct unwind_state *state) ...@@ -471,7 +471,7 @@ bool unwind_next_frame(struct unwind_state *state)
break; break;
case ORC_REG_SP_INDIRECT: case ORC_REG_SP_INDIRECT:
sp = state->sp + orc->sp_offset; sp = state->sp;
indirect = true; indirect = true;
break; break;
...@@ -521,6 +521,9 @@ bool unwind_next_frame(struct unwind_state *state) ...@@ -521,6 +521,9 @@ bool unwind_next_frame(struct unwind_state *state)
if (indirect) { if (indirect) {
if (!deref_stack_reg(state, sp, &sp)) if (!deref_stack_reg(state, sp, &sp))
goto err; goto err;
if (orc->sp_reg == ORC_REG_SP_INDIRECT)
sp += orc->sp_offset;
} }
/* Find IP, SP and possibly regs: */ /* Find IP, SP and possibly regs: */
......
arch/x86/lib/insn.c
View file @ a56ff24e
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* Copyright (C) IBM Corporation, 2002, 2004, 2009 * Copyright (C) IBM Corporation, 2002, 2004, 2009
*/ */
#include <linux/kernel.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/string.h> #include <linux/string.h>
#else #else
...@@ -15,15 +16,28 @@ ...@@ -15,15 +16,28 @@
#include <asm/emulate_prefix.h> #include <asm/emulate_prefix.h>
#define leXX_to_cpu(t, r) \
({ \
__typeof__(t) v; \
switch (sizeof(t)) { \
case 4: v = le32_to_cpu(r); break; \
case 2: v = le16_to_cpu(r); break; \
case 1: v = r; break; \
default: \
BUILD_BUG(); break; \
} \
v; \
})
/* Verify next sizeof(t) bytes can be on the same instruction */ /* Verify next sizeof(t) bytes can be on the same instruction */
#define validate_next(t, insn, n) \ #define validate_next(t, insn, n) \
((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr) ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)
#define __get_next(t, insn) \ #define __get_next(t, insn) \
({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); r; }) ({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })
#define __peek_nbyte_next(t, insn, n) \ #define __peek_nbyte_next(t, insn, n) \
({ t r = *(t*)((insn)->next_byte + n); r; }) ({ t r = *(t*)((insn)->next_byte + n); leXX_to_cpu(t, r); })
#define get_next(t, insn) \ #define get_next(t, insn) \
({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); }) ({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); })
...@@ -147,9 +161,9 @@ void insn_get_prefixes(struct insn *insn) ...@@ -147,9 +161,9 @@ void insn_get_prefixes(struct insn *insn)
b = insn->prefixes.bytes[3]; b = insn->prefixes.bytes[3];
for (i = 0; i < nb; i++) for (i = 0; i < nb; i++)
if (prefixes->bytes[i] == lb) if (prefixes->bytes[i] == lb)
prefixes->bytes[i] = b; insn_set_byte(prefixes, i, b);
} }
insn->prefixes.bytes[3] = lb; insn_set_byte(&insn->prefixes, 3, lb);
} }
/* Decode REX prefix */ /* Decode REX prefix */
...@@ -157,8 +171,7 @@ void insn_get_prefixes(struct insn *insn) ...@@ -157,8 +171,7 @@ void insn_get_prefixes(struct insn *insn)
b = peek_next(insn_byte_t, insn); b = peek_next(insn_byte_t, insn);
attr = inat_get_opcode_attribute(b); attr = inat_get_opcode_attribute(b);
if (inat_is_rex_prefix(attr)) { if (inat_is_rex_prefix(attr)) {
insn->rex_prefix.value = b; insn_field_set(&insn->rex_prefix, b, 1);
insn->rex_prefix.nbytes = 1;
insn->next_byte++; insn->next_byte++;
if (X86_REX_W(b)) if (X86_REX_W(b))
/* REX.W overrides opnd_size */ /* REX.W overrides opnd_size */
...@@ -181,13 +194,13 @@ void insn_get_prefixes(struct insn *insn) ...@@ -181,13 +194,13 @@ void insn_get_prefixes(struct insn *insn)
if (X86_MODRM_MOD(b2) != 3) if (X86_MODRM_MOD(b2) != 3)
goto vex_end; goto vex_end;
} }
insn->vex_prefix.bytes[0] = b; insn_set_byte(&insn->vex_prefix, 0, b);
insn->vex_prefix.bytes[1] = b2; insn_set_byte(&insn->vex_prefix, 1, b2);
if (inat_is_evex_prefix(attr)) { if (inat_is_evex_prefix(attr)) {
b2 = peek_nbyte_next(insn_byte_t, insn, 2); b2 = peek_nbyte_next(insn_byte_t, insn, 2);
insn->vex_prefix.bytes[2] = b2; insn_set_byte(&insn->vex_prefix, 2, b2);
b2 = peek_nbyte_next(insn_byte_t, insn, 3); b2 = peek_nbyte_next(insn_byte_t, insn, 3);
insn->vex_prefix.bytes[3] = b2; insn_set_byte(&insn->vex_prefix, 3, b2);
insn->vex_prefix.nbytes = 4; insn->vex_prefix.nbytes = 4;
insn->next_byte += 4; insn->next_byte += 4;
if (insn->x86_64 && X86_VEX_W(b2)) if (insn->x86_64 && X86_VEX_W(b2))
...@@ -195,7 +208,7 @@ void insn_get_prefixes(struct insn *insn) ...@@ -195,7 +208,7 @@ void insn_get_prefixes(struct insn *insn)
insn->opnd_bytes = 8; insn->opnd_bytes = 8;
} else if (inat_is_vex3_prefix(attr)) { } else if (inat_is_vex3_prefix(attr)) {
b2 = peek_nbyte_next(insn_byte_t, insn, 2); b2 = peek_nbyte_next(insn_byte_t, insn, 2);
insn->vex_prefix.bytes[2] = b2; insn_set_byte(&insn->vex_prefix, 2, b2);
insn->vex_prefix.nbytes = 3; insn->vex_prefix.nbytes = 3;
insn->next_byte += 3; insn->next_byte += 3;
if (insn->x86_64 && X86_VEX_W(b2)) if (insn->x86_64 && X86_VEX_W(b2))
...@@ -207,7 +220,7 @@ void insn_get_prefixes(struct insn *insn) ...@@ -207,7 +220,7 @@ void insn_get_prefixes(struct insn *insn)
* Makes it easier to decode vex.W, vex.vvvv, * Makes it easier to decode vex.W, vex.vvvv,
* vex.L and vex.pp. Masking with 0x7f sets vex.W == 0. * vex.L and vex.pp. Masking with 0x7f sets vex.W == 0.
*/ */
insn->vex_prefix.bytes[2] = b2 & 0x7f; insn_set_byte(&insn->vex_prefix, 2, b2 & 0x7f);
insn->vex_prefix.nbytes = 2; insn->vex_prefix.nbytes = 2;
insn->next_byte += 2; insn->next_byte += 2;
} }
...@@ -243,7 +256,7 @@ void insn_get_opcode(struct insn *insn) ...@@ -243,7 +256,7 @@ void insn_get_opcode(struct insn *insn)
/* Get first opcode */ /* Get first opcode */
op = get_next(insn_byte_t, insn); op = get_next(insn_byte_t, insn);
opcode->bytes[0] = op; insn_set_byte(opcode, 0, op);
opcode->nbytes = 1; opcode->nbytes = 1;
/* Check if there is VEX prefix or not */ /* Check if there is VEX prefix or not */
...@@ -295,8 +308,7 @@ void insn_get_modrm(struct insn *insn) ...@@ -295,8 +308,7 @@ void insn_get_modrm(struct insn *insn)
if (inat_has_modrm(insn->attr)) { if (inat_has_modrm(insn->attr)) {
mod = get_next(insn_byte_t, insn); mod = get_next(insn_byte_t, insn);
modrm->value = mod; insn_field_set(modrm, mod, 1);
modrm->nbytes = 1;
if (inat_is_group(insn->attr)) { if (inat_is_group(insn->attr)) {
pfx_id = insn_last_prefix_id(insn); pfx_id = insn_last_prefix_id(insn);
insn->attr = inat_get_group_attribute(mod, pfx_id, insn->attr = inat_get_group_attribute(mod, pfx_id,
...@@ -334,7 +346,7 @@ int insn_rip_relative(struct insn *insn) ...@@ -334,7 +346,7 @@ int insn_rip_relative(struct insn *insn)
* For rip-relative instructions, the mod field (top 2 bits) * For rip-relative instructions, the mod field (top 2 bits)
* is zero and the r/m field (bottom 3 bits) is 0x5. * is zero and the r/m field (bottom 3 bits) is 0x5.
*/ */
return (modrm->nbytes && (modrm->value & 0xc7) == 0x5); return (modrm->nbytes && (modrm->bytes[0] & 0xc7) == 0x5);
} }
/** /**
...@@ -353,11 +365,11 @@ void insn_get_sib(struct insn *insn) ...@@ -353,11 +365,11 @@ void insn_get_sib(struct insn *insn)
if (!insn->modrm.got) if (!insn->modrm.got)
insn_get_modrm(insn); insn_get_modrm(insn);
if (insn->modrm.nbytes) { if (insn->modrm.nbytes) {
modrm = (insn_byte_t)insn->modrm.value; modrm = insn->modrm.bytes[0];
if (insn->addr_bytes != 2 && if (insn->addr_bytes != 2 &&
X86_MODRM_MOD(modrm) != 3 && X86_MODRM_RM(modrm) == 4) { X86_MODRM_MOD(modrm) != 3 && X86_MODRM_RM(modrm) == 4) {
insn->sib.value = get_next(insn_byte_t, insn); insn_field_set(&insn->sib,
insn->sib.nbytes = 1; get_next(insn_byte_t, insn), 1);
} }
} }
insn->sib.got = 1; insn->sib.got = 1;
...@@ -407,19 +419,18 @@ void insn_get_displacement(struct insn *insn) ...@@ -407,19 +419,18 @@ void insn_get_displacement(struct insn *insn)
if (mod == 3) if (mod == 3)
goto out; goto out;
if (mod == 1) { if (mod == 1) {
insn->displacement.value = get_next(signed char, insn); insn_field_set(&insn->displacement,
insn->displacement.nbytes = 1; get_next(signed char, insn), 1);
} else if (insn->addr_bytes == 2) { } else if (insn->addr_bytes == 2) {
if ((mod == 0 && rm == 6) || mod == 2) { if ((mod == 0 && rm == 6) || mod == 2) {
insn->displacement.value = insn_field_set(&insn->displacement,
get_next(short, insn); get_next(short, insn), 2);
insn->displacement.nbytes = 2;
} }
} else { } else {
if ((mod == 0 && rm == 5) || mod == 2 || if ((mod == 0 && rm == 5) || mod == 2 ||
(mod == 0 && base == 5)) { (mod == 0 && base == 5)) {
insn->displacement.value = get_next(int, insn); insn_field_set(&insn->displacement,
insn->displacement.nbytes = 4; get_next(int, insn), 4);
} }
} }
} }
...@@ -435,18 +446,14 @@ static int __get_moffset(struct insn *insn) ...@@ -435,18 +446,14 @@ static int __get_moffset(struct insn *insn)
{ {
switch (insn->addr_bytes) { switch (insn->addr_bytes) {
case 2: case 2:
insn->moffset1.value = get_next(short, insn); insn_field_set(&insn->moffset1, get_next(short, insn), 2);
insn->moffset1.nbytes = 2;
break; break;
case 4: case 4:
insn->moffset1.value = get_next(int, insn); insn_field_set(&insn->moffset1, get_next(int, insn), 4);
insn->moffset1.nbytes = 4;
break; break;
case 8: case 8:
insn->moffset1.value = get_next(int, insn); insn_field_set(&insn->moffset1, get_next(int, insn), 4);
insn->moffset1.nbytes = 4; insn_field_set(&insn->moffset2, get_next(int, insn), 4);
insn->moffset2.value = get_next(int, insn);
insn->moffset2.nbytes = 4;
break; break;
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
...@@ -464,13 +471,11 @@ static int __get_immv32(struct insn *insn) ...@@ -464,13 +471,11 @@ static int __get_immv32(struct insn *insn)
{ {
switch (insn->opnd_bytes) { switch (insn->opnd_bytes) {
case 2: case 2:
insn->immediate.value = get_next(short, insn); insn_field_set(&insn->immediate, get_next(short, insn), 2);
insn->immediate.nbytes = 2;
break; break;
case 4: case 4:
case 8: case 8:
insn->immediate.value = get_next(int, insn); insn_field_set(&insn->immediate, get_next(int, insn), 4);
insn->immediate.nbytes = 4;
break; break;
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
...@@ -487,18 +492,15 @@ static int __get_immv(struct insn *insn) ...@@ -487,18 +492,15 @@ static int __get_immv(struct insn *insn)
{ {
switch (insn->opnd_bytes) { switch (insn->opnd_bytes) {
case 2: case 2:
insn->immediate1.value = get_next(short, insn); insn_field_set(&insn->immediate1, get_next(short, insn), 2);
insn->immediate1.nbytes = 2;
break; break;
case 4: case 4:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4; insn->immediate1.nbytes = 4;
break; break;
case 8: case 8:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4; insn_field_set(&insn->immediate2, get_next(int, insn), 4);
insn->immediate2.value = get_next(int, insn);
insn->immediate2.nbytes = 4;
break; break;
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
...@@ -515,12 +517,10 @@ static int __get_immptr(struct insn *insn) ...@@ -515,12 +517,10 @@ static int __get_immptr(struct insn *insn)
{ {
switch (insn->opnd_bytes) { switch (insn->opnd_bytes) {
case 2: case 2:
insn->immediate1.value = get_next(short, insn); insn_field_set(&insn->immediate1, get_next(short, insn), 2);
insn->immediate1.nbytes = 2;
break; break;
case 4: case 4:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4;
break; break;
case 8: case 8:
/* ptr16:64 is not exist (no segment) */ /* ptr16:64 is not exist (no segment) */
...@@ -528,8 +528,7 @@ static int __get_immptr(struct insn *insn) ...@@ -528,8 +528,7 @@ static int __get_immptr(struct insn *insn)
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
} }
insn->immediate2.value = get_next(unsigned short, insn); insn_field_set(&insn->immediate2, get_next(unsigned short, insn), 2);
insn->immediate2.nbytes = 2;
insn->immediate1.got = insn->immediate2.got = 1; insn->immediate1.got = insn->immediate2.got = 1;
return 1; return 1;
...@@ -565,22 +564,17 @@ void insn_get_immediate(struct insn *insn) ...@@ -565,22 +564,17 @@ void insn_get_immediate(struct insn *insn)
switch (inat_immediate_size(insn->attr)) { switch (inat_immediate_size(insn->attr)) {
case INAT_IMM_BYTE: case INAT_IMM_BYTE:
insn->immediate.value = get_next(signed char, insn); insn_field_set(&insn->immediate, get_next(signed char, insn), 1);
insn->immediate.nbytes = 1;
break; break;
case INAT_IMM_WORD: case INAT_IMM_WORD:
insn->immediate.value = get_next(short, insn); insn_field_set(&insn->immediate, get_next(short, insn), 2);
insn->immediate.nbytes = 2;
break; break;
case INAT_IMM_DWORD: case INAT_IMM_DWORD:
insn->immediate.value = get_next(int, insn); insn_field_set(&insn->immediate, get_next(int, insn), 4);
insn->immediate.nbytes = 4;
break; break;
case INAT_IMM_QWORD: case INAT_IMM_QWORD:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4; insn_field_set(&insn->immediate2, get_next(int, insn), 4);
insn->immediate2.value = get_next(int, insn);
insn->immediate2.nbytes = 4;
break; break;
case INAT_IMM_PTR: case INAT_IMM_PTR:
if (!__get_immptr(insn)) if (!__get_immptr(insn))
...@@ -599,8 +593,7 @@ void insn_get_immediate(struct insn *insn) ...@@ -599,8 +593,7 @@ void insn_get_immediate(struct insn *insn)
goto err_out; goto err_out;
} }
if (inat_has_second_immediate(insn->attr)) { if (inat_has_second_immediate(insn->attr)) {
insn->immediate2.value = get_next(signed char, insn); insn_field_set(&insn->immediate2, get_next(signed char, insn), 1);
insn->immediate2.nbytes = 1;
} }
done: done:
insn->immediate.got = 1; insn->immediate.got = 1;
......
arch/x86/lib/retpoline.S
View file @ a56ff24e
...@@ -28,7 +28,7 @@ SYM_FUNC_START_NOALIGN(__x86_retpoline_\reg) ...@@ -28,7 +28,7 @@ SYM_FUNC_START_NOALIGN(__x86_retpoline_\reg)
jmp .Lspec_trap_\@ jmp .Lspec_trap_\@
.Ldo_rop_\@: .Ldo_rop_\@:
mov %\reg, (%_ASM_SP) mov %\reg, (%_ASM_SP)
UNWIND_HINT_RET_OFFSET UNWIND_HINT_FUNC
ret ret
SYM_FUNC_END(__x86_retpoline_\reg) SYM_FUNC_END(__x86_retpoline_\reg)
......
arch/x86/platform/pvh/head.S
View file @ a56ff24e
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <asm/boot.h> #include <asm/boot.h>
#include <asm/processor-flags.h> #include <asm/processor-flags.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/nospec-branch.h>
#include <xen/interface/elfnote.h> #include <xen/interface/elfnote.h>
__HEAD __HEAD
...@@ -105,6 +106,7 @@ SYM_CODE_START_LOCAL(pvh_start_xen) ...@@ -105,6 +106,7 @@ SYM_CODE_START_LOCAL(pvh_start_xen)
/* startup_64 expects boot_params in %rsi. */ /* startup_64 expects boot_params in %rsi. */
mov $_pa(pvh_bootparams), %rsi mov $_pa(pvh_bootparams), %rsi
mov $_pa(startup_64), %rax mov $_pa(startup_64), %rax
ANNOTATE_RETPOLINE_SAFE
jmp *%rax jmp *%rax
#else /* CONFIG_X86_64 */ #else /* CONFIG_X86_64 */
......
arch/x86/power/Makefile
View file @ a56ff24e
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
OBJECT_FILES_NON_STANDARD_hibernate_asm_$(BITS).o := y
# __restore_processor_state() restores %gs after S3 resume and so should not # __restore_processor_state() restores %gs after S3 resume and so should not
# itself be stack-protected # itself be stack-protected
......
arch/x86/power/hibernate_asm_64.S
View file @ a56ff24e
...@@ -21,6 +21,53 @@ ...@@ -21,6 +21,53 @@
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/processor-flags.h> #include <asm/processor-flags.h>
#include <asm/frame.h> #include <asm/frame.h>
#include <asm/nospec-branch.h>
/* code below belongs to the image kernel */
.align PAGE_SIZE
SYM_FUNC_START(restore_registers)
/* go back to the original page tables */
movq %r9, %cr3
/* Flush TLB, including "global" things (vmalloc) */
movq mmu_cr4_features(%rip), %rax
movq %rax, %rdx
andq $~(X86_CR4_PGE), %rdx
movq %rdx, %cr4; # turn off PGE
movq %cr3, %rcx; # flush TLB
movq %rcx, %cr3
movq %rax, %cr4; # turn PGE back on
/* We don't restore %rax, it must be 0 anyway */
movq $saved_context, %rax
movq pt_regs_sp(%rax), %rsp
movq pt_regs_bp(%rax), %rbp
movq pt_regs_si(%rax), %rsi
movq pt_regs_di(%rax), %rdi
movq pt_regs_bx(%rax), %rbx
movq pt_regs_cx(%rax), %rcx
movq pt_regs_dx(%rax), %rdx
movq pt_regs_r8(%rax), %r8
movq pt_regs_r9(%rax), %r9
movq pt_regs_r10(%rax), %r10
movq pt_regs_r11(%rax), %r11
movq pt_regs_r12(%rax), %r12
movq pt_regs_r13(%rax), %r13
movq pt_regs_r14(%rax), %r14
movq pt_regs_r15(%rax), %r15
pushq pt_regs_flags(%rax)
popfq
/* Saved in save_processor_state. */
lgdt saved_context_gdt_desc(%rax)
xorl %eax, %eax
/* tell the hibernation core that we've just restored the memory */
movq %rax, in_suspend(%rip)
ret
SYM_FUNC_END(restore_registers)
SYM_FUNC_START(swsusp_arch_suspend) SYM_FUNC_START(swsusp_arch_suspend)
movq $saved_context, %rax movq $saved_context, %rax
...@@ -52,7 +99,7 @@ SYM_FUNC_START(swsusp_arch_suspend) ...@@ -52,7 +99,7 @@ SYM_FUNC_START(swsusp_arch_suspend)
ret ret
SYM_FUNC_END(swsusp_arch_suspend) SYM_FUNC_END(swsusp_arch_suspend)
SYM_CODE_START(restore_image) SYM_FUNC_START(restore_image)
/* prepare to jump to the image kernel */ /* prepare to jump to the image kernel */
movq restore_jump_address(%rip), %r8 movq restore_jump_address(%rip), %r8
movq restore_cr3(%rip), %r9 movq restore_cr3(%rip), %r9
...@@ -66,11 +113,12 @@ SYM_CODE_START(restore_image) ...@@ -66,11 +113,12 @@ SYM_CODE_START(restore_image)
/* jump to relocated restore code */ /* jump to relocated restore code */
movq relocated_restore_code(%rip), %rcx movq relocated_restore_code(%rip), %rcx
ANNOTATE_RETPOLINE_SAFE
jmpq *%rcx jmpq *%rcx
SYM_CODE_END(restore_image) SYM_FUNC_END(restore_image)
/* code below has been relocated to a safe page */ /* code below has been relocated to a safe page */
SYM_CODE_START(core_restore_code) SYM_FUNC_START(core_restore_code)
/* switch to temporary page tables */ /* switch to temporary page tables */
movq %rax, %cr3 movq %rax, %cr3
/* flush TLB */ /* flush TLB */
...@@ -97,51 +145,6 @@ SYM_CODE_START(core_restore_code) ...@@ -97,51 +145,6 @@ SYM_CODE_START(core_restore_code)
.Ldone: .Ldone:
/* jump to the restore_registers address from the image header */ /* jump to the restore_registers address from the image header */
ANNOTATE_RETPOLINE_SAFE
jmpq *%r8 jmpq *%r8
SYM_CODE_END(core_restore_code) SYM_FUNC_END(core_restore_code)
/* code below belongs to the image kernel */
.align PAGE_SIZE
SYM_FUNC_START(restore_registers)
/* go back to the original page tables */
movq %r9, %cr3
/* Flush TLB, including "global" things (vmalloc) */
movq mmu_cr4_features(%rip), %rax
movq %rax, %rdx
andq $~(X86_CR4_PGE), %rdx
movq %rdx, %cr4; # turn off PGE
movq %cr3, %rcx; # flush TLB
movq %rcx, %cr3
movq %rax, %cr4; # turn PGE back on
/* We don't restore %rax, it must be 0 anyway */
movq $saved_context, %rax
movq pt_regs_sp(%rax), %rsp
movq pt_regs_bp(%rax), %rbp
movq pt_regs_si(%rax), %rsi
movq pt_regs_di(%rax), %rdi
movq pt_regs_bx(%rax), %rbx
movq pt_regs_cx(%rax), %rcx
movq pt_regs_dx(%rax), %rdx
movq pt_regs_r8(%rax), %r8
movq pt_regs_r9(%rax), %r9
movq pt_regs_r10(%rax), %r10
movq pt_regs_r11(%rax), %r11
movq pt_regs_r12(%rax), %r12
movq pt_regs_r13(%rax), %r13
movq pt_regs_r14(%rax), %r14
movq pt_regs_r15(%rax), %r15
pushq pt_regs_flags(%rax)
popfq
/* Saved in save_processor_state. */
lgdt saved_context_gdt_desc(%rax)
xorl %eax, %eax
/* tell the hibernation core that we've just restored the memory */
movq %rax, in_suspend(%rip)
ret
SYM_FUNC_END(restore_registers)
arch/x86/tools/Makefile
View file @ a56ff24e
...@@ -29,14 +29,14 @@ posttest: $(obj)/insn_decoder_test vmlinux $(obj)/insn_sanity ...@@ -29,14 +29,14 @@ posttest: $(obj)/insn_decoder_test vmlinux $(obj)/insn_sanity
hostprogs += insn_decoder_test insn_sanity hostprogs += insn_decoder_test insn_sanity
# -I needed for generated C source and C source which in the kernel tree. # -I needed for generated C source and C source which in the kernel tree.
HOSTCFLAGS_insn_decoder_test.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/uapi/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/uapi/ HOSTCFLAGS_insn_decoder_test.o := -Wall -I$(srctree)/tools/arch/x86/lib/ -I$(srctree)/tools/arch/x86/include/ -I$(objtree)/arch/x86/lib/
HOSTCFLAGS_insn_sanity.o := -Wall -I$(objtree)/arch/x86/lib/ -I$(srctree)/arch/x86/include/ -I$(srctree)/arch/x86/lib/ -I$(srctree)/include/ HOSTCFLAGS_insn_sanity.o := -Wall -I$(srctree)/tools/arch/x86/lib/ -I$(srctree)/tools/arch/x86/include/ -I$(objtree)/arch/x86/lib/
# Dependencies are also needed. # Dependencies are also needed.
$(obj)/insn_decoder_test.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c $(obj)/insn_decoder_test.o: $(srctree)/tools/arch/x86/lib/insn.c $(srctree)/tools/arch/x86/lib/inat.c $(srctree)/tools/arch/x86/include/asm/inat_types.h $(srctree)/tools/arch/x86/include/asm/inat.h $(srctree)/tools/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
$(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/inat.c $(srctree)/arch/x86/include/asm/inat_types.h $(srctree)/arch/x86/include/asm/inat.h $(srctree)/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c $(obj)/insn_sanity.o: $(srctree)/tools/arch/x86/lib/insn.c $(srctree)/tools/arch/x86/lib/inat.c $(srctree)/tools/arch/x86/include/asm/inat_types.h $(srctree)/tools/arch/x86/include/asm/inat.h $(srctree)/tools/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c
HOST_EXTRACFLAGS += -I$(srctree)/tools/include HOST_EXTRACFLAGS += -I$(srctree)/tools/include
hostprogs += relocs hostprogs += relocs
......
arch/x86/tools/insn_sanity.c
View file @ a56ff24e
...@@ -14,10 +14,6 @@ ...@@ -14,10 +14,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#define unlikely(cond) (cond)
#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
#include <asm/insn.h> #include <asm/insn.h>
#include <inat.c> #include <inat.c>
#include <insn.c> #include <insn.c>
......
arch/x86/xen/Makefile
View file @ a56ff24e
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
OBJECT_FILES_NON_STANDARD_xen-asm.o := y
ifdef CONFIG_FUNCTION_TRACER ifdef CONFIG_FUNCTION_TRACER
# Do not profile debug and lowlevel utilities # Do not profile debug and lowlevel utilities
......
arch/x86/xen/xen-asm.S
View file @ a56ff24e
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/asm.h> #include <asm/asm.h>
#include <asm/frame.h> #include <asm/frame.h>
#include <asm/unwind_hints.h>
#include <xen/interface/xen.h> #include <xen/interface/xen.h>
...@@ -118,6 +119,7 @@ SYM_FUNC_END(xen_read_cr2_direct); ...@@ -118,6 +119,7 @@ SYM_FUNC_END(xen_read_cr2_direct);
.macro xen_pv_trap name .macro xen_pv_trap name
SYM_CODE_START(xen_\name) SYM_CODE_START(xen_\name)
UNWIND_HINT_EMPTY
pop %rcx pop %rcx
pop %r11 pop %r11
jmp \name jmp \name
...@@ -157,6 +159,7 @@ xen_pv_trap asm_exc_xen_hypervisor_callback ...@@ -157,6 +159,7 @@ xen_pv_trap asm_exc_xen_hypervisor_callback
SYM_CODE_START(xen_early_idt_handler_array) SYM_CODE_START(xen_early_idt_handler_array)
i = 0 i = 0
.rept NUM_EXCEPTION_VECTORS .rept NUM_EXCEPTION_VECTORS
UNWIND_HINT_EMPTY
pop %rcx pop %rcx
pop %r11 pop %r11
jmp early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE jmp early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE
...@@ -183,6 +186,7 @@ hypercall_iret = hypercall_page + __HYPERVISOR_iret * 32 ...@@ -183,6 +186,7 @@ hypercall_iret = hypercall_page + __HYPERVISOR_iret * 32
* rsp->rax } * rsp->rax }
*/ */
SYM_CODE_START(xen_iret) SYM_CODE_START(xen_iret)
UNWIND_HINT_EMPTY
pushq $0 pushq $0
jmp hypercall_iret jmp hypercall_iret
SYM_CODE_END(xen_iret) SYM_CODE_END(xen_iret)
...@@ -203,7 +207,8 @@ SYM_CODE_END(xen_iret) ...@@ -203,7 +207,8 @@ SYM_CODE_END(xen_iret)
*/ */
/* Normal 64-bit system call target */ /* Normal 64-bit system call target */
SYM_FUNC_START(xen_syscall_target) SYM_CODE_START(xen_syscall_target)
UNWIND_HINT_EMPTY
popq %rcx popq %rcx
popq %r11 popq %r11
...@@ -216,12 +221,13 @@ SYM_FUNC_START(xen_syscall_target) ...@@ -216,12 +221,13 @@ SYM_FUNC_START(xen_syscall_target)
movq $__USER_CS, 1*8(%rsp) movq $__USER_CS, 1*8(%rsp)
jmp entry_SYSCALL_64_after_hwframe jmp entry_SYSCALL_64_after_hwframe
SYM_FUNC_END(xen_syscall_target) SYM_CODE_END(xen_syscall_target)
#ifdef CONFIG_IA32_EMULATION #ifdef CONFIG_IA32_EMULATION
/* 32-bit compat syscall target */ /* 32-bit compat syscall target */
SYM_FUNC_START(xen_syscall32_target) SYM_CODE_START(xen_syscall32_target)
UNWIND_HINT_EMPTY
popq %rcx popq %rcx
popq %r11 popq %r11
...@@ -234,10 +240,11 @@ SYM_FUNC_START(xen_syscall32_target) ...@@ -234,10 +240,11 @@ SYM_FUNC_START(xen_syscall32_target)
movq $__USER32_CS, 1*8(%rsp) movq $__USER32_CS, 1*8(%rsp)
jmp entry_SYSCALL_compat_after_hwframe jmp entry_SYSCALL_compat_after_hwframe
SYM_FUNC_END(xen_syscall32_target) SYM_CODE_END(xen_syscall32_target)
/* 32-bit compat sysenter target */ /* 32-bit compat sysenter target */
SYM_FUNC_START(xen_sysenter_target) SYM_CODE_START(xen_sysenter_target)
UNWIND_HINT_EMPTY
/* /*
* NB: Xen is polite and clears TF from EFLAGS for us. This means * NB: Xen is polite and clears TF from EFLAGS for us. This means
* that we don't need to guard against single step exceptions here. * that we don't need to guard against single step exceptions here.
...@@ -254,17 +261,18 @@ SYM_FUNC_START(xen_sysenter_target) ...@@ -254,17 +261,18 @@ SYM_FUNC_START(xen_sysenter_target)
movq $__USER32_CS, 1*8(%rsp) movq $__USER32_CS, 1*8(%rsp)
jmp entry_SYSENTER_compat_after_hwframe jmp entry_SYSENTER_compat_after_hwframe
SYM_FUNC_END(xen_sysenter_target) SYM_CODE_END(xen_sysenter_target)
#else /* !CONFIG_IA32_EMULATION */ #else /* !CONFIG_IA32_EMULATION */
SYM_FUNC_START_ALIAS(xen_syscall32_target) SYM_CODE_START(xen_syscall32_target)
SYM_FUNC_START(xen_sysenter_target) SYM_CODE_START(xen_sysenter_target)
UNWIND_HINT_EMPTY
lea 16(%rsp), %rsp /* strip %rcx, %r11 */ lea 16(%rsp), %rsp /* strip %rcx, %r11 */
mov $-ENOSYS, %rax mov $-ENOSYS, %rax
pushq $0 pushq $0
jmp hypercall_iret jmp hypercall_iret
SYM_FUNC_END(xen_sysenter_target) SYM_CODE_END(xen_sysenter_target)
SYM_FUNC_END_ALIAS(xen_syscall32_target) SYM_CODE_END(xen_syscall32_target)
#endif /* CONFIG_IA32_EMULATION */ #endif /* CONFIG_IA32_EMULATION */
arch/x86/xen/xen-head.S
View file @ a56ff24e
...@@ -68,8 +68,9 @@ SYM_CODE_END(asm_cpu_bringup_and_idle) ...@@ -68,8 +68,9 @@ SYM_CODE_END(asm_cpu_bringup_and_idle)
.balign PAGE_SIZE .balign PAGE_SIZE
SYM_CODE_START(hypercall_page) SYM_CODE_START(hypercall_page)
.rept (PAGE_SIZE / 32) .rept (PAGE_SIZE / 32)
UNWIND_HINT_EMPTY UNWIND_HINT_FUNC
.skip 32 .skip 31, 0x90
ret
.endr .endr
#define HYPERCALL(n) \ #define HYPERCALL(n) \
......
include/linux/objtool.h
View file @ a56ff24e
...@@ -29,11 +29,14 @@ struct unwind_hint { ...@@ -29,11 +29,14 @@ struct unwind_hint {
* *
* UNWIND_HINT_TYPE_REGS_PARTIAL: Used in entry code to indicate that * UNWIND_HINT_TYPE_REGS_PARTIAL: Used in entry code to indicate that
* sp_reg+sp_offset points to the iret return frame. * sp_reg+sp_offset points to the iret return frame.
*
* UNWIND_HINT_FUNC: Generate the unwind metadata of a callable function.
* Useful for code which doesn't have an ELF function annotation.
*/ */
#define UNWIND_HINT_TYPE_CALL 0 #define UNWIND_HINT_TYPE_CALL 0
#define UNWIND_HINT_TYPE_REGS 1 #define UNWIND_HINT_TYPE_REGS 1
#define UNWIND_HINT_TYPE_REGS_PARTIAL 2 #define UNWIND_HINT_TYPE_REGS_PARTIAL 2
#define UNWIND_HINT_TYPE_RET_OFFSET 3 #define UNWIND_HINT_TYPE_FUNC 3
#ifdef CONFIG_STACK_VALIDATION #ifdef CONFIG_STACK_VALIDATION
...@@ -109,6 +112,12 @@ struct unwind_hint { ...@@ -109,6 +112,12 @@ struct unwind_hint {
.popsection .popsection
.endm .endm
.macro STACK_FRAME_NON_STANDARD func:req
.pushsection .discard.func_stack_frame_non_standard, "aw"
.long \func - .
.popsection
.endm
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#else /* !CONFIG_STACK_VALIDATION */ #else /* !CONFIG_STACK_VALIDATION */
...@@ -122,6 +131,8 @@ struct unwind_hint { ...@@ -122,6 +131,8 @@ struct unwind_hint {
#define ANNOTATE_INTRA_FUNCTION_CALL #define ANNOTATE_INTRA_FUNCTION_CALL
.macro UNWIND_HINT sp_reg:req sp_offset=0 type:req end=0 .macro UNWIND_HINT sp_reg:req sp_offset=0 type:req end=0
.endm .endm
.macro STACK_FRAME_NON_STANDARD func:req
.endm
#endif #endif
#endif /* CONFIG_STACK_VALIDATION */ #endif /* CONFIG_STACK_VALIDATION */
......
tools/arch/x86/include/asm/insn.h
View file @ a56ff24e
...@@ -7,9 +7,12 @@ ...@@ -7,9 +7,12 @@
* Copyright (C) IBM Corporation, 2009 * Copyright (C) IBM Corporation, 2009
*/ */
#include <asm/byteorder.h>
/* insn_attr_t is defined in inat.h */ /* insn_attr_t is defined in inat.h */
#include "inat.h" #include "inat.h"
#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
struct insn_field { struct insn_field {
union { union {
insn_value_t value; insn_value_t value;
...@@ -20,6 +23,48 @@ struct insn_field { ...@@ -20,6 +23,48 @@ struct insn_field {
unsigned char nbytes; unsigned char nbytes;
}; };
static inline void insn_field_set(struct insn_field *p, insn_value_t v,
unsigned char n)
{
p->value = v;
p->nbytes = n;
}
static inline void insn_set_byte(struct insn_field *p, unsigned char n,
insn_byte_t v)
{
p->bytes[n] = v;
}
#else
struct insn_field {
insn_value_t value;
union {
insn_value_t little;
insn_byte_t bytes[4];
};
/* !0 if we've run insn_get_xxx() for this field */
unsigned char got;
unsigned char nbytes;
};
static inline void insn_field_set(struct insn_field *p, insn_value_t v,
unsigned char n)
{
p->value = v;
p->little = __cpu_to_le32(v);
p->nbytes = n;
}
static inline void insn_set_byte(struct insn_field *p, unsigned char n,
insn_byte_t v)
{
p->bytes[n] = v;
p->value = __le32_to_cpu(p->little);
}
#endif
struct insn { struct insn {
struct insn_field prefixes; /* struct insn_field prefixes; /*
* Prefixes * Prefixes
......
tools/arch/x86/include/asm/orc_types.h
View file @ a56ff24e
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
#define ORC_REG_MAX 15 #define ORC_REG_MAX 15
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/byteorder.h>
/* /*
* This struct is more or less a vastly simplified version of the DWARF Call * This struct is more or less a vastly simplified version of the DWARF Call
* Frame Information standard. It contains only the necessary parts of DWARF * Frame Information standard. It contains only the necessary parts of DWARF
...@@ -51,10 +53,18 @@ ...@@ -51,10 +53,18 @@
struct orc_entry { struct orc_entry {
s16 sp_offset; s16 sp_offset;
s16 bp_offset; s16 bp_offset;
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned sp_reg:4; unsigned sp_reg:4;
unsigned bp_reg:4; unsigned bp_reg:4;
unsigned type:2; unsigned type:2;
unsigned end:1; unsigned end:1;
#elif defined(__BIG_ENDIAN_BITFIELD)
unsigned bp_reg:4;
unsigned sp_reg:4;
unsigned unused:5;
unsigned end:1;
unsigned type:2;
#endif
} __packed; } __packed;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
tools/arch/x86/lib/insn.c
View file @ a56ff24e
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* Copyright (C) IBM Corporation, 2002, 2004, 2009 * Copyright (C) IBM Corporation, 2002, 2004, 2009
*/ */
#include <linux/kernel.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/string.h> #include <linux/string.h>
#else #else
...@@ -15,15 +16,28 @@ ...@@ -15,15 +16,28 @@
#include "../include/asm/emulate_prefix.h" #include "../include/asm/emulate_prefix.h"
#define leXX_to_cpu(t, r) \
({ \
__typeof__(t) v; \
switch (sizeof(t)) { \
case 4: v = le32_to_cpu(r); break; \
case 2: v = le16_to_cpu(r); break; \
case 1: v = r; break; \
default: \
BUILD_BUG(); break; \
} \
v; \
})
/* Verify next sizeof(t) bytes can be on the same instruction */ /* Verify next sizeof(t) bytes can be on the same instruction */
#define validate_next(t, insn, n) \ #define validate_next(t, insn, n) \
((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr) ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)
#define __get_next(t, insn) \ #define __get_next(t, insn) \
({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); r; }) ({ t r = *(t*)insn->next_byte; insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })
#define __peek_nbyte_next(t, insn, n) \ #define __peek_nbyte_next(t, insn, n) \
({ t r = *(t*)((insn)->next_byte + n); r; }) ({ t r = *(t*)((insn)->next_byte + n); leXX_to_cpu(t, r); })
#define get_next(t, insn) \ #define get_next(t, insn) \
({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); }) ({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); })
...@@ -147,9 +161,9 @@ void insn_get_prefixes(struct insn *insn) ...@@ -147,9 +161,9 @@ void insn_get_prefixes(struct insn *insn)
b = insn->prefixes.bytes[3]; b = insn->prefixes.bytes[3];
for (i = 0; i < nb; i++) for (i = 0; i < nb; i++)
if (prefixes->bytes[i] == lb) if (prefixes->bytes[i] == lb)
prefixes->bytes[i] = b; insn_set_byte(prefixes, i, b);
} }
insn->prefixes.bytes[3] = lb; insn_set_byte(&insn->prefixes, 3, lb);
} }
/* Decode REX prefix */ /* Decode REX prefix */
...@@ -157,8 +171,7 @@ void insn_get_prefixes(struct insn *insn) ...@@ -157,8 +171,7 @@ void insn_get_prefixes(struct insn *insn)
b = peek_next(insn_byte_t, insn); b = peek_next(insn_byte_t, insn);
attr = inat_get_opcode_attribute(b); attr = inat_get_opcode_attribute(b);
if (inat_is_rex_prefix(attr)) { if (inat_is_rex_prefix(attr)) {
insn->rex_prefix.value = b; insn_field_set(&insn->rex_prefix, b, 1);
insn->rex_prefix.nbytes = 1;
insn->next_byte++; insn->next_byte++;
if (X86_REX_W(b)) if (X86_REX_W(b))
/* REX.W overrides opnd_size */ /* REX.W overrides opnd_size */
...@@ -181,13 +194,13 @@ void insn_get_prefixes(struct insn *insn) ...@@ -181,13 +194,13 @@ void insn_get_prefixes(struct insn *insn)
if (X86_MODRM_MOD(b2) != 3) if (X86_MODRM_MOD(b2) != 3)
goto vex_end; goto vex_end;
} }
insn->vex_prefix.bytes[0] = b; insn_set_byte(&insn->vex_prefix, 0, b);
insn->vex_prefix.bytes[1] = b2; insn_set_byte(&insn->vex_prefix, 1, b2);
if (inat_is_evex_prefix(attr)) { if (inat_is_evex_prefix(attr)) {
b2 = peek_nbyte_next(insn_byte_t, insn, 2); b2 = peek_nbyte_next(insn_byte_t, insn, 2);
insn->vex_prefix.bytes[2] = b2; insn_set_byte(&insn->vex_prefix, 2, b2);
b2 = peek_nbyte_next(insn_byte_t, insn, 3); b2 = peek_nbyte_next(insn_byte_t, insn, 3);
insn->vex_prefix.bytes[3] = b2; insn_set_byte(&insn->vex_prefix, 3, b2);
insn->vex_prefix.nbytes = 4; insn->vex_prefix.nbytes = 4;
insn->next_byte += 4; insn->next_byte += 4;
if (insn->x86_64 && X86_VEX_W(b2)) if (insn->x86_64 && X86_VEX_W(b2))
...@@ -195,7 +208,7 @@ void insn_get_prefixes(struct insn *insn) ...@@ -195,7 +208,7 @@ void insn_get_prefixes(struct insn *insn)
insn->opnd_bytes = 8; insn->opnd_bytes = 8;
} else if (inat_is_vex3_prefix(attr)) { } else if (inat_is_vex3_prefix(attr)) {
b2 = peek_nbyte_next(insn_byte_t, insn, 2); b2 = peek_nbyte_next(insn_byte_t, insn, 2);
insn->vex_prefix.bytes[2] = b2; insn_set_byte(&insn->vex_prefix, 2, b2);
insn->vex_prefix.nbytes = 3; insn->vex_prefix.nbytes = 3;
insn->next_byte += 3; insn->next_byte += 3;
if (insn->x86_64 && X86_VEX_W(b2)) if (insn->x86_64 && X86_VEX_W(b2))
...@@ -207,7 +220,7 @@ void insn_get_prefixes(struct insn *insn) ...@@ -207,7 +220,7 @@ void insn_get_prefixes(struct insn *insn)
* Makes it easier to decode vex.W, vex.vvvv, * Makes it easier to decode vex.W, vex.vvvv,
* vex.L and vex.pp. Masking with 0x7f sets vex.W == 0. * vex.L and vex.pp. Masking with 0x7f sets vex.W == 0.
*/ */
insn->vex_prefix.bytes[2] = b2 & 0x7f; insn_set_byte(&insn->vex_prefix, 2, b2 & 0x7f);
insn->vex_prefix.nbytes = 2; insn->vex_prefix.nbytes = 2;
insn->next_byte += 2; insn->next_byte += 2;
} }
...@@ -243,7 +256,7 @@ void insn_get_opcode(struct insn *insn) ...@@ -243,7 +256,7 @@ void insn_get_opcode(struct insn *insn)
/* Get first opcode */ /* Get first opcode */
op = get_next(insn_byte_t, insn); op = get_next(insn_byte_t, insn);
opcode->bytes[0] = op; insn_set_byte(opcode, 0, op);
opcode->nbytes = 1; opcode->nbytes = 1;
/* Check if there is VEX prefix or not */ /* Check if there is VEX prefix or not */
...@@ -295,8 +308,7 @@ void insn_get_modrm(struct insn *insn) ...@@ -295,8 +308,7 @@ void insn_get_modrm(struct insn *insn)
if (inat_has_modrm(insn->attr)) { if (inat_has_modrm(insn->attr)) {
mod = get_next(insn_byte_t, insn); mod = get_next(insn_byte_t, insn);
modrm->value = mod; insn_field_set(modrm, mod, 1);
modrm->nbytes = 1;
if (inat_is_group(insn->attr)) { if (inat_is_group(insn->attr)) {
pfx_id = insn_last_prefix_id(insn); pfx_id = insn_last_prefix_id(insn);
insn->attr = inat_get_group_attribute(mod, pfx_id, insn->attr = inat_get_group_attribute(mod, pfx_id,
...@@ -334,7 +346,7 @@ int insn_rip_relative(struct insn *insn) ...@@ -334,7 +346,7 @@ int insn_rip_relative(struct insn *insn)
* For rip-relative instructions, the mod field (top 2 bits) * For rip-relative instructions, the mod field (top 2 bits)
* is zero and the r/m field (bottom 3 bits) is 0x5. * is zero and the r/m field (bottom 3 bits) is 0x5.
*/ */
return (modrm->nbytes && (modrm->value & 0xc7) == 0x5); return (modrm->nbytes && (modrm->bytes[0] & 0xc7) == 0x5);
} }
/** /**
...@@ -353,11 +365,11 @@ void insn_get_sib(struct insn *insn) ...@@ -353,11 +365,11 @@ void insn_get_sib(struct insn *insn)
if (!insn->modrm.got) if (!insn->modrm.got)
insn_get_modrm(insn); insn_get_modrm(insn);
if (insn->modrm.nbytes) { if (insn->modrm.nbytes) {
modrm = (insn_byte_t)insn->modrm.value; modrm = insn->modrm.bytes[0];
if (insn->addr_bytes != 2 && if (insn->addr_bytes != 2 &&
X86_MODRM_MOD(modrm) != 3 && X86_MODRM_RM(modrm) == 4) { X86_MODRM_MOD(modrm) != 3 && X86_MODRM_RM(modrm) == 4) {
insn->sib.value = get_next(insn_byte_t, insn); insn_field_set(&insn->sib,
insn->sib.nbytes = 1; get_next(insn_byte_t, insn), 1);
} }
} }
insn->sib.got = 1; insn->sib.got = 1;
...@@ -407,19 +419,18 @@ void insn_get_displacement(struct insn *insn) ...@@ -407,19 +419,18 @@ void insn_get_displacement(struct insn *insn)
if (mod == 3) if (mod == 3)
goto out; goto out;
if (mod == 1) { if (mod == 1) {
insn->displacement.value = get_next(signed char, insn); insn_field_set(&insn->displacement,
insn->displacement.nbytes = 1; get_next(signed char, insn), 1);
} else if (insn->addr_bytes == 2) { } else if (insn->addr_bytes == 2) {
if ((mod == 0 && rm == 6) || mod == 2) { if ((mod == 0 && rm == 6) || mod == 2) {
insn->displacement.value = insn_field_set(&insn->displacement,
get_next(short, insn); get_next(short, insn), 2);
insn->displacement.nbytes = 2;
} }
} else { } else {
if ((mod == 0 && rm == 5) || mod == 2 || if ((mod == 0 && rm == 5) || mod == 2 ||
(mod == 0 && base == 5)) { (mod == 0 && base == 5)) {
insn->displacement.value = get_next(int, insn); insn_field_set(&insn->displacement,
insn->displacement.nbytes = 4; get_next(int, insn), 4);
} }
} }
} }
...@@ -435,18 +446,14 @@ static int __get_moffset(struct insn *insn) ...@@ -435,18 +446,14 @@ static int __get_moffset(struct insn *insn)
{ {
switch (insn->addr_bytes) { switch (insn->addr_bytes) {
case 2: case 2:
insn->moffset1.value = get_next(short, insn); insn_field_set(&insn->moffset1, get_next(short, insn), 2);
insn->moffset1.nbytes = 2;
break; break;
case 4: case 4:
insn->moffset1.value = get_next(int, insn); insn_field_set(&insn->moffset1, get_next(int, insn), 4);
insn->moffset1.nbytes = 4;
break; break;
case 8: case 8:
insn->moffset1.value = get_next(int, insn); insn_field_set(&insn->moffset1, get_next(int, insn), 4);
insn->moffset1.nbytes = 4; insn_field_set(&insn->moffset2, get_next(int, insn), 4);
insn->moffset2.value = get_next(int, insn);
insn->moffset2.nbytes = 4;
break; break;
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
...@@ -464,13 +471,11 @@ static int __get_immv32(struct insn *insn) ...@@ -464,13 +471,11 @@ static int __get_immv32(struct insn *insn)
{ {
switch (insn->opnd_bytes) { switch (insn->opnd_bytes) {
case 2: case 2:
insn->immediate.value = get_next(short, insn); insn_field_set(&insn->immediate, get_next(short, insn), 2);
insn->immediate.nbytes = 2;
break; break;
case 4: case 4:
case 8: case 8:
insn->immediate.value = get_next(int, insn); insn_field_set(&insn->immediate, get_next(int, insn), 4);
insn->immediate.nbytes = 4;
break; break;
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
...@@ -487,18 +492,15 @@ static int __get_immv(struct insn *insn) ...@@ -487,18 +492,15 @@ static int __get_immv(struct insn *insn)
{ {
switch (insn->opnd_bytes) { switch (insn->opnd_bytes) {
case 2: case 2:
insn->immediate1.value = get_next(short, insn); insn_field_set(&insn->immediate1, get_next(short, insn), 2);
insn->immediate1.nbytes = 2;
break; break;
case 4: case 4:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4; insn->immediate1.nbytes = 4;
break; break;
case 8: case 8:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4; insn_field_set(&insn->immediate2, get_next(int, insn), 4);
insn->immediate2.value = get_next(int, insn);
insn->immediate2.nbytes = 4;
break; break;
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
...@@ -515,12 +517,10 @@ static int __get_immptr(struct insn *insn) ...@@ -515,12 +517,10 @@ static int __get_immptr(struct insn *insn)
{ {
switch (insn->opnd_bytes) { switch (insn->opnd_bytes) {
case 2: case 2:
insn->immediate1.value = get_next(short, insn); insn_field_set(&insn->immediate1, get_next(short, insn), 2);
insn->immediate1.nbytes = 2;
break; break;
case 4: case 4:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4;
break; break;
case 8: case 8:
/* ptr16:64 is not exist (no segment) */ /* ptr16:64 is not exist (no segment) */
...@@ -528,8 +528,7 @@ static int __get_immptr(struct insn *insn) ...@@ -528,8 +528,7 @@ static int __get_immptr(struct insn *insn)
default: /* opnd_bytes must be modified manually */ default: /* opnd_bytes must be modified manually */
goto err_out; goto err_out;
} }
insn->immediate2.value = get_next(unsigned short, insn); insn_field_set(&insn->immediate2, get_next(unsigned short, insn), 2);
insn->immediate2.nbytes = 2;
insn->immediate1.got = insn->immediate2.got = 1; insn->immediate1.got = insn->immediate2.got = 1;
return 1; return 1;
...@@ -565,22 +564,17 @@ void insn_get_immediate(struct insn *insn) ...@@ -565,22 +564,17 @@ void insn_get_immediate(struct insn *insn)
switch (inat_immediate_size(insn->attr)) { switch (inat_immediate_size(insn->attr)) {
case INAT_IMM_BYTE: case INAT_IMM_BYTE:
insn->immediate.value = get_next(signed char, insn); insn_field_set(&insn->immediate, get_next(signed char, insn), 1);
insn->immediate.nbytes = 1;
break; break;
case INAT_IMM_WORD: case INAT_IMM_WORD:
insn->immediate.value = get_next(short, insn); insn_field_set(&insn->immediate, get_next(short, insn), 2);
insn->immediate.nbytes = 2;
break; break;
case INAT_IMM_DWORD: case INAT_IMM_DWORD:
insn->immediate.value = get_next(int, insn); insn_field_set(&insn->immediate, get_next(int, insn), 4);
insn->immediate.nbytes = 4;
break; break;
case INAT_IMM_QWORD: case INAT_IMM_QWORD:
insn->immediate1.value = get_next(int, insn); insn_field_set(&insn->immediate1, get_next(int, insn), 4);
insn->immediate1.nbytes = 4; insn_field_set(&insn->immediate2, get_next(int, insn), 4);
insn->immediate2.value = get_next(int, insn);
insn->immediate2.nbytes = 4;
break; break;
case INAT_IMM_PTR: case INAT_IMM_PTR:
if (!__get_immptr(insn)) if (!__get_immptr(insn))
...@@ -599,8 +593,7 @@ void insn_get_immediate(struct insn *insn) ...@@ -599,8 +593,7 @@ void insn_get_immediate(struct insn *insn)
goto err_out; goto err_out;
} }
if (inat_has_second_immediate(insn->attr)) { if (inat_has_second_immediate(insn->attr)) {
insn->immediate2.value = get_next(signed char, insn); insn_field_set(&insn->immediate2, get_next(signed char, insn), 1);
insn->immediate2.nbytes = 1;
} }
done: done:
insn->immediate.got = 1; insn->immediate.got = 1;
......
tools/include/linux/objtool.h
View file @ a56ff24e
...@@ -29,11 +29,14 @@ struct unwind_hint { ...@@ -29,11 +29,14 @@ struct unwind_hint {
* *
* UNWIND_HINT_TYPE_REGS_PARTIAL: Used in entry code to indicate that * UNWIND_HINT_TYPE_REGS_PARTIAL: Used in entry code to indicate that
* sp_reg+sp_offset points to the iret return frame. * sp_reg+sp_offset points to the iret return frame.
*
* UNWIND_HINT_FUNC: Generate the unwind metadata of a callable function.
* Useful for code which doesn't have an ELF function annotation.
*/ */
#define UNWIND_HINT_TYPE_CALL 0 #define UNWIND_HINT_TYPE_CALL 0
#define UNWIND_HINT_TYPE_REGS 1 #define UNWIND_HINT_TYPE_REGS 1
#define UNWIND_HINT_TYPE_REGS_PARTIAL 2 #define UNWIND_HINT_TYPE_REGS_PARTIAL 2
#define UNWIND_HINT_TYPE_RET_OFFSET 3 #define UNWIND_HINT_TYPE_FUNC 3
#ifdef CONFIG_STACK_VALIDATION #ifdef CONFIG_STACK_VALIDATION
...@@ -109,6 +112,12 @@ struct unwind_hint { ...@@ -109,6 +112,12 @@ struct unwind_hint {
.popsection .popsection
.endm .endm
.macro STACK_FRAME_NON_STANDARD func:req
.pushsection .discard.func_stack_frame_non_standard, "aw"
.long \func - .
.popsection
.endm
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#else /* !CONFIG_STACK_VALIDATION */ #else /* !CONFIG_STACK_VALIDATION */
...@@ -122,6 +131,8 @@ struct unwind_hint { ...@@ -122,6 +131,8 @@ struct unwind_hint {
#define ANNOTATE_INTRA_FUNCTION_CALL #define ANNOTATE_INTRA_FUNCTION_CALL
.macro UNWIND_HINT sp_reg:req sp_offset=0 type:req end=0 .macro UNWIND_HINT sp_reg:req sp_offset=0 type:req end=0
.endm .endm
.macro STACK_FRAME_NON_STANDARD func:req
.endm
#endif #endif
#endif /* CONFIG_STACK_VALIDATION */ #endif /* CONFIG_STACK_VALIDATION */
......
tools/objtool/.gitignore
View file @ a56ff24e
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
arch/x86/lib/inat-tables.c arch/x86/lib/inat-tables.c
objtool /objtool
fixdep fixdep
tools/objtool/Documentation/stack-validation.txt
View file @ a56ff24e
...@@ -315,13 +315,15 @@ they mean, and suggestions for how to fix them. ...@@ -315,13 +315,15 @@ they mean, and suggestions for how to fix them.
function tracing inserts additional calls, which is not obvious from the function tracing inserts additional calls, which is not obvious from the
sources). sources).
10. file.o: warning: func()+0x5c: alternative modifies stack 10. file.o: warning: func()+0x5c: stack layout conflict in alternatives
This means that an alternative includes instructions that modify the This means that in the use of the alternative() or ALTERNATIVE()
stack. The problem is that there is only one ORC unwind table, this means macro, the code paths have conflicting modifications to the stack.
that the ORC unwind entries must be valid for each of the alternatives. The problem is that there is only one ORC unwind table, which means
The easiest way to enforce this is to ensure alternatives do not contain that the ORC unwind entries must be consistent for all possible
any ORC entries, which in turn implies the above constraint. instruction boundaries regardless of which code has been patched.
This limitation can be overcome by massaging the alternatives with
NOPs to shift the stack changes around so they no longer conflict.
11. file.o: warning: unannotated intra-function call 11. file.o: warning: unannotated intra-function call
......
tools/objtool/Makefile
View file @ a56ff24e
...@@ -27,6 +27,7 @@ all: $(OBJTOOL) ...@@ -27,6 +27,7 @@ all: $(OBJTOOL)
INCLUDES := -I$(srctree)/tools/include \ INCLUDES := -I$(srctree)/tools/include \
-I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \ -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
-I$(srctree)/tools/arch/$(SRCARCH)/include \ -I$(srctree)/tools/arch/$(SRCARCH)/include \
-I$(srctree)/tools/objtool/include \
-I$(srctree)/tools/objtool/arch/$(SRCARCH)/include -I$(srctree)/tools/objtool/arch/$(SRCARCH)/include
WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed -Wno-nested-externs
CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS) CFLAGS := -Werror $(WARNINGS) $(KBUILD_HOSTCFLAGS) -g $(INCLUDES) $(LIBELF_FLAGS)
...@@ -46,10 +47,6 @@ ifeq ($(SRCARCH),x86) ...@@ -46,10 +47,6 @@ ifeq ($(SRCARCH),x86)
SUBCMD_ORC := y SUBCMD_ORC := y
endif endif
ifeq ($(SUBCMD_ORC),y)
CFLAGS += -DINSN_USE_ORC
endif
export SUBCMD_CHECK SUBCMD_ORC export SUBCMD_CHECK SUBCMD_ORC
export srctree OUTPUT CFLAGS SRCARCH AWK export srctree OUTPUT CFLAGS SRCARCH AWK
include $(srctree)/tools/build/Makefile.include include $(srctree)/tools/build/Makefile.include
......
tools/objtool/arch/x86/decode.c
View file @ a56ff24e
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
#include "../../../arch/x86/lib/inat.c" #include "../../../arch/x86/lib/inat.c"
#include "../../../arch/x86/lib/insn.c" #include "../../../arch/x86/lib/insn.c"
#include "../../check.h"
#include "../../elf.h"
#include "../../arch.h"
#include "../../warn.h"
#include <asm/orc_types.h> #include <asm/orc_types.h>
#include <objtool/check.h>
#include <objtool/elf.h>
#include <objtool/arch.h>
#include <objtool/warn.h>
static unsigned char op_to_cfi_reg[][2] = { static unsigned char op_to_cfi_reg[][2] = {
{CFI_AX, CFI_R8}, {CFI_AX, CFI_R8},
...@@ -222,15 +222,38 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec, ...@@ -222,15 +222,38 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec,
break; break;
case 0x89: case 0x89:
if (rex_w && !rex_r && modrm_mod == 3 && modrm_reg == 4) { if (rex_w && !rex_r && modrm_reg == 4) {
/* mov %rsp, reg */ if (modrm_mod == 3) {
ADD_OP(op) { /* mov %rsp, reg */
op->src.type = OP_SRC_REG; ADD_OP(op) {
op->src.reg = CFI_SP; op->src.type = OP_SRC_REG;
op->dest.type = OP_DEST_REG; op->src.reg = CFI_SP;
op->dest.reg = op_to_cfi_reg[modrm_rm][rex_b]; op->dest.type = OP_DEST_REG;
op->dest.reg = op_to_cfi_reg[modrm_rm][rex_b];
}
break;
} else {
/* skip nontrivial SIB */
if (modrm_rm == 4 && !(sib == 0x24 && rex_b == rex_x))
break;
/* skip RIP relative displacement */
if (modrm_rm == 5 && modrm_mod == 0)
break;
/* mov %rsp, disp(%reg) */
ADD_OP(op) {
op->src.type = OP_SRC_REG;
op->src.reg = CFI_SP;
op->dest.type = OP_DEST_REG_INDIRECT;
op->dest.reg = op_to_cfi_reg[modrm_rm][rex_b];
op->dest.offset = insn.displacement.value;
}
break;
} }
break; break;
} }
...@@ -259,8 +282,10 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec, ...@@ -259,8 +282,10 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec,
op->dest.reg = CFI_BP; op->dest.reg = CFI_BP;
op->dest.offset = insn.displacement.value; op->dest.offset = insn.displacement.value;
} }
break;
}
} else if (rex_w && !rex_b && modrm_rm == 4 && sib == 0x24) { if (rex_w && !rex_b && modrm_rm == 4 && sib == 0x24) {
/* mov reg, disp(%rsp) */ /* mov reg, disp(%rsp) */
ADD_OP(op) { ADD_OP(op) {
...@@ -270,6 +295,7 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec, ...@@ -270,6 +295,7 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec,
op->dest.reg = CFI_SP; op->dest.reg = CFI_SP;
op->dest.offset = insn.displacement.value; op->dest.offset = insn.displacement.value;
} }
break;
} }
break; break;
...@@ -563,8 +589,8 @@ void arch_initial_func_cfi_state(struct cfi_init_state *state) ...@@ -563,8 +589,8 @@ void arch_initial_func_cfi_state(struct cfi_init_state *state)
state->cfa.offset = 8; state->cfa.offset = 8;
/* initial RA (return address) */ /* initial RA (return address) */
state->regs[16].base = CFI_CFA; state->regs[CFI_RA].base = CFI_CFA;
state->regs[16].offset = -8; state->regs[CFI_RA].offset = -8;
} }
const char *arch_nop_insn(int len) const char *arch_nop_insn(int len)
......
tools/objtool/arch/x86/include/arch/endianness.h 0 → 100644
View file @ a56ff24e
/* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef _ARCH_ENDIANNESS_H
#define _ARCH_ENDIANNESS_H
#include <endian.h>
#define __TARGET_BYTE_ORDER __LITTLE_ENDIAN
#endif /* _ARCH_ENDIANNESS_H */
tools/objtool/arch/x86/special.c
View file @ a56ff24e
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <string.h> #include <string.h>
#include "../../special.h" #include <objtool/special.h>
#include "../../builtin.h" #include <objtool/builtin.h>
#define X86_FEATURE_POPCNT (4 * 32 + 23) #define X86_FEATURE_POPCNT (4 * 32 + 23)
#define X86_FEATURE_SMAP (9 * 32 + 20) #define X86_FEATURE_SMAP (9 * 32 + 20)
...@@ -48,7 +48,7 @@ bool arch_support_alt_relocation(struct special_alt *special_alt, ...@@ -48,7 +48,7 @@ bool arch_support_alt_relocation(struct special_alt *special_alt,
* replacement group. * replacement group.
*/ */
return insn->offset == special_alt->new_off && return insn->offset == special_alt->new_off &&
(insn->type == INSN_CALL || is_static_jump(insn)); (insn->type == INSN_CALL || is_jump(insn));
} }
/* /*
......
tools/objtool/builtin-check.c
View file @ a56ff24e
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#include <subcmd/parse-options.h> #include <subcmd/parse-options.h>
#include <string.h> #include <string.h>
#include "builtin.h" #include <objtool/builtin.h>
#include "objtool.h" #include <objtool/objtool.h>
bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, validate_dup, vmlinux; bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats, validate_dup, vmlinux;
......
tools/objtool/builtin-orc.c
View file @ a56ff24e
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
*/ */
#include <string.h> #include <string.h>
#include "builtin.h" #include <objtool/builtin.h>
#include "objtool.h" #include <objtool/objtool.h>
static const char *orc_usage[] = { static const char *orc_usage[] = {
"objtool orc generate [<options>] file.o", "objtool orc generate [<options>] file.o",
...@@ -51,11 +51,7 @@ int cmd_orc(int argc, const char **argv) ...@@ -51,11 +51,7 @@ int cmd_orc(int argc, const char **argv)
if (list_empty(&file->insn_list)) if (list_empty(&file->insn_list))
return 0; return 0;
ret = create_orc(file); ret = orc_create(file);
if (ret)
return ret;
ret = create_orc_sections(file);
if (ret) if (ret)
return ret; return ret;
......
tools/objtool/check.c
View file @ a56ff24e
This diff is collapsed.
tools/objtool/elf.c
View file @ a56ff24e
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include "builtin.h" #include <objtool/builtin.h>
#include "elf.h" #include <objtool/elf.h>
#include "warn.h" #include <objtool/warn.h>
#define MAX_NAME_LEN 128 #define MAX_NAME_LEN 128
...@@ -814,25 +814,27 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr) ...@@ -814,25 +814,27 @@ static int elf_rebuild_rel_reloc_section(struct section *sec, int nr)
{ {
struct reloc *reloc; struct reloc *reloc;
int idx = 0, size; int idx = 0, size;
GElf_Rel *relocs; void *buf;
/* Allocate a buffer for relocations */ /* Allocate a buffer for relocations */
size = nr * sizeof(*relocs); size = nr * sizeof(GElf_Rel);
relocs = malloc(size); buf = malloc(size);
if (!relocs) { if (!buf) {
perror("malloc"); perror("malloc");
return -1; return -1;
} }
sec->data->d_buf = relocs; sec->data->d_buf = buf;
sec->data->d_size = size; sec->data->d_size = size;
sec->data->d_type = ELF_T_REL;
sec->sh.sh_size = size; sec->sh.sh_size = size;
idx = 0; idx = 0;
list_for_each_entry(reloc, &sec->reloc_list, list) { list_for_each_entry(reloc, &sec->reloc_list, list) {
relocs[idx].r_offset = reloc->offset; reloc->rel.r_offset = reloc->offset;
relocs[idx].r_info = GELF_R_INFO(reloc->sym->idx, reloc->type); reloc->rel.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
gelf_update_rel(sec->data, idx, &reloc->rel);
idx++; idx++;
} }
...@@ -843,26 +845,28 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr) ...@@ -843,26 +845,28 @@ static int elf_rebuild_rela_reloc_section(struct section *sec, int nr)
{ {
struct reloc *reloc; struct reloc *reloc;
int idx = 0, size; int idx = 0, size;
GElf_Rela *relocs; void *buf;
/* Allocate a buffer for relocations with addends */ /* Allocate a buffer for relocations with addends */
size = nr * sizeof(*relocs); size = nr * sizeof(GElf_Rela);
relocs = malloc(size); buf = malloc(size);
if (!relocs) { if (!buf) {
perror("malloc"); perror("malloc");
return -1; return -1;
} }
sec->data->d_buf = relocs; sec->data->d_buf = buf;
sec->data->d_size = size; sec->data->d_size = size;
sec->data->d_type = ELF_T_RELA;
sec->sh.sh_size = size; sec->sh.sh_size = size;
idx = 0; idx = 0;
list_for_each_entry(reloc, &sec->reloc_list, list) { list_for_each_entry(reloc, &sec->reloc_list, list) {
relocs[idx].r_offset = reloc->offset; reloc->rela.r_offset = reloc->offset;
relocs[idx].r_addend = reloc->addend; reloc->rela.r_addend = reloc->addend;
relocs[idx].r_info = GELF_R_INFO(reloc->sym->idx, reloc->type); reloc->rela.r_info = GELF_R_INFO(reloc->sym->idx, reloc->type);
gelf_update_rela(sec->data, idx, &reloc->rela);
idx++; idx++;
} }
......
tools/objtool/arch.h → tools/objtool/include/objtool/arch.h
View file @ a56ff24e
...@@ -8,12 +8,8 @@ ...@@ -8,12 +8,8 @@
#include <stdbool.h> #include <stdbool.h>
#include <linux/list.h> #include <linux/list.h>
#include "objtool.h" #include <objtool/objtool.h>
#include "cfi.h" #include <objtool/cfi.h>
#ifdef INSN_USE_ORC
#include <asm/orc_types.h>
#endif
enum insn_type { enum insn_type {
INSN_JUMP_CONDITIONAL, INSN_JUMP_CONDITIONAL,
......
tools/objtool/cfi.h → tools/objtool/include/objtool/cfi.h
View file @ a56ff24e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#ifndef _OBJTOOL_CFI_H #ifndef _OBJTOOL_CFI_H
#define _OBJTOOL_CFI_H #define _OBJTOOL_CFI_H
#include "cfi_regs.h" #include <arch/cfi_regs.h>
#define CFI_UNDEFINED -1 #define CFI_UNDEFINED -1
#define CFI_CFA -2 #define CFI_CFA -2
......
tools/objtool/check.h → tools/objtool/include/objtool/check.h
View file @ a56ff24e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#define _CHECK_H #define _CHECK_H
#include <stdbool.h> #include <stdbool.h>
#include "cfi.h" #include <objtool/cfi.h>
#include "arch.h" #include <objtool/arch.h>
struct insn_state { struct insn_state {
struct cfi_state cfi; struct cfi_state cfi;
...@@ -19,6 +19,23 @@ struct insn_state { ...@@ -19,6 +19,23 @@ struct insn_state {
s8 instr; s8 instr;
}; };
struct alt_group {
/*
* Pointer from a replacement group to the original group. NULL if it
* *is* the original group.
*/
struct alt_group *orig_group;
/* First and last instructions in the group */
struct instruction *first_insn, *last_insn;
/*
* Byte-offset-addressed len-sized array of pointers to CFI structs.
* This is shared with the other alt_groups in the same alternative.
*/
struct cfi_state **cfi;
};
struct instruction { struct instruction {
struct list_head list; struct list_head list;
struct hlist_node hash; struct hlist_node hash;
...@@ -33,8 +50,7 @@ struct instruction { ...@@ -33,8 +50,7 @@ struct instruction {
bool retpoline_safe; bool retpoline_safe;
s8 instr; s8 instr;
u8 visited; u8 visited;
u8 ret_offset; struct alt_group *alt_group;
int alt_group;
struct symbol *call_dest; struct symbol *call_dest;
struct instruction *jump_dest; struct instruction *jump_dest;
struct instruction *first_jump_src; struct instruction *first_jump_src;
...@@ -43,9 +59,6 @@ struct instruction { ...@@ -43,9 +59,6 @@ struct instruction {
struct symbol *func; struct symbol *func;
struct list_head stack_ops; struct list_head stack_ops;
struct cfi_state cfi; struct cfi_state cfi;
#ifdef INSN_USE_ORC
struct orc_entry orc;
#endif
}; };
static inline bool is_static_jump(struct instruction *insn) static inline bool is_static_jump(struct instruction *insn)
...@@ -54,6 +67,17 @@ static inline bool is_static_jump(struct instruction *insn) ...@@ -54,6 +67,17 @@ static inline bool is_static_jump(struct instruction *insn)
insn->type == INSN_JUMP_UNCONDITIONAL; insn->type == INSN_JUMP_UNCONDITIONAL;
} }
static inline bool is_dynamic_jump(struct instruction *insn)
{
return insn->type == INSN_JUMP_DYNAMIC ||
insn->type == INSN_JUMP_DYNAMIC_CONDITIONAL;
}
static inline bool is_jump(struct instruction *insn)
{
return is_static_jump(insn) || is_dynamic_jump(insn);
}
struct instruction *find_insn(struct objtool_file *file, struct instruction *find_insn(struct objtool_file *file,
struct section *sec, unsigned long offset); struct section *sec, unsigned long offset);
......
tools/objtool/include/objtool/endianness.h 0 → 100644
View file @ a56ff24e
/* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef _OBJTOOL_ENDIANNESS_H
#define _OBJTOOL_ENDIANNESS_H
#include <arch/endianness.h>
#include <linux/kernel.h>
#include <endian.h>
#ifndef __TARGET_BYTE_ORDER
#error undefined arch __TARGET_BYTE_ORDER
#endif
#if __BYTE_ORDER != __TARGET_BYTE_ORDER
#define __NEED_BSWAP 1
#else
#define __NEED_BSWAP 0
#endif
/*
* Does a byte swap if target endianness doesn't match the host, i.e. cross
* compilation for little endian on big endian and vice versa.
* To be used for multi-byte values conversion, which are read from / about
* to be written to a target native endianness ELF file.
*/
#define bswap_if_needed(val) \
({ \
__typeof__(val) __ret; \
switch (sizeof(val)) { \
case 8: __ret = __NEED_BSWAP ? bswap_64(val) : (val); break; \
case 4: __ret = __NEED_BSWAP ? bswap_32(val) : (val); break; \
case 2: __ret = __NEED_BSWAP ? bswap_16(val) : (val); break; \
default: \
BUILD_BUG(); break; \
} \
__ret; \
})
#endif /* _OBJTOOL_ENDIANNESS_H */
tools/objtool/objtool.h → tools/objtool/include/objtool/objtool.h
View file @ a56ff24e
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/hashtable.h> #include <linux/hashtable.h>
#include "elf.h" #include <objtool/elf.h>
#define __weak __attribute__((weak)) #define __weak __attribute__((weak))
...@@ -26,7 +26,6 @@ struct objtool_file *objtool_open_read(const char *_objname); ...@@ -26,7 +26,6 @@ struct objtool_file *objtool_open_read(const char *_objname);
int check(struct objtool_file *file); int check(struct objtool_file *file);
int orc_dump(const char *objname); int orc_dump(const char *objname);
int create_orc(struct objtool_file *file); int orc_create(struct objtool_file *file);
int create_orc_sections(struct objtool_file *file);
#endif /* _OBJTOOL_H */ #endif /* _OBJTOOL_H */
tools/objtool/special.h → tools/objtool/include/objtool/special.h
View file @ a56ff24e
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#define _SPECIAL_H #define _SPECIAL_H
#include <stdbool.h> #include <stdbool.h>
#include "check.h" #include <objtool/check.h>
#include "elf.h" #include <objtool/elf.h>
#define C_JUMP_TABLE_SECTION ".rodata..c_jump_table" #define C_JUMP_TABLE_SECTION ".rodata..c_jump_table"
......
tools/objtool/warn.h → tools/objtool/include/objtool/warn.h
View file @ a56ff24e
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include "elf.h" #include <objtool/elf.h>
extern const char *objname; extern const char *objname;
......
tools/objtool/objtool.c
View file @ a56ff24e
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#include <subcmd/pager.h> #include <subcmd/pager.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include "builtin.h" #include <objtool/builtin.h>
#include "objtool.h" #include <objtool/objtool.h>
#include "warn.h" #include <objtool/warn.h>
struct cmd_struct { struct cmd_struct {
const char *name; const char *name;
......
tools/objtool/orc_dump.c
View file @ a56ff24e
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
#include <unistd.h> #include <unistd.h>
#include <linux/objtool.h> #include <linux/objtool.h>
#include <asm/orc_types.h> #include <asm/orc_types.h>
#include "objtool.h" #include <objtool/objtool.h>
#include "warn.h" #include <objtool/warn.h>
#include <objtool/endianness.h>
static const char *reg_name(unsigned int reg) static const char *reg_name(unsigned int reg)
{ {
...@@ -54,7 +55,7 @@ static void print_reg(unsigned int reg, int offset) ...@@ -54,7 +55,7 @@ static void print_reg(unsigned int reg, int offset)
if (reg == ORC_REG_BP_INDIRECT) if (reg == ORC_REG_BP_INDIRECT)
printf("(bp%+d)", offset); printf("(bp%+d)", offset);
else if (reg == ORC_REG_SP_INDIRECT) else if (reg == ORC_REG_SP_INDIRECT)
printf("(sp%+d)", offset); printf("(sp)%+d", offset);
else if (reg == ORC_REG_UNDEFINED) else if (reg == ORC_REG_UNDEFINED)
printf("(und)"); printf("(und)");
else else
...@@ -197,11 +198,11 @@ int orc_dump(const char *_objname) ...@@ -197,11 +198,11 @@ int orc_dump(const char *_objname)
printf(" sp:"); printf(" sp:");
print_reg(orc[i].sp_reg, orc[i].sp_offset); print_reg(orc[i].sp_reg, bswap_if_needed(orc[i].sp_offset));
printf(" bp:"); printf(" bp:");
print_reg(orc[i].bp_reg, orc[i].bp_offset); print_reg(orc[i].bp_reg, bswap_if_needed(orc[i].bp_offset));
printf(" type:%s end:%d\n", printf(" type:%s end:%d\n",
orc_type_name(orc[i].type), orc[i].end); orc_type_name(orc[i].type), orc[i].end);
......
tools/objtool/orc_gen.c
View file @ a56ff24e
...@@ -9,93 +9,91 @@ ...@@ -9,93 +9,91 @@
#include <linux/objtool.h> #include <linux/objtool.h>
#include <asm/orc_types.h> #include <asm/orc_types.h>
#include "check.h" #include <objtool/check.h>
#include "warn.h" #include <objtool/warn.h>
#include <objtool/endianness.h>
int create_orc(struct objtool_file *file) static int init_orc_entry(struct orc_entry *orc, struct cfi_state *cfi)
{ {
struct instruction *insn; struct instruction *insn = container_of(cfi, struct instruction, cfi);
struct cfi_reg *bp = &cfi->regs[CFI_BP];
for_each_insn(file, insn) { memset(orc, 0, sizeof(*orc));
struct orc_entry *orc = &insn->orc;
struct cfi_reg *cfa = &insn->cfi.cfa;
struct cfi_reg *bp = &insn->cfi.regs[CFI_BP];
if (!insn->sec->text) orc->end = cfi->end;
continue;
orc->end = insn->cfi.end;
if (cfa->base == CFI_UNDEFINED) {
orc->sp_reg = ORC_REG_UNDEFINED;
continue;
}
switch (cfa->base) { if (cfi->cfa.base == CFI_UNDEFINED) {
case CFI_SP: orc->sp_reg = ORC_REG_UNDEFINED;
orc->sp_reg = ORC_REG_SP; return 0;
break; }
case CFI_SP_INDIRECT:
orc->sp_reg = ORC_REG_SP_INDIRECT;
break;
case CFI_BP:
orc->sp_reg = ORC_REG_BP;
break;
case CFI_BP_INDIRECT:
orc->sp_reg = ORC_REG_BP_INDIRECT;
break;
case CFI_R10:
orc->sp_reg = ORC_REG_R10;
break;
case CFI_R13:
orc->sp_reg = ORC_REG_R13;
break;
case CFI_DI:
orc->sp_reg = ORC_REG_DI;
break;
case CFI_DX:
orc->sp_reg = ORC_REG_DX;
break;
default:
WARN_FUNC("unknown CFA base reg %d",
insn->sec, insn->offset, cfa->base);
return -1;
}
switch(bp->base) { switch (cfi->cfa.base) {
case CFI_UNDEFINED: case CFI_SP:
orc->bp_reg = ORC_REG_UNDEFINED; orc->sp_reg = ORC_REG_SP;
break; break;
case CFI_CFA: case CFI_SP_INDIRECT:
orc->bp_reg = ORC_REG_PREV_SP; orc->sp_reg = ORC_REG_SP_INDIRECT;
break; break;
case CFI_BP: case CFI_BP:
orc->bp_reg = ORC_REG_BP; orc->sp_reg = ORC_REG_BP;
break; break;
default: case CFI_BP_INDIRECT:
WARN_FUNC("unknown BP base reg %d", orc->sp_reg = ORC_REG_BP_INDIRECT;
insn->sec, insn->offset, bp->base); break;
return -1; case CFI_R10:
} orc->sp_reg = ORC_REG_R10;
break;
case CFI_R13:
orc->sp_reg = ORC_REG_R13;
break;
case CFI_DI:
orc->sp_reg = ORC_REG_DI;
break;
case CFI_DX:
orc->sp_reg = ORC_REG_DX;
break;
default:
WARN_FUNC("unknown CFA base reg %d",
insn->sec, insn->offset, cfi->cfa.base);
return -1;
}
orc->sp_offset = cfa->offset; switch (bp->base) {
orc->bp_offset = bp->offset; case CFI_UNDEFINED:
orc->type = insn->cfi.type; orc->bp_reg = ORC_REG_UNDEFINED;
break;
case CFI_CFA:
orc->bp_reg = ORC_REG_PREV_SP;
break;
case CFI_BP:
orc->bp_reg = ORC_REG_BP;
break;
default:
WARN_FUNC("unknown BP base reg %d",
insn->sec, insn->offset, bp->base);
return -1;
} }
orc->sp_offset = cfi->cfa.offset;
orc->bp_offset = bp->offset;
orc->type = cfi->type;
return 0; return 0;
} }
static int create_orc_entry(struct elf *elf, struct section *u_sec, struct section *ip_relocsec, static int write_orc_entry(struct elf *elf, struct section *orc_sec,
unsigned int idx, struct section *insn_sec, struct section *ip_rsec, unsigned int idx,
unsigned long insn_off, struct orc_entry *o) struct section *insn_sec, unsigned long insn_off,
struct orc_entry *o)
{ {
struct orc_entry *orc; struct orc_entry *orc;
struct reloc *reloc; struct reloc *reloc;
/* populate ORC data */ /* populate ORC data */
orc = (struct orc_entry *)u_sec->data->d_buf + idx; orc = (struct orc_entry *)orc_sec->data->d_buf + idx;
memcpy(orc, o, sizeof(*orc)); memcpy(orc, o, sizeof(*orc));
orc->sp_offset = bswap_if_needed(orc->sp_offset);
orc->bp_offset = bswap_if_needed(orc->bp_offset);
/* populate reloc for ip */ /* populate reloc for ip */
reloc = malloc(sizeof(*reloc)); reloc = malloc(sizeof(*reloc));
...@@ -114,102 +112,149 @@ static int create_orc_entry(struct elf *elf, struct section *u_sec, struct secti ...@@ -114,102 +112,149 @@ static int create_orc_entry(struct elf *elf, struct section *u_sec, struct secti
reloc->type = R_X86_64_PC32; reloc->type = R_X86_64_PC32;
reloc->offset = idx * sizeof(int); reloc->offset = idx * sizeof(int);
reloc->sec = ip_relocsec; reloc->sec = ip_rsec;
elf_add_reloc(elf, reloc); elf_add_reloc(elf, reloc);
return 0; return 0;
} }
int create_orc_sections(struct objtool_file *file) struct orc_list_entry {
{ struct list_head list;
struct instruction *insn, *prev_insn; struct orc_entry orc;
struct section *sec, *u_sec, *ip_relocsec; struct section *insn_sec;
unsigned int idx; unsigned long insn_off;
};
struct orc_entry empty = { static int orc_list_add(struct list_head *orc_list, struct orc_entry *orc,
.sp_reg = ORC_REG_UNDEFINED, struct section *sec, unsigned long offset)
.bp_reg = ORC_REG_UNDEFINED, {
.type = UNWIND_HINT_TYPE_CALL, struct orc_list_entry *entry = malloc(sizeof(*entry));
};
sec = find_section_by_name(file->elf, ".orc_unwind"); if (!entry) {
if (sec) { WARN("malloc failed");
WARN("file already has .orc_unwind section, skipping");
return -1; return -1;
} }
/* count the number of needed orcs */ entry->orc = *orc;
idx = 0; entry->insn_sec = sec;
for_each_sec(file, sec) { entry->insn_off = offset;
if (!sec->text)
continue;
prev_insn = NULL;
sec_for_each_insn(file, sec, insn) {
if (!prev_insn ||
memcmp(&insn->orc, &prev_insn->orc,
sizeof(struct orc_entry))) {
idx++;
}
prev_insn = insn;
}
/* section terminator */
if (prev_insn)
idx++;
}
if (!idx)
return -1;
list_add_tail(&entry->list, orc_list);
return 0;
}
/* create .orc_unwind_ip and .rela.orc_unwind_ip sections */ static unsigned long alt_group_len(struct alt_group *alt_group)
sec = elf_create_section(file->elf, ".orc_unwind_ip", 0, sizeof(int), idx); {
if (!sec) return alt_group->last_insn->offset +
return -1; alt_group->last_insn->len -
alt_group->first_insn->offset;
}
ip_relocsec = elf_create_reloc_section(file->elf, sec, SHT_RELA); int orc_create(struct objtool_file *file)
if (!ip_relocsec) {
return -1; struct section *sec, *ip_rsec, *orc_sec;
unsigned int nr = 0, idx = 0;
struct orc_list_entry *entry;
struct list_head orc_list;
/* create .orc_unwind section */ struct orc_entry null = {
u_sec = elf_create_section(file->elf, ".orc_unwind", 0, .sp_reg = ORC_REG_UNDEFINED,
sizeof(struct orc_entry), idx); .bp_reg = ORC_REG_UNDEFINED,
.type = UNWIND_HINT_TYPE_CALL,
};
/* populate sections */ /* Build a deduplicated list of ORC entries: */
idx = 0; INIT_LIST_HEAD(&orc_list);
for_each_sec(file, sec) { for_each_sec(file, sec) {
struct orc_entry orc, prev_orc = {0};
struct instruction *insn;
bool empty = true;
if (!sec->text) if (!sec->text)
continue; continue;
prev_insn = NULL;
sec_for_each_insn(file, sec, insn) { sec_for_each_insn(file, sec, insn) {
if (!prev_insn || memcmp(&insn->orc, &prev_insn->orc, struct alt_group *alt_group = insn->alt_group;
sizeof(struct orc_entry))) { int i;
if (create_orc_entry(file->elf, u_sec, ip_relocsec, idx, if (!alt_group) {
insn->sec, insn->offset, if (init_orc_entry(&orc, &insn->cfi))
&insn->orc))
return -1; return -1;
if (!memcmp(&prev_orc, &orc, sizeof(orc)))
continue;
if (orc_list_add(&orc_list, &orc, sec,
insn->offset))
return -1;
nr++;
prev_orc = orc;
empty = false;
continue;
}
idx++; /*
* Alternatives can have different stack layout
* possibilities (but they shouldn't conflict).
* Instead of traversing the instructions, use the
* alt_group's flattened byte-offset-addressed CFI
* array.
*/
for (i = 0; i < alt_group_len(alt_group); i++) {
struct cfi_state *cfi = alt_group->cfi[i];
if (!cfi)
continue;
if (init_orc_entry(&orc, cfi))
return -1;
if (!memcmp(&prev_orc, &orc, sizeof(orc)))
continue;
if (orc_list_add(&orc_list, &orc, insn->sec,
insn->offset + i))
return -1;
nr++;
prev_orc = orc;
empty = false;
} }
prev_insn = insn;
}
/* section terminator */ /* Skip to the end of the alt_group */
if (prev_insn) { insn = alt_group->last_insn;
if (create_orc_entry(file->elf, u_sec, ip_relocsec, idx, }
prev_insn->sec,
prev_insn->offset + prev_insn->len,
&empty))
return -1;
idx++; /* Add a section terminator */
if (!empty) {
orc_list_add(&orc_list, &null, sec, sec->len);
nr++;
} }
} }
if (!nr)
return 0;
/* Create .orc_unwind, .orc_unwind_ip and .rela.orc_unwind_ip sections: */
sec = find_section_by_name(file->elf, ".orc_unwind");
if (sec) {
WARN("file already has .orc_unwind section, skipping");
return -1;
}
orc_sec = elf_create_section(file->elf, ".orc_unwind", 0,
sizeof(struct orc_entry), nr);
if (!orc_sec)
return -1;
sec = elf_create_section(file->elf, ".orc_unwind_ip", 0, sizeof(int), nr);
if (!sec)
return -1;
ip_rsec = elf_create_reloc_section(file->elf, sec, SHT_RELA);
if (!ip_rsec)
return -1;
/* Write ORC entries to sections: */
list_for_each_entry(entry, &orc_list, list) {
if (write_orc_entry(file->elf, orc_sec, ip_rsec, idx++,
entry->insn_sec, entry->insn_off,
&entry->orc))
return -1;
}
if (elf_rebuild_reloc_section(file->elf, ip_relocsec)) if (elf_rebuild_reloc_section(file->elf, ip_rsec))
return -1; return -1;
return 0; return 0;
......
tools/objtool/special.c
View file @ a56ff24e
...@@ -11,10 +11,11 @@ ...@@ -11,10 +11,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "builtin.h" #include <arch/special.h>
#include "special.h" #include <objtool/builtin.h>
#include "warn.h" #include <objtool/special.h>
#include "arch_special.h" #include <objtool/warn.h>
#include <objtool/endianness.h>
struct special_entry { struct special_entry {
const char *sec; const char *sec;
...@@ -77,8 +78,9 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry, ...@@ -77,8 +78,9 @@ static int get_alt_entry(struct elf *elf, struct special_entry *entry,
if (entry->feature) { if (entry->feature) {
unsigned short feature; unsigned short feature;
feature = *(unsigned short *)(sec->data->d_buf + offset + feature = bswap_if_needed(*(unsigned short *)(sec->data->d_buf +
entry->feature); offset +
entry->feature));
arch_handle_alternative(feature, alt); arch_handle_alternative(feature, alt);
} }
......
tools/objtool/weak.c
View file @ a56ff24e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <errno.h> #include <errno.h>
#include "objtool.h" #include <objtool/objtool.h>
#define UNSUPPORTED(name) \ #define UNSUPPORTED(name) \
({ \ ({ \
...@@ -25,12 +25,7 @@ int __weak orc_dump(const char *_objname) ...@@ -25,12 +25,7 @@ int __weak orc_dump(const char *_objname)
UNSUPPORTED("orc"); UNSUPPORTED("orc");
} }
int __weak create_orc(struct objtool_file *file) int __weak orc_create(struct objtool_file *file)
{
UNSUPPORTED("orc");
}
int __weak create_orc_sections(struct objtool_file *file)
{ {
UNSUPPORTED("orc"); UNSUPPORTED("orc");
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7