github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

objtool: Move mark_rodata() to elf.c

Browse Source 
Move the sec->rodata marking from check.c to elf.c so it's set during
ELF reading rather than during the check pipeline.  This makes the
rodata flag available to all objtool users, including klp-diff which
reads ELF files directly without running check().

Add an is_rodata_sec() helper to elf.h for consistency with
is_text_sec() and is_string_sec().

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Song Liu <song@kernel.org>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
This commit is contained in:
Josh Poimboeuf 2026-04-12 18:35:03 -07:00
parent 3787e82a4e
commit 3e01ab44af
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/objtool/check.c
View File

@ -2566,7 +2566,6 @@ static int classify_symbols(struct objtool_file *file)
static void mark_rodata(struct objtool_file *file)
{
struct section *sec;
bool found = false;
/*
* Search for the following rodata sections, each of which can
@ -2579,15 +2578,11 @@ static void mark_rodata(struct objtool_file *file)
* .rodata.str1.* sections are ignored; they don't contain jump tables.
*/
for_each_sec(file->elf, sec) {
if ((!strncmp(sec->name, ".rodata", 7) &&
!strstr(sec->name, ".str1.")) ||
!strncmp(sec->name, ".data.rel.ro", 12)) {
sec->rodata = true;
found = true;
if (is_rodata_sec(sec)) {
file->rodata = true;
return;
}
}
file->rodata = found;
}
static void mark_holes(struct objtool_file *file)

13
tools/objtool/elf.c
View File

@ -1138,6 +1138,17 @@ static int read_relocs(struct elf *elf)
return 0;
}
static void mark_rodata(struct elf *elf)
{
struct section *sec;
for_each_sec(elf, sec) {
if ((strstarts(sec->name, ".rodata") && !strstr(sec->name, ".str1.")) ||
strstarts(sec->name, ".data.rel.ro"))
sec->rodata = true;
}
}
struct elf *elf_open_read(const char *name, int flags)
{
struct elf *elf;
@ -1188,6 +1199,8 @@ struct elf *elf_open_read(const char *name, int flags)
if (read_sections(elf))
goto err;
mark_rodata(elf);
if (read_symbols(elf))
goto err;

5
tools/objtool/include/objtool/elf.h
View File

@ -317,6 +317,11 @@ static inline bool is_text_sec(struct section *sec)
return sec->sh.sh_flags & SHF_EXECINSTR;
}
static inline bool is_rodata_sec(struct section *sec)
{
return sec->rodata;
}
static inline bool sec_changed(struct section *sec)
{
return sec->_changed;