leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: Define and use PPC64_ELF_ABI_v2/v1

Browse Source 
We're approaching 20 locations where we need to check for ELF ABI v2.
That's fine, except the logic is a bit awkward, because we have to check
that _CALL_ELF is defined and then what its value is.

So check it once in asm/types.h and define PPC64_ELF_ABI_v2 when ELF ABI
v2 is detected.

We also have a few places where what we're really trying to check is
that we are using the 64-bit v1 ABI, ie. function descriptors. So also
add a #define for that, which simplifies several checks.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2016-06-06 22:26:10 +05:30
parent ac9cd1709c
commit f55d966536
16 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/code-patching.h
View File

@ -49,8 +49,7 @@ void __patch_exception(int exc, unsigned long addr);
static inline unsigned long ppc_function_entry(void *func) static inline unsigned long ppc_function_entry(void *func)
{ {
#if defined(CONFIG_PPC64) #ifdef PPC64_ELF_ABI_v2
#if defined(_CALL_ELF) && _CALL_ELF == 2
u32 *insn = func; u32 *insn = func;
/* /*
@ -75,14 +74,13 @@ static inline unsigned long ppc_function_entry(void *func)
return (unsigned long)(insn + 2); return (unsigned long)(insn + 2);
else else
return (unsigned long)func; return (unsigned long)func;
#else #elif defined(PPC64_ELF_ABI_v1)
/* /*
* On PPC64 ABIv1 the function pointer actually points to the * On PPC64 ABIv1 the function pointer actually points to the
* function's descriptor. The first entry in the descriptor is the * function's descriptor. The first entry in the descriptor is the
* address of the function text. * address of the function text.
*/ */
return ((func_descr_t *)func)->entry; return ((func_descr_t *)func)->entry;
#endif
#else #else
return (unsigned long)func; return (unsigned long)func;
#endif #endif
@ -90,7 +88,7 @@ static inline unsigned long ppc_function_entry(void *func)
static inline unsigned long ppc_global_function_entry(void *func) static inline unsigned long ppc_global_function_entry(void *func)
{ {
#if defined(CONFIG_PPC64) && defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
/* PPC64 ABIv2 the global entry point is at the address */ /* PPC64 ABIv2 the global entry point is at the address */
return (unsigned long)func; return (unsigned long)func;
#else #else
@ -106,7 +104,7 @@ static inline unsigned long ppc_global_function_entry(void *func)
*/ */
/* This must match the definition of STK_GOT in <asm/ppc_asm.h> */ /* This must match the definition of STK_GOT in <asm/ppc_asm.h> */
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
#define R2_STACK_OFFSET 24 #define R2_STACK_OFFSET 24
#else #else
#define R2_STACK_OFFSET 40 #define R2_STACK_OFFSET 40

8
arch/powerpc/include/asm/ftrace.h
View File

@ -1,6 +1,8 @@
#ifndef _ASM_POWERPC_FTRACE #ifndef _ASM_POWERPC_FTRACE
#define _ASM_POWERPC_FTRACE #define _ASM_POWERPC_FTRACE
#include <asm/types.h>
#ifdef CONFIG_FUNCTION_TRACER #ifdef CONFIG_FUNCTION_TRACER
#define MCOUNT_ADDR ((unsigned long)(_mcount)) #define MCOUNT_ADDR ((unsigned long)(_mcount))
#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
@ -65,8 +67,8 @@ struct dyn_arch_ftrace {
#endif #endif
#endif #endif
#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64) && !defined(__ASSEMBLY__) #if defined(CONFIG_FTRACE_SYSCALLS) && !defined(__ASSEMBLY__)
#if !defined(_CALL_ELF) || _CALL_ELF != 2 #ifdef PPC64_ELF_ABI_v1
#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
static inline bool arch_syscall_match_sym_name(const char *sym, const char *name) static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)
{ {
@ -79,6 +81,6 @@ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name
return !strcmp(sym + 4, name + 3); return !strcmp(sym + 4, name + 3);
} }
#endif #endif
#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 && !__ASSEMBLY__ */ #endif /* CONFIG_FTRACE_SYSCALLS && !__ASSEMBLY__ */
#endif /* _ASM_POWERPC_FTRACE */ #endif /* _ASM_POWERPC_FTRACE */

8
arch/powerpc/include/asm/kprobes.h
View File

@ -40,8 +40,7 @@ struct kprobe;
typedef ppc_opcode_t kprobe_opcode_t; typedef ppc_opcode_t kprobe_opcode_t;
#define MAX_INSN_SIZE 1 #define MAX_INSN_SIZE 1
#ifdef CONFIG_PPC64 #ifdef PPC64_ELF_ABI_v2
#if defined(_CALL_ELF) && _CALL_ELF == 2
/* PPC64 ABIv2 needs local entry point */ /* PPC64 ABIv2 needs local entry point */
#define kprobe_lookup_name(name, addr) \ #define kprobe_lookup_name(name, addr) \
{ \ { \
@ -49,7 +48,7 @@ typedef ppc_opcode_t kprobe_opcode_t;
if (addr) \ if (addr) \
addr = (kprobe_opcode_t *)ppc_function_entry(addr); \ addr = (kprobe_opcode_t *)ppc_function_entry(addr); \
} }
#else #elif defined(PPC64_ELF_ABI_v1)
/* /*
* 64bit powerpc ABIv1 uses function descriptors: * 64bit powerpc ABIv1 uses function descriptors:
* - Check for the dot variant of the symbol first. * - Check for the dot variant of the symbol first.
@ -92,8 +91,7 @@ typedef ppc_opcode_t kprobe_opcode_t;
addr = (kprobe_opcode_t *)kallsyms_lookup_name(name); \ addr = (kprobe_opcode_t *)kallsyms_lookup_name(name); \
} \ } \
} }
#endif /* defined(_CALL_ELF) && _CALL_ELF == 2 */ #endif
#endif /* CONFIG_PPC64 */
#define flush_insn_slot(p) do { } while (0) #define flush_insn_slot(p) do { } while (0)
#define kretprobe_blacklist_size 0 #define kretprobe_blacklist_size 0

6
arch/powerpc/include/asm/linkage.h
View File

@ -1,8 +1,9 @@
#ifndef _ASM_POWERPC_LINKAGE_H #ifndef _ASM_POWERPC_LINKAGE_H
#define _ASM_POWERPC_LINKAGE_H #define _ASM_POWERPC_LINKAGE_H
#ifdef CONFIG_PPC64 #include <asm/types.h>
#if !defined(_CALL_ELF) || _CALL_ELF != 2
#ifdef PPC64_ELF_ABI_v1
#define cond_syscall(x) \ #define cond_syscall(x) \
asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n" \ asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n" \
"\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n") "\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n")
@ -10,6 +11,5 @@
asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n" \ asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n" \
"\t.globl ." #alias "\n\t.set ." #alias ", ." #name) "\t.globl ." #alias "\n\t.set ." #alias ", ." #name)
#endif #endif
#endif
#endif /* _ASM_POWERPC_LINKAGE_H */ #endif /* _ASM_POWERPC_LINKAGE_H */

4
arch/powerpc/include/asm/ppc_asm.h
View File

@ -189,7 +189,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
#define __STK_REG(i) (112 + ((i)-14)*8) #define __STK_REG(i) (112 + ((i)-14)*8)
#define STK_REG(i) __STK_REG(__REG_##i) #define STK_REG(i) __STK_REG(__REG_##i)
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
#define STK_GOT 24 #define STK_GOT 24
#define __STK_PARAM(i) (32 + ((i)-3)*8) #define __STK_PARAM(i) (32 + ((i)-3)*8)
#else #else
@ -198,7 +198,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
#endif #endif
#define STK_PARAM(i) __STK_PARAM(__REG_##i) #define STK_PARAM(i) __STK_PARAM(__REG_##i)
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
#define _GLOBAL(name) \ #define _GLOBAL(name) \
.section ".text"; \ .section ".text"; \

2
arch/powerpc/include/asm/ptrace.h
View File

@ -47,7 +47,7 @@
STACK_FRAME_OVERHEAD + KERNEL_REDZONE_SIZE) STACK_FRAME_OVERHEAD + KERNEL_REDZONE_SIZE)
#define STACK_FRAME_MARKER 12 #define STACK_FRAME_MARKER 12
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
#define STACK_FRAME_MIN_SIZE 32 #define STACK_FRAME_MIN_SIZE 32
#else #else
#define STACK_FRAME_MIN_SIZE STACK_FRAME_OVERHEAD #define STACK_FRAME_MIN_SIZE STACK_FRAME_OVERHEAD

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

@ -62,7 +62,7 @@ static inline int overlaps_kvm_tmp(unsigned long start, unsigned long end)
#endif #endif
} }
#if !defined(_CALL_ELF) || _CALL_ELF != 2 #ifdef PPC64_ELF_ABI_v1
#undef dereference_function_descriptor #undef dereference_function_descriptor
static inline void *dereference_function_descriptor(void *ptr) static inline void *dereference_function_descriptor(void *ptr)
{ {
@ -73,7 +73,7 @@ static inline void *dereference_function_descriptor(void *ptr)
ptr = p; ptr = p;
return ptr; return ptr;
} }
#endif #endif /* PPC64_ELF_ABI_v1 */
#endif #endif

8
arch/powerpc/include/asm/types.h
View File

@ -15,6 +15,14 @@
#include <uapi/asm/types.h> #include <uapi/asm/types.h>
#ifdef __powerpc64__
#if defined(_CALL_ELF) && _CALL_ELF == 2
#define PPC64_ELF_ABI_v2
#else
#define PPC64_ELF_ABI_v1
#endif
#endif /* __powerpc64__ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
typedef __vector128 vector128; typedef __vector128 vector128;

2
arch/powerpc/kernel/entry_64.S
View File

@ -453,7 +453,7 @@ _GLOBAL(ret_from_kernel_thread)
REST_NVGPRS(r1) REST_NVGPRS(r1)
mtlr r14 mtlr r14
mr r3,r15 mr r3,r15
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
mr r12,r14 mr r12,r14
#endif #endif
blrl blrl

4
arch/powerpc/kernel/ftrace.c
View File

@ -608,7 +608,7 @@ unsigned long __init arch_syscall_addr(int nr)
} }
#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */ #endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */
#if defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF != 2) #ifdef PPC64_ELF_ABI_v1
char *arch_ftrace_match_adjust(char *str, const char *search) char *arch_ftrace_match_adjust(char *str, const char *search)
{ {
if (str[0] == '.' && search[0] != '.') if (str[0] == '.' && search[0] != '.')
@ -616,4 +616,4 @@ char *arch_ftrace_match_adjust(char *str, const char *search)
else else
return str; return str;
} }
#endif /* defined(CONFIG_PPC64) && (!defined(_CALL_ELF) || _CALL_ELF != 2) */ #endif /* PPC64_ELF_ABI_v1 */

2
arch/powerpc/kernel/head_64.S
View File

@ -401,7 +401,7 @@ generic_secondary_common_init:
ld r12,CPU_SPEC_RESTORE(r23) ld r12,CPU_SPEC_RESTORE(r23)
cmpdi 0,r12,0 cmpdi 0,r12,0
beq 3f beq 3f
#if !defined(_CALL_ELF) || _CALL_ELF != 2 #ifdef PPC64_ELF_ABI_v1
ld r12,0(r12) ld r12,0(r12)
#endif #endif
mtctr r12 mtctr r12

6
arch/powerpc/kernel/kprobes.c
View File

@ -506,12 +506,10 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
/* setup return addr to the jprobe handler routine */ /* setup return addr to the jprobe handler routine */
regs->nip = arch_deref_entry_point(jp->entry); regs->nip = arch_deref_entry_point(jp->entry);
#ifdef CONFIG_PPC64 #ifdef PPC64_ELF_ABI_v2
#if defined(_CALL_ELF) && _CALL_ELF == 2
regs->gpr[12] = (unsigned long)jp->entry; regs->gpr[12] = (unsigned long)jp->entry;
#else #elif defined(PPC64_ELF_ABI_v1)
regs->gpr[2] = (unsigned long)(((func_descr_t *)jp->entry)->toc); regs->gpr[2] = (unsigned long)(((func_descr_t *)jp->entry)->toc);
#endif
#endif #endif
return 1; return 1;

2
arch/powerpc/kernel/misc_64.S
View File

@ -661,7 +661,7 @@ _GLOBAL(kexec_sequence)
#ifndef CONFIG_PPC_BOOK3E #ifndef CONFIG_PPC_BOOK3E
/* clear out hardware hash page table and tlb */ /* clear out hardware hash page table and tlb */
#if !defined(_CALL_ELF) || _CALL_ELF != 2 #ifdef PPC64_ELF_ABI_v1
ld r12,0(r27) /* deref function descriptor */ ld r12,0(r27) /* deref function descriptor */
#else #else
mr r12,r27 mr r12,r27

4
arch/powerpc/kernel/module_64.c
View File

@ -41,7 +41,7 @@
this, and makes other things simpler. Anton? this, and makes other things simpler. Anton?
--RR. */ --RR. */
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
/* An address is simply the address of the function. */ /* An address is simply the address of the function. */
typedef unsigned long func_desc_t; typedef unsigned long func_desc_t;
@ -132,7 +132,7 @@ static u32 ppc64_stub_insns[] = {
/* Save current r2 value in magic place on the stack. */ /* Save current r2 value in magic place on the stack. */
0xf8410000|R2_STACK_OFFSET, /* std r2,R2_STACK_OFFSET(r1) */ 0xf8410000|R2_STACK_OFFSET, /* std r2,R2_STACK_OFFSET(r1) */
0xe98b0020, /* ld r12,32(r11) */ 0xe98b0020, /* ld r12,32(r11) */
#if !defined(_CALL_ELF) || _CALL_ELF != 2 #ifdef PPC64_ELF_ABI_v1
/* Set up new r2 from function descriptor */ /* Set up new r2 from function descriptor */
0xe84b0028, /* ld r2,40(r11) */ 0xe84b0028, /* ld r2,40(r11) */
#endif #endif

2
arch/powerpc/kvm/book3s_interrupts.S
View File

@ -25,7 +25,7 @@
#include <asm/exception-64s.h> #include <asm/exception-64s.h>
#if defined(CONFIG_PPC_BOOK3S_64) #if defined(CONFIG_PPC_BOOK3S_64)
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
#define FUNC(name) name #define FUNC(name) name
#else #else
#define FUNC(name) GLUE(.,name) #define FUNC(name) GLUE(.,name)

2
arch/powerpc/kvm/book3s_rmhandlers.S
View File

@ -36,7 +36,7 @@
#if defined(CONFIG_PPC_BOOK3S_64) #if defined(CONFIG_PPC_BOOK3S_64)
#if defined(_CALL_ELF) && _CALL_ELF == 2 #ifdef PPC64_ELF_ABI_v2
#define FUNC(name) name #define FUNC(name) name
#else #else
#define FUNC(name) GLUE(.,name) #define FUNC(name) GLUE(.,name)