2023-05-30 17:31:39

by Josh Poimboeuf

Subject: [PATCH 13/22] objtool: Get rid of reloc->idx

Use the array offset to calculate the reloc index.

With allyesconfig + CONFIG_DEBUG_INFO:

- Before: peak heap memory consumption: 45.56G
- After: peak heap memory consumption: 43.83G

Signed-off-by: Josh Poimboeuf <[email protected]>
---
tools/objtool/elf.c | 6 ++----
tools/objtool/include/objtool/elf.h | 10 +++++++---
2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 19ac53ad76ee..70c801254566 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -829,7 +829,6 @@ static struct reloc *elf_init_reloc(struct elf *elf, struct section *rsec,
return NULL;
}

- reloc->idx = reloc_idx;
reloc->sec = rsec;
reloc->offset = offset;
reloc->type = type;
@@ -954,7 +953,6 @@ static int read_relocs(struct elf *elf)
return -1;

reloc->sec = rsec;
- reloc->idx = i;
symndx = GELF_R_SYM(reloc->rel.r_info);
reloc->sym = sym = find_symbol_by_index(elf, symndx);
if (!reloc->sym) {
@@ -1237,9 +1235,9 @@ int elf_write_reloc(struct elf *elf, struct reloc *reloc)

if (rsec->sh.sh_type == SHT_RELA) {
reloc->rela.r_addend = reloc->addend;
- ret = gelf_update_rela(rsec->data, reloc->idx, &reloc->rela);
+ ret = gelf_update_rela(rsec->data, reloc_idx(reloc), &reloc->rela);
} else {
- ret = gelf_update_rel(rsec->data, reloc->idx, &reloc->rel);
+ ret = gelf_update_rel(rsec->data, reloc_idx(reloc), &reloc->rel);
}

if (!ret) {
diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index a09da208ddb8..2a14da633d56 100644
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -76,9 +76,8 @@ struct reloc {
struct symbol *sym;
struct list_head sym_reloc_entry;
unsigned long offset;
- unsigned int type;
s64 addend;
- int idx;
+ unsigned int type;
bool jump_table_start;
};

@@ -200,6 +199,11 @@ static inline unsigned int sec_num_entries(struct section *sec)
return sec->sh.sh_size / sec->sh.sh_entsize;
}

+static inline unsigned int reloc_idx(struct reloc *reloc)
+{
+ return reloc - reloc->sec->relocs;
+}
+
#define for_each_sec(file, sec) \
list_for_each_entry(sec, &file->elf->sections, list)

@@ -219,7 +223,7 @@ static inline unsigned int sec_num_entries(struct section *sec)
__i++, reloc++)

#define for_each_reloc_from(rsec, reloc) \
- for (int __i = reloc->idx; \
+ for (int __i = reloc_idx(reloc); \
__i < sec_num_entries(rsec); \
__i++, reloc++)

--
2.40.1

2023-06-09 07:53:01

by tip-bot2 for Alexey Makhalov

Subject: [tip: objtool/core] objtool: Get rid of reloc->idx

The following commit has been merged into the objtool/core branch of tip:

Commit-ID: be9a4c116824c39720001db5bc45fe7528b26cff
Gitweb: https://git.kernel.org/tip/be9a4c116824c39720001db5bc45fe7528b26cff
Author: Josh Poimboeuf <[email protected]>
AuthorDate: Tue, 30 May 2023 10:21:05 -07:00
Committer: Josh Poimboeuf <[email protected]>
CommitterDate: Wed, 07 Jun 2023 10:03:21 -07:00

objtool: Get rid of reloc->idx

Use the array offset to calculate the reloc index.

With allyesconfig + CONFIG_DEBUG_INFO:

- Before: peak heap memory consumption: 45.56G
- After: peak heap memory consumption: 43.83G

Link: https://lore.kernel.org/r/7351d2ebad0519027db14a32f6204af84952574a.1685464332.git.jpoimboe@kernel.org
Signed-off-by: Josh Poimboeuf <[email protected]>
---
tools/objtool/elf.c | 6 ++----
tools/objtool/include/objtool/elf.h | 10 +++++++---
2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 19ac53a..70c8012 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -829,7 +829,6 @@ static struct reloc *elf_init_reloc(struct elf *elf, struct section *rsec,
return NULL;
}

- reloc->idx = reloc_idx;
reloc->sec = rsec;
reloc->offset = offset;
reloc->type = type;
@@ -954,7 +953,6 @@ static int read_relocs(struct elf *elf)
return -1;

reloc->sec = rsec;
- reloc->idx = i;
symndx = GELF_R_SYM(reloc->rel.r_info);
reloc->sym = sym = find_symbol_by_index(elf, symndx);
if (!reloc->sym) {
@@ -1237,9 +1235,9 @@ int elf_write_reloc(struct elf *elf, struct reloc *reloc)

if (rsec->sh.sh_type == SHT_RELA) {
reloc->rela.r_addend = reloc->addend;
- ret = gelf_update_rela(rsec->data, reloc->idx, &reloc->rela);
+ ret = gelf_update_rela(rsec->data, reloc_idx(reloc), &reloc->rela);
} else {
- ret = gelf_update_rel(rsec->data, reloc->idx, &reloc->rel);
+ ret = gelf_update_rel(rsec->data, reloc_idx(reloc), &reloc->rel);
}

if (!ret) {
diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index a09da20..2a14da6 100644
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -76,9 +76,8 @@ struct reloc {
struct symbol *sym;
struct list_head sym_reloc_entry;
unsigned long offset;
- unsigned int type;
s64 addend;
- int idx;
+ unsigned int type;
bool jump_table_start;
};

@@ -200,6 +199,11 @@ static inline unsigned int sec_num_entries(struct section *sec)
return sec->sh.sh_size / sec->sh.sh_entsize;
}

+static inline unsigned int reloc_idx(struct reloc *reloc)
+{
+ return reloc - reloc->sec->relocs;
+}
+
#define for_each_sec(file, sec) \
list_for_each_entry(sec, &file->elf->sections, list)

@@ -219,7 +223,7 @@ static inline unsigned int sec_num_entries(struct section *sec)
__i++, reloc++)

#define for_each_reloc_from(rsec, reloc) \
- for (int __i = reloc->idx; \
+ for (int __i = reloc_idx(reloc); \
__i < sec_num_entries(rsec); \
__i++, reloc++)