Unverified Commit e0c267e0 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: module: move find_section to module.h 



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: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20230128172856.3814-8-jszhang@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 702e6455

arch/riscv/include/asm/module.h

+16 −0
Original line number Diff line number Diff line
@@ -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 */

arch/riscv/kernel/module.c

+0 −15
Original line number Diff line number Diff line
@@ -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)