From nobody Sun Feb 8 00:38:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBE86C77B7A for ; Tue, 30 May 2023 17:22:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233470AbjE3RW6 (ORCPT ); Tue, 30 May 2023 13:22:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233260AbjE3RVo (ORCPT ); Tue, 30 May 2023 13:21:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B1EA102 for ; Tue, 30 May 2023 10:21:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 78E7563142 for ; Tue, 30 May 2023 17:21:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1D4FC433A8; Tue, 30 May 2023 17:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685467298; bh=0IXsiwvSgd8r+C6PdGxTPB0uO8ObUewc0Gid2X5/8PQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jzxmsBR5UpBN254QFLmUM1wJRNe/wFbBK4T9x0dQZ5+/HmagoaIFdkgS7usjxbPsw N3gdU3SphMkqKfYhXuDOJMClwzAv2HoQAZPwX6jWkptEaPzJ+a7VjV5uw7mvSii6nT 53fqxHMPakbpDo/Jm4L67CmSsxA7x+vH19I7FnwUqtOjvX6p45VYaY7lUEmH2CimdO t1LrJGJlELUeKE6IwyO81+Opl60z9iUFWo6Yob00zGwlamWQoOruxwHSdLc0Gg21FU FvxeiHJKPGU3KMRDriUX4JF9WHWSXmjyyXm8Dj4g+VcYEWKXp6p8uOvR1Bx9FjoekP h2znXtIfEnB0Q== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH 20/22] objtool: Get rid of reloc->rel[a] Date: Tue, 30 May 2023 10:21:12 -0700 Message-Id: <2be32323de6d8cc73179ee0ff14b71f4e7cefaa0.1685464332.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Get the relocation entry info from the underlying rsec->data. With allyesconfig + CONFIG_DEBUG_INFO: - Before: peak heap memory consumption: 35.12G - After: peak heap memory consumption: 29.93G Signed-off-by: Josh Poimboeuf --- tools/objtool/check.c | 20 +++--- tools/objtool/elf.c | 60 +++--------------- tools/objtool/include/objtool/elf.h | 94 +++++++++++++++++++++++++---- 3 files changed, 96 insertions(+), 78 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 3fe6b3657e22..65c59b0b1e96 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -967,7 +967,7 @@ static int create_mcount_loc_sections(struct objtool_fi= le *file) if (!reloc) return -1; =20 - set_reloc_type(reloc, addr_size =3D=3D 8 ? R_ABS64 : R_ABS32); + set_reloc_type(file->elf, reloc, addr_size =3D=3D 8 ? R_ABS64 : R_ABS32); =20 idx++; } @@ -1362,10 +1362,8 @@ static void annotate_call_site(struct objtool_file *= file, * noinstr text. */ if (opts.hack_noinstr && insn->sec->noinstr && sym->profiling_func) { - if (reloc) { - set_reloc_type(reloc, R_NONE); - elf_write_reloc(file->elf, reloc); - } + if (reloc) + set_reloc_type(file->elf, reloc, R_NONE); =20 elf_write_insn(file->elf, insn->sec, insn->offset, insn->len, @@ -1391,10 +1389,8 @@ static void annotate_call_site(struct objtool_file *= file, if (sibling) WARN_INSN(insn, "tail call to __fentry__ !?!?"); if (opts.mnop) { - if (reloc) { - set_reloc_type(reloc, R_NONE); - elf_write_reloc(file->elf, reloc); - } + if (reloc) + set_reloc_type(file->elf, reloc, R_NONE); =20 elf_write_insn(file->elf, insn->sec, insn->offset, insn->len, @@ -1873,10 +1869,8 @@ static int handle_jump_alt(struct objtool_file *file, if (opts.hack_jump_label && special_alt->key_addend & 2) { struct reloc *reloc =3D insn_reloc(file, orig_insn); =20 - if (reloc) { - set_reloc_type(reloc, R_NONE); - elf_write_reloc(file->elf, reloc); - } + if (reloc) + set_reloc_type(file->elf, reloc, R_NONE); elf_write_insn(file->elf, orig_insn->sec, orig_insn->offset, orig_insn->len, arch_nop_insn(orig_insn->len)); diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 04038b1324cf..54d182ddc4bb 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -575,11 +575,8 @@ static int elf_update_sym_relocs(struct elf *elf, stru= ct symbol *sym) { struct reloc *reloc; =20 - for (reloc =3D sym->relocs; reloc; reloc =3D reloc->sym_next_reloc) { - reloc->rel.r_info =3D GELF_R_INFO(reloc->sym->idx, reloc_type(reloc)); - if (elf_write_reloc(elf, reloc)) - return -1; - } + for (reloc =3D sym->relocs; reloc; reloc =3D reloc->sym_next_reloc) + set_reloc_sym(elf, reloc, reloc->sym->idx); =20 return 0; } @@ -869,12 +866,10 @@ static struct reloc *elf_init_reloc(struct elf *elf, = struct section *rsec, reloc->sec =3D rsec; reloc->sym =3D sym; =20 - reloc->rel.r_offset =3D offset; - reloc->rel.r_info =3D GELF_R_INFO(sym->idx, type); - reloc->rela.r_addend =3D addend; - - if (elf_write_reloc(elf, reloc)) - return NULL; + set_reloc_offset(elf, reloc, offset); + set_reloc_sym(elf, reloc, sym->idx); + set_reloc_type(elf, reloc, type); + set_reloc_addend(elf, reloc, addend); =20 elf_hash_add(reloc, &reloc->hash, reloc_hash(reloc)); reloc->sym_next_reloc =3D sym->relocs; @@ -932,24 +927,6 @@ struct reloc *elf_init_reloc_data_sym(struct elf *elf,= struct section *sec, elf_data_rela_type(elf)); } =20 -static int read_reloc(struct section *rsec, int i, struct reloc *reloc) -{ - bool rela =3D rsec->sh.sh_type =3D=3D SHT_RELA; - void *retp; - - if (rela) - retp =3D gelf_getrela(rsec->data, i, &reloc->rela); - else - retp =3D gelf_getrel(rsec->data, i, &reloc->rel); - - if (!retp) { - WARN_ELF("gelf_getrela"); - return -1; - } - - return 0; -} - static int read_relocs(struct elf *elf) { unsigned long nr_reloc, max_reloc =3D 0; @@ -984,11 +961,8 @@ static int read_relocs(struct elf *elf) for (i =3D 0; i < sec_num_entries(rsec); i++) { reloc =3D &rsec->relocs[i]; =20 - if (read_reloc(rsec, i, reloc)) - return -1; - reloc->sec =3D rsec; - symndx =3D GELF_R_SYM(reloc->rel.r_info); + symndx =3D reloc_sym(reloc); reloc->sym =3D sym =3D find_symbol_by_index(elf, symndx); if (!reloc->sym) { WARN("can't find reloc entry symbol %d for %s", @@ -1261,26 +1235,6 @@ int elf_write_insn(struct elf *elf, struct section *= sec, return 0; } =20 -int elf_write_reloc(struct elf *elf, struct reloc *reloc) -{ - struct section *rsec =3D reloc->sec; - int ret; - - if (rsec->sh.sh_type =3D=3D SHT_RELA) - ret =3D gelf_update_rela(rsec->data, reloc_idx(reloc), &reloc->rela); - else - ret =3D gelf_update_rel(rsec->data, reloc_idx(reloc), &reloc->rel); - - if (!ret) { - WARN_ELF("gelf_update_rela"); - return -1; - } - - mark_sec_changed(elf, rsec, true); - - return 0; -} - /* * When Elf_Scn::sh_size is smaller than the combined Elf_Data::d_size * do you: diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/ob= jtool/elf.h index 03a9040f696c..c532d70864dc 100644 --- a/tools/objtool/include/objtool/elf.h +++ b/tools/objtool/include/objtool/elf.h @@ -72,10 +72,6 @@ struct symbol { =20 struct reloc { struct elf_hash_node hash; - union { - GElf_Rela rela; - GElf_Rel rel; - }; struct section *sec; struct symbol *sym; struct reloc *sym_next_reloc; @@ -132,7 +128,6 @@ struct reloc *elf_init_reloc_data_sym(struct elf *elf, = struct section *sec, int elf_write_insn(struct elf *elf, struct section *sec, unsigned long offset, unsigned int len, const char *insn); -int elf_write_reloc(struct elf *elf, struct reloc *reloc); int elf_write(struct elf *elf); void elf_close(struct elf *elf); =20 @@ -204,24 +199,99 @@ static inline unsigned int reloc_idx(struct reloc *re= loc) return reloc - reloc->sec->relocs; } =20 -static inline unsigned long reloc_offset(struct reloc *reloc) +static inline void *reloc_rel(struct reloc *reloc) { - return reloc->rel.r_offset; + struct section *rsec =3D reloc->sec; + + return rsec->data->d_buf + (reloc_idx(reloc) * rsec->sh.sh_entsize); } =20 -static inline unsigned int reloc_type(struct reloc *reloc) +static inline bool is_32bit_reloc(struct reloc *reloc) { - return GELF_R_TYPE(reloc->rel.r_info); + /* + * Elf32_Rel: 8 bytes + * Elf32_Rela: 12 bytes + * Elf64_Rel: 16 bytes + * Elf64_Rela: 24 bytes + */ + return reloc->sec->sh.sh_entsize < 16; } =20 -static inline void set_reloc_type(struct reloc *reloc, int type) +#define __get_reloc_field(reloc, field) \ +({ \ + is_32bit_reloc(reloc) ? \ + ((Elf32_Rela *)reloc_rel(reloc))->field : \ + ((Elf64_Rela *)reloc_rel(reloc))->field; \ +}) + +#define __set_reloc_field(reloc, field, val) \ +({ \ + if (is_32bit_reloc(reloc)) \ + ((Elf32_Rela *)reloc_rel(reloc))->field =3D val; \ + else \ + ((Elf64_Rela *)reloc_rel(reloc))->field =3D val; \ +}) + +static inline u64 reloc_offset(struct reloc *reloc) { - reloc->rel.r_info =3D GELF_R_INFO(GELF_R_SYM(reloc->rel.r_info), type); + return __get_reloc_field(reloc, r_offset); +} + +static inline void set_reloc_offset(struct elf *elf, struct reloc *reloc, = u64 offset) +{ + __set_reloc_field(reloc, r_offset, offset); + mark_sec_changed(elf, reloc->sec, true); } =20 static inline s64 reloc_addend(struct reloc *reloc) { - return reloc->rela.r_addend; + return __get_reloc_field(reloc, r_addend); +} + +static inline void set_reloc_addend(struct elf *elf, struct reloc *reloc, = s64 addend) +{ + __set_reloc_field(reloc, r_addend, addend); + mark_sec_changed(elf, reloc->sec, true); +} + + +static inline unsigned int reloc_sym(struct reloc *reloc) +{ + u64 info =3D __get_reloc_field(reloc, r_info); + + return is_32bit_reloc(reloc) ? + ELF32_R_SYM(info) : + ELF64_R_SYM(info); +} + +static inline unsigned int reloc_type(struct reloc *reloc) +{ + u64 info =3D __get_reloc_field(reloc, r_info); + + return is_32bit_reloc(reloc) ? + ELF32_R_TYPE(info) : + ELF64_R_TYPE(info); +} + +static inline void set_reloc_sym(struct elf *elf, struct reloc *reloc, uns= igned int sym) +{ + u64 info =3D is_32bit_reloc(reloc) ? + ELF32_R_INFO(sym, reloc_type(reloc)) : + ELF64_R_INFO(sym, reloc_type(reloc)); + + __set_reloc_field(reloc, r_info, info); + + mark_sec_changed(elf, reloc->sec, true); +} +static inline void set_reloc_type(struct elf *elf, struct reloc *reloc, un= signed int type) +{ + u64 info =3D is_32bit_reloc(reloc) ? + ELF32_R_INFO(reloc_sym(reloc), type) : + ELF64_R_INFO(reloc_sym(reloc), type); + + __set_reloc_field(reloc, r_info, info); + + mark_sec_changed(elf, reloc->sec, true); } =20 #define for_each_sec(file, sec) \ --=20 2.40.1