From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Borislav Petkov <bp@suse.de>, Ingo Molnar <mingo@kernel.org>,
Miroslav Benes <mbenes@suse.cz>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] objtool: Extract elf_strtab_concat()
Date: Sat, 03 Apr 2021 11:10:57 -0000 [thread overview]
Message-ID: <161744825705.29796.13759934651137424590.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210326151259.941474004@infradead.org>
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 417a4dc91e559f92404c2544f785b02ce75784c3
Gitweb: https://git.kernel.org/tip/417a4dc91e559f92404c2544f785b02ce75784c3
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Fri, 26 Mar 2021 16:12:09 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 02 Apr 2021 12:44:56 +02:00
objtool: Extract elf_strtab_concat()
Create a common helper to append strings to a strtab.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Link: https://lkml.kernel.org/r/20210326151259.941474004@infradead.org
---
tools/objtool/elf.c | 60 +++++++++++++++++++++++++++-----------------
1 file changed, 38 insertions(+), 22 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 7b65ae3..c278a04 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -673,13 +673,48 @@ err:
return NULL;
}
+static int elf_add_string(struct elf *elf, struct section *strtab, char *str)
+{
+ Elf_Data *data;
+ Elf_Scn *s;
+ int len;
+
+ if (!strtab)
+ strtab = find_section_by_name(elf, ".strtab");
+ if (!strtab) {
+ WARN("can't find .strtab section");
+ return -1;
+ }
+
+ s = elf_getscn(elf->elf, strtab->idx);
+ if (!s) {
+ WARN_ELF("elf_getscn");
+ return -1;
+ }
+
+ data = elf_newdata(s);
+ if (!data) {
+ WARN_ELF("elf_newdata");
+ return -1;
+ }
+
+ data->d_buf = str;
+ data->d_size = strlen(str) + 1;
+ data->d_align = 1;
+
+ len = strtab->len;
+ strtab->len += data->d_size;
+ strtab->changed = true;
+
+ return len;
+}
+
struct section *elf_create_section(struct elf *elf, const char *name,
unsigned int sh_flags, size_t entsize, int nr)
{
struct section *sec, *shstrtab;
size_t size = entsize * nr;
Elf_Scn *s;
- Elf_Data *data;
sec = malloc(sizeof(*sec));
if (!sec) {
@@ -736,7 +771,6 @@ struct section *elf_create_section(struct elf *elf, const char *name,
sec->sh.sh_addralign = 1;
sec->sh.sh_flags = SHF_ALLOC | sh_flags;
-
/* Add section name to .shstrtab (or .strtab for Clang) */
shstrtab = find_section_by_name(elf, ".shstrtab");
if (!shstrtab)
@@ -745,27 +779,9 @@ struct section *elf_create_section(struct elf *elf, const char *name,
WARN("can't find .shstrtab or .strtab section");
return NULL;
}
-
- s = elf_getscn(elf->elf, shstrtab->idx);
- if (!s) {
- WARN_ELF("elf_getscn");
+ sec->sh.sh_name = elf_add_string(elf, shstrtab, sec->name);
+ if (sec->sh.sh_name == -1)
return NULL;
- }
-
- data = elf_newdata(s);
- if (!data) {
- WARN_ELF("elf_newdata");
- return NULL;
- }
-
- data->d_buf = sec->name;
- data->d_size = strlen(name) + 1;
- data->d_align = 1;
-
- sec->sh.sh_name = shstrtab->len;
-
- shstrtab->len += strlen(name) + 1;
- shstrtab->changed = true;
list_add_tail(&sec->list, &elf->sections);
elf_hash_add(elf->section_hash, &sec->hash, sec->idx);
next prev parent reply other threads:[~2021-04-03 11:11 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 15:11 [PATCH v3 00/16] x86,objtool: Optimize !RETPOLINE Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 01/16] x86: Add insn_decode_kernel() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 02/16] x86/alternatives: Optimize optimize_nops() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:11 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 03/16] x86/retpoline: Simplify retpolines Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-04-06 8:56 ` David Laight
2021-03-26 15:12 ` [PATCH v3 04/16] objtool: Correctly handle retpoline thunk calls Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 05/16] objtool: Per arch retpoline naming Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] objtool: Handle per " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 06/16] objtool: Fix static_call list generation Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 07/16] objtool: Rework rebuild_reloc logic Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` [tip: x86/core] objtool: Rework the elf_rebuild_reloc_section() logic tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 08/16] objtool: Add elf_create_reloc() helper Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 09/16] objtool: Implicitly create reloc sections Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` [tip: x86/core] objtool: Create reloc sections implicitly tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 10/16] objtool: Extract elf_strtab_concat() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra [this message]
2021-03-26 15:12 ` [PATCH v3 11/16] objtool: Extract elf_symbol_add() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 12/16] objtool: Add elf_create_undef_symbol() Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 13/16] objtool: Keep track of retpoline call sites Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 14/16] objtool: Cache instruction relocs Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 15/16] objtool: Skip magical retpoline .altinstr_replacement Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-26 15:12 ` [PATCH v3 16/16] objtool,x86: Rewrite retpoline thunk calls Peter Zijlstra
2021-03-29 16:38 ` Josh Poimboeuf
2021-06-02 15:51 ` Lukasz Majczak
2021-06-02 16:56 ` Peter Zijlstra
2021-06-02 17:10 ` Peter Zijlstra
2021-06-02 20:43 ` Josh Poimboeuf
2021-06-04 20:50 ` Nick Desaulniers
2021-06-04 23:27 ` Nick Desaulniers
2021-06-04 23:50 ` Fangrui Song
2021-06-05 10:38 ` Peter Zijlstra
2021-06-06 1:58 ` Fāng-ruì Sòng
2021-06-07 7:56 ` Peter Zijlstra
2021-06-07 9:22 ` Peter Zijlstra
2021-06-07 9:45 ` Peter Zijlstra
2021-06-07 17:23 ` Fāng-ruì Sòng
2021-06-07 18:25 ` Peter Zijlstra
2021-06-07 20:54 ` Nick Desaulniers
2021-06-08 9:56 ` Peter Zijlstra
2021-06-08 16:58 ` Nathan Chancellor
2021-06-08 17:22 ` Peter Zijlstra
2021-06-08 17:29 ` Nathan Chancellor
2021-06-08 18:17 ` Peter Zijlstra
2021-06-08 18:49 ` Nathan Chancellor
2021-06-09 7:11 ` Lukasz Majczak
2021-06-09 7:20 ` Peter Zijlstra
2021-06-09 12:23 ` Lukasz Majczak
2021-06-09 15:08 ` Peter Zijlstra
2021-06-09 15:11 ` Peter Zijlstra
2021-06-09 15:56 ` Nathan Chancellor
2021-06-08 18:18 ` Nick Desaulniers
2021-06-07 18:19 ` Peter Zijlstra
2021-06-07 18:27 ` Fāng-ruì Sòng
2021-06-07 18:47 ` Peter Zijlstra
2021-04-01 15:08 ` [tip: x86/core] objtool/x86: " tip-bot2 for Peter Zijlstra
2021-04-03 11:10 ` tip-bot2 for Peter Zijlstra
2021-03-30 15:02 ` [PATCH v3 00/16] x86,objtool: Optimize !RETPOLINE Miroslav Benes
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=161744825705.29796.13759934651137424590.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=x86@kernel.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).