lkml.org 
[lkml]   [2022]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 10/25] powerpc: Finalise cleanup around ABI use
    Date
    Now that we have CONFIG_PPC64_ELF_ABI_V1 and CONFIG_PPC64_ELF_ABI_V2,
    get rid of all indirect detection of ABI version.

    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    ---
    arch/powerpc/Kconfig | 2 +-
    arch/powerpc/Makefile | 2 +-
    arch/powerpc/include/asm/types.h | 8 --------
    arch/powerpc/kernel/fadump.c | 13 ++++++++-----
    arch/powerpc/kernel/ptrace/ptrace.c | 6 ------
    arch/powerpc/net/bpf_jit_comp64.c | 4 ++--
    6 files changed, 12 insertions(+), 23 deletions(-)

    diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
    index 174edabb74fa..5514fed3f072 100644
    --- a/arch/powerpc/Kconfig
    +++ b/arch/powerpc/Kconfig
    @@ -208,7 +208,7 @@ config PPC
    select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
    select HAVE_FAST_GUP
    select HAVE_FTRACE_MCOUNT_RECORD
    - select HAVE_FUNCTION_DESCRIPTORS if PPC64 && !CPU_LITTLE_ENDIAN
    + select HAVE_FUNCTION_DESCRIPTORS if PPC64_ELF_ABI_V1
    select HAVE_FUNCTION_ERROR_INJECTION
    select HAVE_FUNCTION_GRAPH_TRACER
    select HAVE_FUNCTION_TRACER
    diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
    index 1ba98be84101..8bd3b631f094 100644
    --- a/arch/powerpc/Makefile
    +++ b/arch/powerpc/Makefile
    @@ -213,7 +213,7 @@ CHECKFLAGS += -m$(BITS) -D__powerpc__ -D__powerpc$(BITS)__
    ifdef CONFIG_CPU_BIG_ENDIAN
    CHECKFLAGS += -D__BIG_ENDIAN__
    else
    -CHECKFLAGS += -D__LITTLE_ENDIAN__ -D_CALL_ELF=2
    +CHECKFLAGS += -D__LITTLE_ENDIAN__
    endif

    ifdef CONFIG_476FPE_ERR46
    diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
    index 84078c28c1a2..93157a661dcc 100644
    --- a/arch/powerpc/include/asm/types.h
    +++ b/arch/powerpc/include/asm/types.h
    @@ -11,14 +11,6 @@

    #include <uapi/asm/types.h>

    -#ifdef __powerpc64__
    -#if defined(_CALL_ELF) && _CALL_ELF == 2
    -#define PPC64_ELF_ABI_v2 1
    -#else
    -#define PPC64_ELF_ABI_v1 1
    -#endif
    -#endif /* __powerpc64__ */
    -
    #ifndef __ASSEMBLY__

    typedef __vector128 vector128;
    diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
    index 65562c4a0a69..5f7224d66586 100644
    --- a/arch/powerpc/kernel/fadump.c
    +++ b/arch/powerpc/kernel/fadump.c
    @@ -968,11 +968,14 @@ static int fadump_init_elfcore_header(char *bufp)
    elf->e_entry = 0;
    elf->e_phoff = sizeof(struct elfhdr);
    elf->e_shoff = 0;
    -#if defined(_CALL_ELF)
    - elf->e_flags = _CALL_ELF;
    -#else
    - elf->e_flags = 0;
    -#endif
    +
    + if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2))
    + elf->e_flags = 2;
    + else if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V1))
    + elf->e_flags = 1;
    + else
    + elf->e_flags = 0;
    +
    elf->e_ehsize = sizeof(struct elfhdr);
    elf->e_phentsize = sizeof(struct elf_phdr);
    elf->e_phnum = 0;
    diff --git a/arch/powerpc/kernel/ptrace/ptrace.c b/arch/powerpc/kernel/ptrace/ptrace.c
    index 9fbe155a9bd0..4d2dc22d4a2d 100644
    --- a/arch/powerpc/kernel/ptrace/ptrace.c
    +++ b/arch/powerpc/kernel/ptrace/ptrace.c
    @@ -444,10 +444,4 @@ void __init pt_regs_check(void)
    * real registers.
    */
    BUILD_BUG_ON(PT_DSCR < sizeof(struct user_pt_regs) / sizeof(unsigned long));
    -
    -#ifdef CONFIG_PPC64_ELF_ABI_V1
    - BUILD_BUG_ON(!IS_ENABLED(CONFIG_HAVE_FUNCTION_DESCRIPTORS));
    -#else
    - BUILD_BUG_ON(IS_ENABLED(CONFIG_HAVE_FUNCTION_DESCRIPTORS));
    -#endif
    }
    diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c
    index d7b42f45669e..594c54931e20 100644
    --- a/arch/powerpc/net/bpf_jit_comp64.c
    +++ b/arch/powerpc/net/bpf_jit_comp64.c
    @@ -126,7 +126,7 @@ void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx)
    {
    int i;

    - if (__is_defined(CONFIG_PPC64_ELF_ABI_V2))
    + if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2))
    EMIT(PPC_RAW_LD(_R2, _R13, offsetof(struct paca_struct, kernel_toc)));

    /*
    @@ -266,7 +266,7 @@ static int bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 o
    int b2p_index = bpf_to_ppc(BPF_REG_3);
    int bpf_tailcall_prologue_size = 8;

    - if (__is_defined(CONFIG_PPC64_ELF_ABI_V2))
    + if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2))
    bpf_tailcall_prologue_size += 4; /* skip past the toc load */

    /*
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-05-09 07:48    [W:3.553 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site