Commit 0dc690e4 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

asm-generic: Define 'func_desc_t' to commonly describe function descriptors 



We have three architectures using function descriptors, each with its
own type and name.

Add a common typedef that can be used in generic code.

Also add a stub typedef for architecture without function descriptors,
to avoid a forest of #ifdefs.

It replaces the similar 'func_desc_t' previously defined in
arch/powerpc/kernel/module_64.c

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f1f91b142b3c1082bdc1586ce71c9bac1e75213c.1644928018.git.christophe.leroy@csgroup.eu
parent a257cacc

arch/ia64/include/asm/sections.h

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 


#include <linux/elf.h>

#include <linux/uaccess.h>



typedef struct fdesc func_desc_t;



#include <asm-generic/sections.h>



extern char __phys_per_cpu_start[];

arch/parisc/include/asm/sections.h

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 
#ifndef _PARISC_SECTIONS_H

#define _PARISC_SECTIONS_H



#ifdef CONFIG_HAVE_FUNCTION_DESCRIPTORS

#include <asm/elf.h>

typedef Elf64_Fdesc func_desc_t;

#endif



/* nothing to see, move along */

#include <asm-generic/sections.h>

arch/powerpc/include/asm/sections.h

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
#include <linux/elf.h>

#include <linux/uaccess.h>



#ifdef CONFIG_HAVE_FUNCTION_DESCRIPTORS

typedef struct func_desc func_desc_t;

#endif



#include <asm-generic/sections.h>



extern char __head_end[];

arch/powerpc/kernel/module_64.c

+0 −8
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ 


#ifdef PPC64_ELF_ABI_v2



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

typedef struct {

	unsigned long addr;

} func_desc_t;



static func_desc_t func_desc(unsigned long addr)

{

	func_desc_t desc = {
@@ -61,9 +56,6 @@ static unsigned int local_entry_offset(const Elf64_Sym *sym) 
}

#else



/* An address is address of the OPD entry, which contains address of fn. */

typedef struct func_desc func_desc_t;



static func_desc_t func_desc(unsigned long addr)

{

	return *(struct func_desc *)addr;

include/asm-generic/sections.h

+5 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ extern __visible const void __nosave_begin, __nosave_end; 
#else

#define dereference_function_descriptor(p) ((void *)(p))

#define dereference_kernel_function_descriptor(p) ((void *)(p))



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

typedef struct {

	unsigned long addr;

} func_desc_t;

#endif



static inline bool have_function_descriptors(void)