Commit 2fd98637 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Prepare func_desc_t for refactorisation 



In preparation of making func_desc_t generic, change the ELFv2
version to a struct containing 'addr' element.

This allows using single helpers common to ELFv1 and ELFv2 and
reduces the amount of #ifdef's

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5c36105e08b27b98450535bff48d71b690c19739.1644928018.git.christophe.leroy@csgroup.eu
parent 0a9c5ae2

arch/powerpc/kernel/module_64.c

+18 −18
Original line number Diff line number Diff line
@@ -33,19 +33,17 @@ 
#ifdef PPC64_ELF_ABI_v2



/* An address is simply the address of the function. */

typedef unsigned long func_desc_t;

typedef struct {

	unsigned long addr;

} func_desc_t;



static func_desc_t func_desc(unsigned long addr)

{

	return addr;

}

static unsigned long func_addr(unsigned long addr)

{

	return addr;

}

static unsigned long stub_func_addr(func_desc_t func)

{

	return func;

	func_desc_t desc = {

		.addr = addr,

	};



	return desc;

}



/* PowerPC64 specific values for the Elf64_Sym st_other field.  */
@@ -70,14 +68,6 @@ static func_desc_t func_desc(unsigned long addr) 
{

	return *(struct func_desc *)addr;

}

static unsigned long func_addr(unsigned long addr)

{

	return func_desc(addr).addr;

}

static unsigned long stub_func_addr(func_desc_t func)

{

	return func.addr;

}

static unsigned int local_entry_offset(const Elf64_Sym *sym)

{

	return 0;
@@ -93,6 +83,16 @@ void *dereference_module_function_descriptor(struct module *mod, void *ptr) 
}

#endif



static unsigned long func_addr(unsigned long addr)

{

	return func_desc(addr).addr;

}



static unsigned long stub_func_addr(func_desc_t func)

{

	return func.addr;

}



#define STUB_MAGIC 0x73747562 /* stub */



/* Like PPC32, we need little trampolines to do > 24-bit jumps (into