From: Sathvika Vasireddy <sv@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: peterz@infradead.org, npiggin@gmail.com,
linux-kernel@vger.kernel.org, aik@ozlabs.ru, mingo@redhat.com,
sv@linux.ibm.com, rostedt@goodmis.org, jpoimboe@redhat.com,
naveen.n.rao@linux.vnet.ibm.com, mbenes@suse.cz,
chenzhongjin@huawei.com
Subject: [PATCH v2 10/16] objtool: Use target file class size instead of a compiled constant
Date: Mon, 29 Aug 2022 11:22:17 +0530 [thread overview]
Message-ID: <20220829055223.24767-11-sv@linux.ibm.com> (raw)
In-Reply-To: <20220829055223.24767-1-sv@linux.ibm.com>
From: Christophe Leroy <christophe.leroy@csgroup.eu>
In order to allow using objtool on cross-built kernels,
determine size of long from elf data instead of using
sizeof(long) at build time.
For the time being this covers only mcount.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
tools/objtool/check.c | 16 +++++++++-------
tools/objtool/elf.c | 8 ++++++--
tools/objtool/include/objtool/elf.h | 8 ++++++++
3 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index a948b2551520..0ecf41ee73f0 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -851,9 +851,9 @@ static int create_ibt_endbr_seal_sections(struct objtool_file *file)
static int create_mcount_loc_sections(struct objtool_file *file)
{
struct section *sec;
- unsigned long *loc;
struct instruction *insn;
int idx;
+ int addrsize = elf_class_addrsize(file->elf);
sec = find_section_by_name(file->elf, "__mcount_loc");
if (sec) {
@@ -869,23 +869,25 @@ static int create_mcount_loc_sections(struct objtool_file *file)
list_for_each_entry(insn, &file->mcount_loc_list, call_node)
idx++;
- sec = elf_create_section(file->elf, "__mcount_loc", 0, sizeof(unsigned long), idx);
+ sec = elf_create_section(file->elf, "__mcount_loc", 0, addrsize, idx);
if (!sec)
return -1;
+ sec->sh.sh_addralign = addrsize;
+
idx = 0;
list_for_each_entry(insn, &file->mcount_loc_list, call_node) {
+ void *loc;
- loc = (unsigned long *)sec->data->d_buf + idx;
- memset(loc, 0, sizeof(unsigned long));
+ loc = sec->data->d_buf + idx;
+ memset(loc, 0, addrsize);
- if (elf_add_reloc_to_insn(file->elf, sec,
- idx * sizeof(unsigned long),
+ if (elf_add_reloc_to_insn(file->elf, sec, idx,
R_X86_64_64,
insn->sec, insn->offset))
return -1;
- idx++;
+ idx += addrsize;
}
return 0;
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index c25e957c1e52..40c6d53b081f 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -1124,6 +1124,7 @@ static struct section *elf_create_rela_reloc_section(struct elf *elf, struct sec
{
char *relocname;
struct section *sec;
+ int addrsize = elf_class_addrsize(elf);
relocname = malloc(strlen(base->name) + strlen(".rela") + 1);
if (!relocname) {
@@ -1133,7 +1134,10 @@ static struct section *elf_create_rela_reloc_section(struct elf *elf, struct sec
strcpy(relocname, ".rela");
strcat(relocname, base->name);
- sec = elf_create_section(elf, relocname, 0, sizeof(GElf_Rela), 0);
+ if (addrsize == sizeof(u32))
+ sec = elf_create_section(elf, relocname, 0, sizeof(Elf32_Rela), 0);
+ else
+ sec = elf_create_section(elf, relocname, 0, sizeof(GElf_Rela), 0);
free(relocname);
if (!sec)
return NULL;
@@ -1142,7 +1146,7 @@ static struct section *elf_create_rela_reloc_section(struct elf *elf, struct sec
sec->base = base;
sec->sh.sh_type = SHT_RELA;
- sec->sh.sh_addralign = 8;
+ sec->sh.sh_addralign = addrsize;
sec->sh.sh_link = find_section_by_name(elf, ".symtab")->idx;
sec->sh.sh_info = base->idx;
sec->sh.sh_flags = SHF_INFO_LINK;
diff --git a/tools/objtool/include/objtool/elf.h b/tools/objtool/include/objtool/elf.h
index 16f4067b82ae..78b3aa2e546d 100644
--- a/tools/objtool/include/objtool/elf.h
+++ b/tools/objtool/include/objtool/elf.h
@@ -142,6 +142,14 @@ static inline bool has_multiple_files(struct elf *elf)
return elf->num_files > 1;
}
+static inline int elf_class_addrsize(struct elf *elf)
+{
+ if (elf->ehdr.e_ident[EI_CLASS] == ELFCLASS32)
+ return sizeof(u32);
+ else
+ return sizeof(u64);
+}
+
struct elf *elf_open_read(const char *name, int flags);
struct section *elf_create_section(struct elf *elf, const char *name, unsigned int sh_flags, size_t entsize, int nr);
--
2.31.1
next prev parent reply other threads:[~2022-08-29 6:00 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 5:52 [PATCH v2 00/16] objtool: Enable and implement --mcount option on powerpc Sathvika Vasireddy
2022-08-29 5:52 ` [PATCH v2 01/16] powerpc: Replace unreachable() with it's builtin variant in __WARN_FLAGS() Sathvika Vasireddy
2022-08-30 6:15 ` Christophe Leroy
2022-09-05 10:18 ` Naveen N. Rao
2022-08-29 5:52 ` [PATCH v2 02/16] powerpc: override __ALIGN() and __ALIGN_STR() macros Sathvika Vasireddy
2022-08-29 13:26 ` Christophe Leroy
2022-08-29 14:39 ` Sathvika Vasireddy
2022-08-31 3:24 ` Nicholas Piggin
2022-08-31 7:22 ` Michael Ellerman
2022-09-05 11:03 ` Peter Zijlstra
2022-08-29 5:52 ` [PATCH v2 03/16] powerpc: Fix objtool unannotated intra-function call warnings Sathvika Vasireddy
2022-08-30 6:16 ` Christophe Leroy
2022-08-30 12:42 ` Christophe Leroy
2022-09-05 11:02 ` Peter Zijlstra
2022-08-29 5:52 ` [PATCH v2 04/16] powerpc: Curb objtool unannotated intra-function warnings Sathvika Vasireddy
2022-08-30 6:26 ` Christophe Leroy
2022-08-29 5:52 ` [PATCH v2 05/16] powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.o Sathvika Vasireddy
2022-08-30 6:26 ` Christophe Leroy
2022-09-01 19:17 ` Peter Zijlstra
2022-09-05 10:47 ` Naveen N. Rao
2022-08-29 5:52 ` [PATCH v2 06/16] powerpc: Fix objtool unannotated intra-function call warnings on PPC32 Sathvika Vasireddy
2022-08-29 5:52 ` [PATCH v2 07/16] powerpc: Skip objtool from running on VDSO files Sathvika Vasireddy
2022-08-30 6:27 ` Christophe Leroy
2022-09-01 19:19 ` Peter Zijlstra
2022-09-02 7:40 ` Michael Ellerman
2022-08-29 5:52 ` [PATCH v2 08/16] objtool: Fix SEGFAULT Sathvika Vasireddy
2022-09-01 19:20 ` Peter Zijlstra
2022-09-02 8:06 ` Christophe Leroy
2022-09-02 8:42 ` Peter Zijlstra
2022-08-29 5:52 ` [PATCH v2 09/16] objtool: Use target file endianness instead of a compiled constant Sathvika Vasireddy
2022-09-01 19:22 ` Peter Zijlstra
2022-08-29 5:52 ` Sathvika Vasireddy [this message]
2022-09-01 19:23 ` [PATCH v2 10/16] objtool: Use target file class size " Peter Zijlstra
2022-08-29 5:52 ` [PATCH v2 11/16] objtool: Add --mnop as an option to --mcount Sathvika Vasireddy
2022-08-30 6:28 ` Christophe Leroy
2022-09-01 19:25 ` Peter Zijlstra
2022-09-05 10:55 ` Naveen N. Rao
2022-08-29 5:52 ` [PATCH v2 12/16] objtool: Read special sections with alts only when specific options are selected Sathvika Vasireddy
2022-08-30 6:31 ` Christophe Leroy
2022-08-29 5:52 ` [PATCH v2 13/16] objtool: Use macros to define arch specific reloc types Sathvika Vasireddy
2022-08-30 6:33 ` Christophe Leroy
2022-09-01 19:28 ` Peter Zijlstra
2022-08-29 5:52 ` [PATCH v2 14/16] objtool: Add arch specific function arch_ftrace_match() Sathvika Vasireddy
2022-08-30 6:36 ` Christophe Leroy
2022-08-29 5:52 ` [PATCH v2 15/16] objtool/powerpc: Enable objtool to be built on ppc Sathvika Vasireddy
2022-08-30 6:41 ` Christophe Leroy
2022-09-05 10:37 ` Naveen N. Rao
2023-02-04 8:19 ` Randy Dunlap
2023-02-04 8:21 ` Randy Dunlap
2023-02-04 8:30 ` Randy Dunlap
2023-02-04 11:55 ` Christophe Leroy
2023-02-04 13:10 ` Christophe Leroy
2023-02-04 15:47 ` Josh Poimboeuf
2022-09-01 9:32 ` Christophe Leroy
2022-09-01 15:11 ` Segher Boessenkool
2022-09-01 16:38 ` Christophe Leroy
2022-09-01 19:01 ` Peter Zijlstra
2022-08-29 5:52 ` [PATCH v2 16/16] objtool/powerpc: Add --mcount specific implementation Sathvika Vasireddy
2022-08-30 6:44 ` Christophe Leroy
2022-08-31 12:50 ` Christophe Leroy
2022-08-31 17:51 ` Segher Boessenkool
2022-09-05 10:45 ` Naveen N. Rao
2022-09-05 20:43 ` Segher Boessenkool
2022-09-06 6:22 ` Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220829055223.24767-11-sv@linux.ibm.com \
--to=sv@linux.ibm.com \
--cc=aik@ozlabs.ru \
--cc=chenzhongjin@huawei.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mbenes@suse.cz \
--cc=mingo@redhat.com \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).