From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751403AbeDXPPx (ORCPT ); Tue, 24 Apr 2018 11:15:53 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:56312 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770AbeDXPPv (ORCPT ); Tue, 24 Apr 2018 11:15:51 -0400 X-Google-Smtp-Source: AIpwx4/i4L8TlMpWrxZVeg8lv7nmVGSGXLc1TLbF1bun2X5T0L6fs2CkvhGUWDyEULfDc0Yli8q6LpaX/nSer2ETbyY= MIME-Version: 1.0 In-Reply-To: <20180424101302.922f38032a32ee2034ccfc05@arm.com> References: <20180416042240.21528-1-namhyung@kernel.org> <20180416092345.GA23274@krava> <20180416135125.GA23802@kernel.org> <20180416110730.1dd12801e43be66ea5d0cc48@arm.com> <20180416165800.GD3202@kernel.org> <20180416122407.0d90863b69fed80166384850@arm.com> <20180416174811.1aca9106364effe435f363c8@arm.com> <20180417022726.GA31947@sejong> <20180418193759.b63912fe5e5b8a9023ec80a8@arm.com> <20180419025424.GC13370@sejong> <20180419183313.db3e3a105191a7f30b7650b2@arm.com> <20180423164317.5a47f3dd9842d533413a1d4b@arm.com> <20180424075003.48ab0015efc0892832343546@arm.com> <20180424101302.922f38032a32ee2034ccfc05@arm.com> From: Ard Biesheuvel Date: Tue, 24 Apr 2018 17:15:50 +0200 Message-ID: Subject: Re: [PATCH] arm64/kernel: rename module_emit_adrp_veneer->module_emit_veneer_for_adrp To: Kim Phillips Cc: Catalin Marinas , linux-arm-kernel , Namhyung Kim , Will Deacon , Arnaldo Carvalho de Melo , Jiri Olsa , Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , kernel-team@lge.com, Michal Marek Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24 April 2018 at 17:13, Kim Phillips wrote: > Commit a257e02579e ("arm64/kernel: don't ban ADRP to work around > Cortex-A53 erratum #843419") introduced a function whose name ends with > "_veneer". > > This clashes with commit bd8b22d2888e ("Kbuild: kallsyms: ignore veneers > emitted by the ARM linker"), which removes symbols ending in "_veneer" > from kallsyms. > > The problem was manifested as 'perf test -vvvvv vmlinux' failed, > correctly claiming the symbol 'module_emit_adrp_veneer' was present in > vmlinux, but not in kallsyms. > > ... > ERR : 0xffff00000809aa58: module_emit_adrp_veneer not on kallsyms > ... > test child finished with -1 > ---- end ---- > vmlinux symtab matches kallsyms: FAILED! > > Fix the problem by renaming module_emit_veneer_for_adrp, > module_emit_veneer_for_adrp. That sentence didn't come out right > Now the test passes. > > Fixes: a257e02579e ("arm64/kernel: don't ban ADRP to work around Cortex-A53 erratum #843419") > Cc: Ard Biesheuvel > Cc: Will Deacon > Cc: Catalin Marinas > Cc: Michal Marek > Signed-off-by: Kim Phillips Acked-by: Ard Biesheuvel > --- > arch/arm64/include/asm/module.h | 2 +- > arch/arm64/kernel/module-plts.c | 2 +- > arch/arm64/kernel/module.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h > index b6dbbe3123a9..97d0ef12e2ff 100644 > --- a/arch/arm64/include/asm/module.h > +++ b/arch/arm64/include/asm/module.h > @@ -39,7 +39,7 @@ struct mod_arch_specific { > u64 module_emit_plt_entry(struct module *mod, void *loc, const Elf64_Rela *rela, > Elf64_Sym *sym); > > -u64 module_emit_adrp_veneer(struct module *mod, void *loc, u64 val); > +u64 module_emit_veneer_for_adrp(struct module *mod, void *loc, u64 val); > > #ifdef CONFIG_RANDOMIZE_BASE > extern u64 module_alloc_base; > diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c > index fa3637284a3d..f0690c2ca3e0 100644 > --- a/arch/arm64/kernel/module-plts.c > +++ b/arch/arm64/kernel/module-plts.c > @@ -43,7 +43,7 @@ u64 module_emit_plt_entry(struct module *mod, void *loc, const Elf64_Rela *rela, > } > > #ifdef CONFIG_ARM64_ERRATUM_843419 > -u64 module_emit_adrp_veneer(struct module *mod, void *loc, u64 val) > +u64 module_emit_veneer_for_adrp(struct module *mod, void *loc, u64 val) > { > struct mod_plt_sec *pltsec = !in_init(mod, loc) ? &mod->arch.core : > &mod->arch.init; > diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c > index 719fde8dcc19..155fd91e78f4 100644 > --- a/arch/arm64/kernel/module.c > +++ b/arch/arm64/kernel/module.c > @@ -215,7 +215,7 @@ static int reloc_insn_adrp(struct module *mod, __le32 *place, u64 val) > insn &= ~BIT(31); > } else { > /* out of range for ADR -> emit a veneer */ > - val = module_emit_adrp_veneer(mod, place, val & ~0xfff); > + val = module_emit_veneer_for_adrp(mod, place, val & ~0xfff); > if (!val) > return -ENOEXEC; > insn = aarch64_insn_gen_branch_imm((u64)place, val, > -- > 2.17.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: ard.biesheuvel@linaro.org (Ard Biesheuvel) Date: Tue, 24 Apr 2018 17:15:50 +0200 Subject: [PATCH] arm64/kernel: rename module_emit_adrp_veneer->module_emit_veneer_for_adrp In-Reply-To: <20180424101302.922f38032a32ee2034ccfc05@arm.com> References: <20180416042240.21528-1-namhyung@kernel.org> <20180416092345.GA23274@krava> <20180416135125.GA23802@kernel.org> <20180416110730.1dd12801e43be66ea5d0cc48@arm.com> <20180416165800.GD3202@kernel.org> <20180416122407.0d90863b69fed80166384850@arm.com> <20180416174811.1aca9106364effe435f363c8@arm.com> <20180417022726.GA31947@sejong> <20180418193759.b63912fe5e5b8a9023ec80a8@arm.com> <20180419025424.GC13370@sejong> <20180419183313.db3e3a105191a7f30b7650b2@arm.com> <20180423164317.5a47f3dd9842d533413a1d4b@arm.com> <20180424075003.48ab0015efc0892832343546@arm.com> <20180424101302.922f38032a32ee2034ccfc05@arm.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 24 April 2018 at 17:13, Kim Phillips wrote: > Commit a257e02579e ("arm64/kernel: don't ban ADRP to work around > Cortex-A53 erratum #843419") introduced a function whose name ends with > "_veneer". > > This clashes with commit bd8b22d2888e ("Kbuild: kallsyms: ignore veneers > emitted by the ARM linker"), which removes symbols ending in "_veneer" > from kallsyms. > > The problem was manifested as 'perf test -vvvvv vmlinux' failed, > correctly claiming the symbol 'module_emit_adrp_veneer' was present in > vmlinux, but not in kallsyms. > > ... > ERR : 0xffff00000809aa58: module_emit_adrp_veneer not on kallsyms > ... > test child finished with -1 > ---- end ---- > vmlinux symtab matches kallsyms: FAILED! > > Fix the problem by renaming module_emit_veneer_for_adrp, > module_emit_veneer_for_adrp. That sentence didn't come out right > Now the test passes. > > Fixes: a257e02579e ("arm64/kernel: don't ban ADRP to work around Cortex-A53 erratum #843419") > Cc: Ard Biesheuvel > Cc: Will Deacon > Cc: Catalin Marinas > Cc: Michal Marek > Signed-off-by: Kim Phillips Acked-by: Ard Biesheuvel > --- > arch/arm64/include/asm/module.h | 2 +- > arch/arm64/kernel/module-plts.c | 2 +- > arch/arm64/kernel/module.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/include/asm/module.h b/arch/arm64/include/asm/module.h > index b6dbbe3123a9..97d0ef12e2ff 100644 > --- a/arch/arm64/include/asm/module.h > +++ b/arch/arm64/include/asm/module.h > @@ -39,7 +39,7 @@ struct mod_arch_specific { > u64 module_emit_plt_entry(struct module *mod, void *loc, const Elf64_Rela *rela, > Elf64_Sym *sym); > > -u64 module_emit_adrp_veneer(struct module *mod, void *loc, u64 val); > +u64 module_emit_veneer_for_adrp(struct module *mod, void *loc, u64 val); > > #ifdef CONFIG_RANDOMIZE_BASE > extern u64 module_alloc_base; > diff --git a/arch/arm64/kernel/module-plts.c b/arch/arm64/kernel/module-plts.c > index fa3637284a3d..f0690c2ca3e0 100644 > --- a/arch/arm64/kernel/module-plts.c > +++ b/arch/arm64/kernel/module-plts.c > @@ -43,7 +43,7 @@ u64 module_emit_plt_entry(struct module *mod, void *loc, const Elf64_Rela *rela, > } > > #ifdef CONFIG_ARM64_ERRATUM_843419 > -u64 module_emit_adrp_veneer(struct module *mod, void *loc, u64 val) > +u64 module_emit_veneer_for_adrp(struct module *mod, void *loc, u64 val) > { > struct mod_plt_sec *pltsec = !in_init(mod, loc) ? &mod->arch.core : > &mod->arch.init; > diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c > index 719fde8dcc19..155fd91e78f4 100644 > --- a/arch/arm64/kernel/module.c > +++ b/arch/arm64/kernel/module.c > @@ -215,7 +215,7 @@ static int reloc_insn_adrp(struct module *mod, __le32 *place, u64 val) > insn &= ~BIT(31); > } else { > /* out of range for ADR -> emit a veneer */ > - val = module_emit_adrp_veneer(mod, place, val & ~0xfff); > + val = module_emit_veneer_for_adrp(mod, place, val & ~0xfff); > if (!val) > return -ENOEXEC; > insn = aarch64_insn_gen_branch_imm((u64)place, val, > -- > 2.17.0 >