bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f1f91b142b3c1082bdc1586ce71c9bac1e75213c.1644928018.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2022-02-15 13:41:03 +01:00 • committed by Michael Ellerman
parent a257cacc38
commit 0dc690e4ef
5 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/ia64/include/asm/sections.h
View file

@ -9,6 +9,9 @@
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
typedef struct fdesc func_desc_t;
#include <asm-generic/sections.h> #include <asm-generic/sections.h>
extern char __phys_per_cpu_start[]; extern char __phys_per_cpu_start[];

5
arch/parisc/include/asm/sections.h
View file

@ -2,6 +2,11 @@
#ifndef _PARISC_SECTIONS_H #ifndef _PARISC_SECTIONS_H
#define _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 */ /* nothing to see, move along */
#include <asm-generic/sections.h> #include <asm-generic/sections.h>

4
arch/powerpc/include/asm/sections.h
View file

@ -6,6 +6,10 @@
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#ifdef CONFIG_HAVE_FUNCTION_DESCRIPTORS
typedef struct func_desc func_desc_t;
#endif
#include <asm-generic/sections.h> #include <asm-generic/sections.h>
extern char __head_end[]; extern char __head_end[];

8
arch/powerpc/kernel/module_64.c
View file

@ -32,11 +32,6 @@
#ifdef PPC64_ELF_ABI_v2 #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) static func_desc_t func_desc(unsigned long addr)
{ {
func_desc_t desc = { func_desc_t desc = {
@ -61,9 +56,6 @@ static unsigned int local_entry_offset(const Elf64_Sym *sym)
} }
#else #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) static func_desc_t func_desc(unsigned long addr)
{ {
return *(struct func_desc *)addr; return *(struct func_desc *)addr;

5
include/asm-generic/sections.h
View file

@ -63,6 +63,11 @@ extern __visible const void __nosave_begin, __nosave_end;
#else #else
#define dereference_function_descriptor(p) ((void *)(p)) #define dereference_function_descriptor(p) ((void *)(p))
#define dereference_kernel_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 #endif
static inline bool have_function_descriptors(void) static inline bool have_function_descriptors(void)