Commit 9ad21c3f authored by Sam Ravnborg's avatar Sam Ravnborg
Browse files

kbuild: try harder to find symbol names in modpost 



The relocation record sometimes contained an address
which was not an exactly match for a symbol.

Implment some simple logic such that if there
is a symbol within 20 bytes of the address contained
in the relocation record then print the name of this
symbol.

With this change modpost could find symbol names
for the remaining .init.text symbols in my
allyesconfig build for x86_64.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent d1f25e66

scripts/mod/modpost.c

+17 −2
Original line number Diff line number Diff line
@@ -776,10 +776,13 @@ static int secref_whitelist(const char *modname, const char *tosec, 
 * In other cases the symbol needs to be looked up in the symbol table

 * based on section and address.

 *  **/

static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf_Addr addr,

static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,

				Elf_Sym *relsym)

{

	Elf_Sym *sym;

	Elf_Sym *near = NULL;

	Elf64_Sword distance = 20;

	Elf64_Sword d;



	if (relsym->st_name != 0)

		return relsym;
@@ -790,7 +793,19 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf_Addr addr, 
			continue;

		if (sym->st_value == addr)

			return sym;

	}

		/* Find a symbol nearby - addr are maybe negative */

		d = sym->st_value - addr;

		if (d < 0)

			d = addr - sym->st_value;

		if (d < distance) {

			distance = d;

			near = sym;

		}

	}

	/* We need a close match */

	if (distance < 20)

		return near;

	else

		return NULL;

}

scripts/mod/modpost.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define Elf_Shdr    Elf32_Shdr

#define Elf_Sym     Elf32_Sym

#define Elf_Addr    Elf32_Addr

#define Elf_Sword   Elf64_Sword

#define Elf_Section Elf32_Half

#define ELF_ST_BIND ELF32_ST_BIND

#define ELF_ST_TYPE ELF32_ST_TYPE
@@ -31,6 +32,7 @@ 
#define Elf_Shdr    Elf64_Shdr

#define Elf_Sym     Elf64_Sym

#define Elf_Addr    Elf64_Addr

#define Elf_Sword   Elf64_Sxword

#define Elf_Section Elf64_Half

#define ELF_ST_BIND ELF64_ST_BIND

#define ELF_ST_TYPE ELF64_ST_TYPE

CRA Git | Maintained and supported by SUSTech CRA and CCSE