From nobody Sun Feb 8 13:32:56 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 E32DCC77B7A for ; Tue, 30 May 2023 17:22:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233426AbjE3RWe (ORCPT ); Tue, 30 May 2023 13:22:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233010AbjE3RVl (ORCPT ); Tue, 30 May 2023 13:21:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE2F398 for ; Tue, 30 May 2023 10:21:37 -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 7A83E63135 for ; Tue, 30 May 2023 17:21:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4455C4339B; Tue, 30 May 2023 17:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685467296; bh=9ZwKWAhUoEay6Gr+X0+W5r9EsaeSEGXdmDt4xMDFxig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uOp3p6KQSqRlUXTu0MO4j7jwG+tr59MrcAb6UNI7EASTcyL1slOqos+h3GT+i8rsA z98k0FK2n7YqPSjWTaME0/X1wIFB0MzPMqcrmxzehqovSUdJ5juEsupsfwDf41wWo0 n5jH8AGZ6F06BhZ5ZfxSiA1AKs8PKvT+NwkzMXdXGooU26T4AOdrL5Wf3MaIk2vw/X SdMEJibAB6X2Zj8Ld/0+yMyLdIjFupW91skSdRfAOBktfJz1yZTNU6ALcqI8wAgGpM pQCSqQeqpNADUGiZN4/S25W9bGQth9ff6pXUMzPfUGVrN9QDyEKNd7SknO+dfxCS/i GnWLaBABh6dXw== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH 14/22] objtool: Get rid of reloc->offset Date: Tue, 30 May 2023 10:21:06 -0700 Message-Id: <2b9ec01178baa346a99522710bf2e82159412e3a.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 offset from the embedded GElf_Rel[a] struct. With allyesconfig + CONFIG_DEBUG_INFO: - Before: peak heap memory consumption: 43.83G - After: peak heap memory consumption: 42.10G Signed-off-by: Josh Poimboeuf --- tools/objtool/check.c | 14 +++++++------- tools/objtool/elf.c | 10 +++++----- tools/objtool/include/objtool/elf.h | 8 ++++++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 1355e6fec7d6..440c326121d4 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -510,11 +510,11 @@ static int add_pv_ops(struct objtool_file *file, cons= t char *symname) if (func->type =3D=3D STT_SECTION) func =3D find_symbol_by_offset(reloc->sym->sec, reloc->addend); =20 - idx =3D (reloc->offset - sym->offset) / sizeof(unsigned long); + idx =3D (reloc_offset(reloc) - sym->offset) / sizeof(unsigned long); =20 objtool_pv_add(file, idx, func); =20 - off =3D reloc->offset + 1; + off =3D reloc_offset(reloc) + 1; if (off > end) break; } @@ -1997,7 +1997,7 @@ static int add_jump_table(struct objtool_file *file, = struct instruction *insn, break; =20 /* Make sure the table entries are consecutive: */ - if (prev_offset && reloc->offset !=3D prev_offset + 8) + if (prev_offset && reloc_offset(reloc) !=3D prev_offset + 8) break; =20 /* Detect function pointers from contiguous objects: */ @@ -2022,7 +2022,7 @@ static int add_jump_table(struct objtool_file *file, = struct instruction *insn, alt->insn =3D dest_insn; alt->next =3D insn->alts; insn->alts =3D alt; - prev_offset =3D reloc->offset; + prev_offset =3D reloc_offset(reloc); } =20 if (!prev_offset) { @@ -4257,8 +4257,8 @@ static int validate_ibt_insn(struct objtool_file *fil= e, struct instruction *insn for (reloc =3D insn_reloc(file, insn); reloc; reloc =3D find_reloc_by_dest_range(file->elf, insn->sec, - reloc->offset + 1, - (insn->offset + insn->len) - (reloc->offset + 1))) { + reloc_offset(reloc) + 1, + (insn->offset + insn->len) - (reloc_offset(reloc) + 1))) { =20 /* * static_call_update() references the trampoline, which @@ -4341,7 +4341,7 @@ static int validate_ibt_data_reloc(struct objtool_fil= e *file, return 0; =20 WARN_FUNC("data relocation to !ENDBR: %s", - reloc->sec->base, reloc->offset, + reloc->sec->base, reloc_offset(reloc), offstr(dest->sec, dest->offset)); =20 return 1; diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 70c801254566..2b45460225d1 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -246,8 +246,9 @@ struct reloc *find_reloc_by_dest_range(const struct elf= *elf, struct section *se if (reloc->sec !=3D rsec) continue; =20 - if (reloc->offset >=3D offset && reloc->offset < offset + len) { - if (!r || reloc->offset < r->offset) + if (reloc_offset(reloc) >=3D offset && + reloc_offset(reloc) < offset + len) { + if (!r || reloc_offset(reloc) < reloc_offset(r)) r =3D reloc; } } @@ -830,11 +831,12 @@ static struct reloc *elf_init_reloc(struct elf *elf, = struct section *rsec, } =20 reloc->sec =3D rsec; - reloc->offset =3D offset; reloc->type =3D type; reloc->sym =3D sym; reloc->addend =3D addend; =20 + reloc->rel.r_offset =3D offset; + if (elf_write_reloc(elf, reloc)) return NULL; =20 @@ -908,7 +910,6 @@ static int read_reloc(struct section *rsec, int i, stru= ct reloc *reloc) return -1; } =20 - reloc->offset =3D reloc->rel.r_offset; reloc->type =3D GELF_R_TYPE(reloc->rel.r_info); reloc->addend =3D rela ? reloc->rela.r_addend : 0; =20 @@ -1230,7 +1231,6 @@ int elf_write_reloc(struct elf *elf, struct reloc *re= loc) struct section *rsec =3D reloc->sec; int ret; =20 - reloc->rel.r_offset =3D reloc->offset; reloc->rel.r_info =3D GELF_R_INFO(reloc->sym->idx, reloc->type); =20 if (rsec->sh.sh_type =3D=3D SHT_RELA) { diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/ob= jtool/elf.h index 2a14da633d56..2070860a099e 100644 --- a/tools/objtool/include/objtool/elf.h +++ b/tools/objtool/include/objtool/elf.h @@ -75,7 +75,6 @@ struct reloc { struct section *sec; struct symbol *sym; struct list_head sym_reloc_entry; - unsigned long offset; s64 addend; unsigned int type; bool jump_table_start; @@ -204,6 +203,11 @@ static inline unsigned int reloc_idx(struct reloc *rel= oc) return reloc - reloc->sec->relocs; } =20 +static inline unsigned long reloc_offset(struct reloc *reloc) +{ + return reloc->rel.r_offset; +} + #define for_each_sec(file, sec) \ list_for_each_entry(sec, &file->elf->sections, list) =20 @@ -253,7 +257,7 @@ static inline u32 sec_offset_hash(struct section *sec, = unsigned long offset) =20 static inline u32 reloc_hash(struct reloc *reloc) { - return sec_offset_hash(reloc->sec, reloc->offset); + return sec_offset_hash(reloc->sec, reloc_offset(reloc)); } =20 #endif /* _OBJTOOL_ELF_H */ --=20 2.40.1