From nobody Sun Feb 8 04:34:04 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 07FA1C7EE23 for ; Tue, 30 May 2023 17:22:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233389AbjE3RWZ (ORCPT ); Tue, 30 May 2023 13:22:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233048AbjE3RVl (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 5564EE5 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 C85E963134 for ; Tue, 30 May 2023 17:21:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11BFBC4339C; 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=SzgZPlsWLNkI7F0pgFK7KJ4T9CY98WR4ayNrJxiorE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NUXDqUKIDIImmiZODxKha9iN5Q5GMhFqDe7ZB+R7+5YeCCtP/RR4xoeHSA3c09NsQ D1ngrfqvcapjbqIb9sJw4TRF/XkjipantOIA7GB4gQmIHJT/pGW6qaY0x7KPo8SGRC ONZuegUvukCaa/hYqjlwskUpFs8DG3MkenJ1lR4wYmsliyg+5A9c3PKEtC6tOCsaaJ ieP7YhZQiJGRiM0B/V7d4ElgNnwpqzrMXCftm9j+0j8ePGQU/NCNMf/YPWb8SPE0/z lnLC04VApjTYbsEssluA6tWxXh32i1Vy7GI0BzCnouGXhM/2XL9uqMwzSNgdzp33df PiYGOK4WkSkCg== From: Josh Poimboeuf To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Miroslav Benes Subject: [PATCH 12/22] objtool: Get rid of reloc->list Date: Tue, 30 May 2023 10:21:04 -0700 Message-Id: <71e7a2c017dbc46bb497857ec97d67214f832d10.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" Now that all relocs are allocated in an array, the linked list is no longer needed. With allyesconfig + CONFIG_DEBUG_INFO: - Before: peak heap memory consumption: 49.02G - After: peak heap memory consumption: 45.56G Signed-off-by: Josh Poimboeuf --- tools/objtool/elf.c | 32 ++++++++++++----------------- tools/objtool/include/objtool/elf.h | 18 +++++++++++----- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c index 5f69d4590117..19ac53ad76ee 100644 --- a/tools/objtool/elf.c +++ b/tools/objtool/elf.c @@ -293,7 +293,6 @@ static int read_sections(struct elf *elf) sec =3D &elf->section_data[i]; =20 INIT_LIST_HEAD(&sec->symbol_list); - INIT_LIST_HEAD(&sec->reloc_list); =20 s =3D elf_getscn(elf->elf, i); if (!s) { @@ -333,7 +332,7 @@ static int read_sections(struct elf *elf) elf_hash_add(section_name, &sec->name_hash, str_hash(sec->name)); =20 if (is_reloc_sec(sec)) - elf->num_relocs +=3D sec->sh.sh_size / sec->sh.sh_entsize; + elf->num_relocs +=3D sec_num_entries(sec); } =20 if (opts.stats) { @@ -407,7 +406,7 @@ static int read_symbols(struct elf *elf) if (symtab_shndx) shndx_data =3D symtab_shndx->data; =20 - symbols_nr =3D symtab->sh.sh_size / symtab->sh.sh_entsize; + symbols_nr =3D sec_num_entries(symtab); } else { /* * A missing symbol table is actually possible if it's an empty @@ -701,7 +700,7 @@ __elf_create_symbol(struct elf *elf, struct symbol *sym) return NULL; } =20 - new_idx =3D symtab->sh.sh_size / symtab->sh.sh_entsize; + new_idx =3D sec_num_entries(symtab); =20 if (GELF_ST_BIND(sym->sym.st_info) !=3D STB_LOCAL) goto non_local; @@ -816,13 +815,13 @@ static struct reloc *elf_init_reloc(struct elf *elf, = struct section *rsec, { struct reloc *reloc, empty =3D { 0 }; =20 - if (reloc_idx >=3D rsec->sh.sh_size / elf_rela_size(elf)) { - WARN("%s: bad reloc_idx %u for %s with size 0x%lx", - __func__, reloc_idx, rsec->name, rsec->sh.sh_size); + if (reloc_idx >=3D sec_num_entries(rsec)) { + WARN("%s: bad reloc_idx %u for %s with %d relocs", + __func__, reloc_idx, rsec->name, sec_num_entries(rsec)); return NULL; } =20 - reloc =3D &rsec->reloc_data[reloc_idx]; + reloc =3D &rsec->relocs[reloc_idx]; =20 if (memcmp(reloc, &empty, sizeof(empty))) { WARN("%s: %s: reloc %d already initialized!", @@ -841,7 +840,6 @@ static struct reloc *elf_init_reloc(struct elf *elf, st= ruct section *rsec, return NULL; =20 list_add_tail(&reloc->sym_reloc_entry, &sym->reloc_list); - list_add_tail(&reloc->list, &rsec->reloc_list); elf_hash_add(reloc, &reloc->hash, reloc_hash(reloc)); =20 return reloc; @@ -944,14 +942,13 @@ static int read_relocs(struct elf *elf) rsec->base->rsec =3D rsec; =20 nr_reloc =3D 0; - rsec->reloc_data =3D calloc(rsec->sh.sh_size / rsec->sh.sh_entsize, - sizeof(*reloc)); - if (!rsec->reloc_data) { + rsec->relocs =3D calloc(sec_num_entries(rsec), sizeof(*reloc)); + if (!rsec->relocs) { perror("calloc"); return -1; } - for (i =3D 0; i < rsec->sh.sh_size / rsec->sh.sh_entsize; i++) { - reloc =3D &rsec->reloc_data[i]; + for (i =3D 0; i < sec_num_entries(rsec); i++) { + reloc =3D &rsec->relocs[i]; =20 if (read_reloc(rsec, i, reloc)) return -1; @@ -967,7 +964,6 @@ static int read_relocs(struct elf *elf) } =20 list_add_tail(&reloc->sym_reloc_entry, &sym->reloc_list); - list_add_tail(&reloc->list, &rsec->reloc_list); elf_hash_add(reloc, &reloc->hash, reloc_hash(reloc)); =20 nr_reloc++; @@ -1093,7 +1089,6 @@ struct section *elf_create_section(struct elf *elf, c= onst char *name, memset(sec, 0, sizeof(*sec)); =20 INIT_LIST_HEAD(&sec->symbol_list); - INIT_LIST_HEAD(&sec->reloc_list); =20 s =3D elf_newscn(elf->elf); if (!s) { @@ -1186,9 +1181,8 @@ static struct section *elf_create_rela_section(struct= elf *elf, rsec->sh.sh_info =3D sec->idx; rsec->sh.sh_flags =3D SHF_INFO_LINK; =20 - rsec->reloc_data =3D calloc(rsec->sh.sh_size / rsec->sh.sh_entsize, - sizeof(struct reloc)); - if (!rsec->reloc_data) { + rsec->relocs =3D calloc(sec_num_entries(rsec), sizeof(struct reloc)); + if (!rsec->relocs) { perror("calloc"); return NULL; } diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/ob= jtool/elf.h index a938cb1d4172..a09da208ddb8 100644 --- a/tools/objtool/include/objtool/elf.h +++ b/tools/objtool/include/objtool/elf.h @@ -33,14 +33,13 @@ struct section { GElf_Shdr sh; struct rb_root_cached symbol_tree; struct list_head symbol_list; - struct list_head reloc_list; struct section *base, *rsec; struct symbol *sym; Elf_Data *data; char *name; int idx; bool _changed, text, rodata, noinstr, init, truncate; - struct reloc *reloc_data; + struct reloc *relocs; }; =20 struct symbol { @@ -68,7 +67,6 @@ struct symbol { }; =20 struct reloc { - struct list_head list; struct hlist_node hash; union { GElf_Rela rela; @@ -197,6 +195,11 @@ static inline void mark_sec_changed(struct elf *elf, s= truct section *sec, elf->changed |=3D changed; } =20 +static inline unsigned int sec_num_entries(struct section *sec) +{ + return sec->sh.sh_size / sec->sh.sh_entsize; +} + #define for_each_sec(file, sec) \ list_for_each_entry(sec, &file->elf->sections, list) =20 @@ -210,10 +213,15 @@ static inline void mark_sec_changed(struct elf *elf, = struct section *sec, sec_for_each_sym(__sec, sym) =20 #define for_each_reloc(rsec, reloc) \ - list_for_each_entry(reloc, &rsec->reloc_list, list) + for (int __i =3D 0, __fake =3D 1; __fake; __fake =3D 0) \ + for (reloc =3D rsec->relocs; \ + __i < sec_num_entries(rsec); \ + __i++, reloc++) =20 #define for_each_reloc_from(rsec, reloc) \ - list_for_each_entry_from(reloc, &rsec->reloc_list, list) + for (int __i =3D reloc->idx; \ + __i < sec_num_entries(rsec); \ + __i++, reloc++) =20 #define OFFSET_STRIDE_BITS 4 #define OFFSET_STRIDE (1UL << OFFSET_STRIDE_BITS) --=20 2.40.1