superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

objtool: Use section/symbol type helpers 

Commit 25eac74b6b ("objtool: Add section/symbol type helpers")
introduced several helper macros to improve code readability.

Update the remaining open-coded checks in check.c, disas.c, elf.c,
and klp-diff.c to use these new helpers.

Signed-off-by: Wentong Tian <tianwentong2000@gmail.com>
Link: https://patch.msgid.link/20260122144404.40602-1-tianwentong2000@gmail.com
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
master
Wentong Tian 2026-01-22 22:44:04 +08:00 committed by Josh Poimboeuf
parent 11439c4635
commit c19c854b30
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/objtool/check.c
View File

@ -4293,8 +4293,8 @@ static int validate_retpoline(struct objtool_file *file)
list_for_each_entry(insn, &file->retpoline_call_list, call_node) { list_for_each_entry(insn, &file->retpoline_call_list, call_node) {
struct symbol *sym = insn->sym; struct symbol *sym = insn->sym;
if (sym && (sym->type == STT_NOTYPE || if (sym && (is_notype_sym(sym) ||
sym->type == STT_FUNC) && !sym->nocfi) { is_func_sym(sym)) && !sym->nocfi) {
struct instruction *prev = struct instruction *prev =
prev_insn_same_sym(file, insn); prev_insn_same_sym(file, insn);

6
tools/objtool/disas.c
View File

@ -264,7 +264,7 @@ static void disas_print_addr_reloc(bfd_vma addr, struct disassemble_info *dinfo)
* If the relocation symbol is a section name (for example ".bss") * If the relocation symbol is a section name (for example ".bss")
* then we try to further resolve the name. * then we try to further resolve the name.
*/ */
if (reloc->sym->type == STT_SECTION) { if (is_sec_sym(reloc->sym)) {
str = offstr(reloc->sym->sec, reloc->sym->offset + offset); str = offstr(reloc->sym->sec, reloc->sym->offset + offset);
DINFO_FPRINTF(dinfo, bfd_vma_fmt, addr, str); DINFO_FPRINTF(dinfo, bfd_vma_fmt, addr, str);
free(str); free(str);
@ -580,7 +580,7 @@ static size_t disas_insn_common(struct disas_context *dctx,
*/ */
dinfo->buffer = insn->sec->data->d_buf; dinfo->buffer = insn->sec->data->d_buf;
dinfo->buffer_vma = 0; dinfo->buffer_vma = 0;
dinfo->buffer_length = insn->sec->sh.sh_size; dinfo->buffer_length = sec_size(insn->sec);
return disasm(insn->offset, &dctx->info); return disasm(insn->offset, &dctx->info);
} }
@ -1231,7 +1231,7 @@ void disas_funcs(struct disas_context *dctx)
for_each_sec(dctx->file->elf, sec) { for_each_sec(dctx->file->elf, sec) {
if (!(sec->sh.sh_flags & SHF_EXECINSTR)) if (!is_text_sec(sec))
continue; continue;
sec_for_each_sym(sec, sym) { sec_for_each_sym(sec, sym) {

6
tools/objtool/elf.c
View File

@ -614,7 +614,7 @@ static int read_symbols(struct elf *elf)
if (elf_add_symbol(elf, sym)) if (elf_add_symbol(elf, sym))
return -1; return -1;
if (sym->type == STT_FILE) if (is_file_sym(sym))
file = sym; file = sym;
else if (sym->bind == STB_LOCAL) else if (sym->bind == STB_LOCAL)
sym->file = file; sym->file = file;
@ -1335,7 +1335,7 @@ unsigned int elf_add_string(struct elf *elf, struct section *strtab, const char
return -1; return -1;
} }
offset = ALIGN(strtab->sh.sh_size, strtab->sh.sh_addralign); offset = ALIGN(sec_size(strtab), strtab->sh.sh_addralign);
if (!elf_add_data(elf, strtab, str, strlen(str) + 1)) if (!elf_add_data(elf, strtab, str, strlen(str) + 1))
return -1; return -1;
@ -1377,7 +1377,7 @@ void *elf_add_data(struct elf *elf, struct section *sec, const void *data, size_
sec->data->d_size = size; sec->data->d_size = size;
sec->data->d_align = 1; sec->data->d_align = 1;
offset = ALIGN(sec->sh.sh_size, sec->sh.sh_addralign); offset = ALIGN(sec_size(sec), sec->sh.sh_addralign);
sec->sh.sh_size = offset + size; sec->sh.sh_size = offset + size;
mark_sec_changed(elf, sec, true); mark_sec_changed(elf, sec, true);

8
tools/objtool/klp-diff.c
View File

@ -271,7 +271,7 @@ static bool is_uncorrelated_static_local(struct symbol *sym)
*/ */
static bool is_clang_tmp_label(struct symbol *sym) static bool is_clang_tmp_label(struct symbol *sym)
{ {
return sym->type == STT_NOTYPE && return is_notype_sym(sym) &&
is_text_sec(sym->sec) && is_text_sec(sym->sec) &&
strstarts(sym->name, ".Ltmp") && strstarts(sym->name, ".Ltmp") &&
isdigit(sym->name[5]); isdigit(sym->name[5]);
@ -480,7 +480,7 @@ static unsigned long find_sympos(struct elf *elf, struct symbol *sym)
if (sym->bind != STB_LOCAL) if (sym->bind != STB_LOCAL)
return 0; return 0;
if (vmlinux && sym->type == STT_FUNC) { if (vmlinux && is_func_sym(sym)) {
/* /*
* HACK: Unfortunately, symbol ordering can differ between * HACK: Unfortunately, symbol ordering can differ between
* vmlinux.o and vmlinux due to the linker script emitting * vmlinux.o and vmlinux due to the linker script emitting
@ -1046,8 +1046,8 @@ static int clone_reloc_klp(struct elfs *e, struct reloc *patched_reloc,
sec->name, offset, patched_sym->name, \ sec->name, offset, patched_sym->name, \
addend >= 0 ? "+" : "-", labs(addend), \ addend >= 0 ? "+" : "-", labs(addend), \
sym_type(patched_sym), \ sym_type(patched_sym), \
patched_sym->type == STT_SECTION ? "" : " ", \ is_sec_sym(patched_sym) ? "" : " ", \
patched_sym->type == STT_SECTION ? "" : sym_bind(patched_sym), \ is_sec_sym(patched_sym) ? "" : sym_bind(patched_sym), \
is_undef_sym(patched_sym) ? " UNDEF" : "", \ is_undef_sym(patched_sym) ? " UNDEF" : "", \
export ? " EXPORTED" : "", \ export ? " EXPORTED" : "", \
klp ? " KLP" : "") klp ? " KLP" : "")