mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-27 13:05:03 +08:00
7786032e52
Currently objtool headers are being included either by their base name or included via ../ from a parent directory. In case of a base name usage: #include "warn.h" #include "arch_elf.h" it does not make it apparent from which directory the file comes from. To make it slightly better, and actually to avoid name clashes some arch specific files have "arch_" suffix. And files from an arch folder have to revert to including via ../ e.g: #include "../../elf.h" With additional architectures support and the code base growth there is a need for clearer headers naming scheme for multiple reasons: 1. to make it instantly obvious where these files come from (objtool itself / objtool arch|generic folders / some other external files), 2. to avoid name clashes of objtool arch specific headers, potential obtool arch generic headers and the system header files (there is /usr/include/elf.h already), 3. to avoid ../ includes and improve code readability. 4. to give a warm fuzzy feeling to developers who are mostly kernel developers and are accustomed to linux kernel headers arranging scheme. Doesn't this make it instantly obvious where are these files come from? #include <objtool/warn.h> #include <arch/elf.h> And doesn't it look nicer to avoid ugly ../ includes? Which also guarantees this is elf.h from the objtool and not /usr/include/elf.h. #include <objtool/elf.h> This patch defines and implements new objtool headers arranging scheme. Which is: - all generic headers go to include/objtool (similar to include/linux) - all arch headers go to arch/$(SRCARCH)/include/arch (to get arch prefix). This is similar to linux arch specific "asm/*" headers but we are not abusing "asm" name and calling it what it is. This also helps to prevent name clashes (arch is not used in system headers or kernel exports). To bring objtool to this state the following things are done: 1. current top level tools/objtool/ headers are moved into include/objtool/ subdirectory, 2. arch specific headers, currently only arch/x86/include/ are moved into arch/x86/include/arch/ and were stripped of "arch_" suffix, 3. new -I$(srctree)/tools/objtool/include include path to make includes like <objtool/warn.h> possible, 4. rewriting file includes, 5. make git not to ignore include/objtool/ subdirectory. Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
220 lines
4.5 KiB
C
220 lines
4.5 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2017 Josh Poimboeuf <jpoimboe@redhat.com>
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <linux/objtool.h>
|
|
#include <asm/orc_types.h>
|
|
|
|
#include <objtool/check.h>
|
|
#include <objtool/warn.h>
|
|
#include <objtool/endianness.h>
|
|
|
|
int create_orc(struct objtool_file *file)
|
|
{
|
|
struct instruction *insn;
|
|
|
|
for_each_insn(file, insn) {
|
|
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)
|
|
continue;
|
|
|
|
orc->end = insn->cfi.end;
|
|
|
|
if (cfa->base == CFI_UNDEFINED) {
|
|
orc->sp_reg = ORC_REG_UNDEFINED;
|
|
continue;
|
|
}
|
|
|
|
switch (cfa->base) {
|
|
case CFI_SP:
|
|
orc->sp_reg = ORC_REG_SP;
|
|
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) {
|
|
case CFI_UNDEFINED:
|
|
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 = cfa->offset;
|
|
orc->bp_offset = bp->offset;
|
|
orc->type = insn->cfi.type;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int create_orc_entry(struct elf *elf, struct section *u_sec, struct section *ip_relocsec,
|
|
unsigned int idx, struct section *insn_sec,
|
|
unsigned long insn_off, struct orc_entry *o)
|
|
{
|
|
struct orc_entry *orc;
|
|
struct reloc *reloc;
|
|
|
|
/* populate ORC data */
|
|
orc = (struct orc_entry *)u_sec->data->d_buf + idx;
|
|
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 */
|
|
reloc = malloc(sizeof(*reloc));
|
|
if (!reloc) {
|
|
perror("malloc");
|
|
return -1;
|
|
}
|
|
memset(reloc, 0, sizeof(*reloc));
|
|
|
|
insn_to_reloc_sym_addend(insn_sec, insn_off, reloc);
|
|
if (!reloc->sym) {
|
|
WARN("missing symbol for insn at offset 0x%lx",
|
|
insn_off);
|
|
return -1;
|
|
}
|
|
|
|
reloc->type = R_X86_64_PC32;
|
|
reloc->offset = idx * sizeof(int);
|
|
reloc->sec = ip_relocsec;
|
|
|
|
elf_add_reloc(elf, reloc);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int create_orc_sections(struct objtool_file *file)
|
|
{
|
|
struct instruction *insn, *prev_insn;
|
|
struct section *sec, *u_sec, *ip_relocsec;
|
|
unsigned int idx;
|
|
|
|
struct orc_entry empty = {
|
|
.sp_reg = ORC_REG_UNDEFINED,
|
|
.bp_reg = ORC_REG_UNDEFINED,
|
|
.type = UNWIND_HINT_TYPE_CALL,
|
|
};
|
|
|
|
sec = find_section_by_name(file->elf, ".orc_unwind");
|
|
if (sec) {
|
|
WARN("file already has .orc_unwind section, skipping");
|
|
return -1;
|
|
}
|
|
|
|
/* count the number of needed orcs */
|
|
idx = 0;
|
|
for_each_sec(file, sec) {
|
|
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;
|
|
|
|
|
|
/* create .orc_unwind_ip and .rela.orc_unwind_ip sections */
|
|
sec = elf_create_section(file->elf, ".orc_unwind_ip", 0, sizeof(int), idx);
|
|
if (!sec)
|
|
return -1;
|
|
|
|
ip_relocsec = elf_create_reloc_section(file->elf, sec, SHT_RELA);
|
|
if (!ip_relocsec)
|
|
return -1;
|
|
|
|
/* create .orc_unwind section */
|
|
u_sec = elf_create_section(file->elf, ".orc_unwind", 0,
|
|
sizeof(struct orc_entry), idx);
|
|
|
|
/* populate sections */
|
|
idx = 0;
|
|
for_each_sec(file, sec) {
|
|
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))) {
|
|
|
|
if (create_orc_entry(file->elf, u_sec, ip_relocsec, idx,
|
|
insn->sec, insn->offset,
|
|
&insn->orc))
|
|
return -1;
|
|
|
|
idx++;
|
|
}
|
|
prev_insn = insn;
|
|
}
|
|
|
|
/* section terminator */
|
|
if (prev_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++;
|
|
}
|
|
}
|
|
|
|
if (elf_rebuild_reloc_section(file->elf, ip_relocsec))
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|