Skip to content

Commit

Permalink
riscv: module: move find_section to module.h
Browse files Browse the repository at this point in the history
Move find_section() to module.h so that the implementation can be shared
by the alternatives code. This will allow us to use alternatives in
the vdso.

Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20230128172856.3814-8-jszhang@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
  • Loading branch information
Jisheng Zhang authored and Palmer Dabbelt committed Feb 1, 2023
1 parent 702e645 commit e0c267e
Showing 2 changed files with 16 additions and 15 deletions.
16 changes: 16 additions & 0 deletions arch/riscv/include/asm/module.h
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
#define _ASM_RISCV_MODULE_H

#include <asm-generic/module.h>
#include <linux/elf.h>

struct module;
unsigned long module_emit_got_entry(struct module *mod, unsigned long val);
@@ -111,4 +112,19 @@ static inline struct plt_entry *get_plt_entry(unsigned long val,

#endif /* CONFIG_MODULE_SECTIONS */

static inline const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
{
const Elf_Shdr *s, *se;
const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;

for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) {
if (strcmp(name, secstrs + s->sh_name) == 0)
return s;
}

return NULL;
}

#endif /* _ASM_RISCV_MODULE_H */
15 changes: 0 additions & 15 deletions arch/riscv/kernel/module.c
Original file line number Diff line number Diff line change
@@ -429,21 +429,6 @@ void *module_alloc(unsigned long size)
}
#endif

static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
{
const Elf_Shdr *s, *se;
const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;

for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++) {
if (strcmp(name, secstrs + s->sh_name) == 0)
return s;
}

return NULL;
}

int module_finalize(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
struct module *me)

0 comments on commit e0c267e

Please sign in to comment.