Skip to content

Commit 9d7e694

Browse files
jpoimboeTenSeventy7
authored andcommitted
objtool: Support Clang non-section symbols in ORC generation
commit e81e0724432542af8d8c702c31e9d82f57b1ff31 upstream. When compiling the kernel with AS=clang, objtool produces a lot of warnings: warning: objtool: missing symbol for section .text warning: objtool: missing symbol for section .init.text warning: objtool: missing symbol for section .ref.text It then fails to generate the ORC table. The problem is that objtool assumes text section symbols always exist. But the Clang assembler is aggressive about removing them. When generating relocations for the ORC table, objtool always tries to reference instructions by their section symbol offset. If the section symbol doesn't exist, it bails. Do a fallback: when a section symbol isn't available, reference a function symbol instead. Reported-by: Dmitry Golovin <[email protected]> Signed-off-by: Josh Poimboeuf <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Tested-by: Nathan Chancellor <[email protected]> Reviewed-by: Miroslav Benes <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Link: ClangBuiltLinux/linux#669 Link: https://lkml.kernel.org/r/9a9cae7fcf628843aabe5a086b1a3c5bf50f42e8.1585761021.git.jpoimboe@redhat.com Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: John Vincent <[email protected]>
1 parent 051ff2f commit 9d7e694

File tree

1 file changed

+26
-7
lines changed

1 file changed

+26
-7
lines changed

tools/objtool/orc_gen.c

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ static int create_orc_entry(struct section *u_sec, struct section *ip_relasec,
9898
struct orc_entry *orc;
9999
struct rela *rela;
100100

101-
if (!insn_sec->sym) {
102-
WARN("missing symbol for section %s", insn_sec->name);
103-
return -1;
104-
}
105-
106101
/* populate ORC data */
107102
orc = (struct orc_entry *)u_sec->data->d_buf + idx;
108103
memcpy(orc, o, sizeof(*orc));
@@ -115,8 +110,32 @@ static int create_orc_entry(struct section *u_sec, struct section *ip_relasec,
115110
}
116111
memset(rela, 0, sizeof(*rela));
117112

118-
rela->sym = insn_sec->sym;
119-
rela->addend = insn_off;
113+
if (insn_sec->sym) {
114+
rela->sym = insn_sec->sym;
115+
rela->addend = insn_off;
116+
} else {
117+
/*
118+
* The Clang assembler doesn't produce section symbols, so we
119+
* have to reference the function symbol instead:
120+
*/
121+
rela->sym = find_symbol_containing(insn_sec, insn_off);
122+
if (!rela->sym) {
123+
/*
124+
* Hack alert. This happens when we need to reference
125+
* the NOP pad insn immediately after the function.
126+
*/
127+
rela->sym = find_symbol_containing(insn_sec,
128+
insn_off - 1);
129+
}
130+
if (!rela->sym) {
131+
WARN("missing symbol for insn at offset 0x%lx\n",
132+
insn_off);
133+
return -1;
134+
}
135+
136+
rela->addend = insn_off - rela->sym->offset;
137+
}
138+
120139
rela->type = R_X86_64_PC32;
121140
rela->offset = idx * sizeof(int);
122141

0 commit comments

Comments
 (0)