From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Sathvika Vasireddy <sv@linux.ibm.com>, "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org> Cc: "jpoimboe@redhat.com" <jpoimboe@redhat.com>, "peterz@infradead.org" <peterz@infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "aik@ozlabs.ru" <aik@ozlabs.ru>, "mpe@ellerman.id.au" <mpe@ellerman.id.au>, "mingo@redhat.com" <mingo@redhat.com>, "rostedt@goodmis.org" <rostedt@goodmis.org>, "mbenes@suse.cz" <mbenes@suse.cz>, "npiggin@gmail.com" <npiggin@gmail.com>, "chenzhongjin@huawei.com" <chenzhongjin@huawei.com>, "naveen.n.rao@linux.vnet.ibm.com" <naveen.n.rao@linux.vnet.ibm.com> Subject: Re: [PATCH v2 03/16] powerpc: Fix objtool unannotated intra-function call warnings Date: Tue, 30 Aug 2022 06:16:51 +0000 [thread overview] Message-ID: <5e7d555d-fb1a-264b-8941-bfcd6f72947a@csgroup.eu> (raw) In-Reply-To: <20220829055223.24767-4-sv@linux.ibm.com> Le 29/08/2022 à 07:52, Sathvika Vasireddy a écrit : > objtool throws unannotated intra-function call warnings > in the following assembly files: > > arch/powerpc/kernel/vector.o: warning: objtool: .text+0x53c: unannotated intra-function call > > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x60: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x124: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x5d4: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x5dc: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0xcb8: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0xd0c: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x1030: unannotated intra-function call > > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x358: unannotated intra-function call > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x728: unannotated intra-function call > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x4d94: unannotated intra-function call > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x4ec4: unannotated intra-function call > > arch/powerpc/kvm/book3s_hv_interrupts.o: warning: objtool: .text+0x6c: unannotated intra-function call > arch/powerpc/kernel/misc_64.o: warning: objtool: .text+0x64: unannotated intra-function call > > objtool does not add STT_NOTYPE symbols with size 0 to the > rbtree, which is why find_call_destination() function is not able > to find the destination symbol for 'bl' instruction. For such symbols, > objtool is throwing unannotated intra-function call warnings in > assembly files. Fix these warnings by adding SYM_FUNC_START_LOCAL() > and SYM_FUNC_END() annotations to those symbols to be able to set symbol > type to STT_FUNC and set size of these symbols accordingly. > > Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/kernel/exceptions-64s.S | 7 +++++-- > arch/powerpc/kernel/head_64.S | 7 +++++-- > arch/powerpc/kernel/misc_64.S | 4 +++- > arch/powerpc/kernel/vector.S | 4 +++- > arch/powerpc/kvm/book3s_hv_interrupts.S | 4 +++- > arch/powerpc/kvm/book3s_hv_rmhandlers.S | 22 +++++++++++++++------- > 6 files changed, 34 insertions(+), 14 deletions(-) > > diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S > index 3d0dc133a9ae..4242c1a20bcd 100644 > --- a/arch/powerpc/kernel/exceptions-64s.S > +++ b/arch/powerpc/kernel/exceptions-64s.S > @@ -20,6 +20,7 @@ > #include <asm/head-64.h> > #include <asm/feature-fixups.h> > #include <asm/kup.h> > +#include <linux/linkage.h> > > /* > * Following are fixed section helper macros. > @@ -3075,7 +3076,7 @@ CLOSE_FIXED_SECTION(virt_trampolines); > USE_TEXT_SECTION() > > /* MSR[RI] should be clear because this uses SRR[01] */ > -enable_machine_check: > +SYM_FUNC_START_LOCAL(enable_machine_check) > mflr r0 > bcl 20,31,$+4 > 0: mflr r3 > @@ -3087,9 +3088,10 @@ enable_machine_check: > RFI_TO_KERNEL > 1: mtlr r0 > blr > +SYM_FUNC_END(enable_machine_check) > > /* MSR[RI] should be clear because this uses SRR[01] */ > -disable_machine_check: > +SYM_FUNC_START_LOCAL(disable_machine_check) > mflr r0 > bcl 20,31,$+4 > 0: mflr r3 > @@ -3102,3 +3104,4 @@ disable_machine_check: > RFI_TO_KERNEL > 1: mtlr r0 > blr > +SYM_FUNC_END(disable_machine_check) > diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S > index cf2c08902c05..10e2d43420d0 100644 > --- a/arch/powerpc/kernel/head_64.S > +++ b/arch/powerpc/kernel/head_64.S > @@ -18,6 +18,7 @@ > * variants. > */ > > +#include <linux/linkage.h> > #include <linux/threads.h> > #include <linux/init.h> > #include <asm/reg.h> > @@ -465,7 +466,7 @@ generic_secondary_common_init: > * Assumes we're mapped EA == RA if the MMU is on. > */ > #ifdef CONFIG_PPC_BOOK3S > -__mmu_off: > +SYM_FUNC_START_LOCAL(__mmu_off) > mfmsr r3 > andi. r0,r3,MSR_IR|MSR_DR > beqlr > @@ -476,6 +477,7 @@ __mmu_off: > sync > rfid > b . /* prevent speculative execution */ > +SYM_FUNC_END(__mmu_off) > #endif > > > @@ -869,7 +871,7 @@ _GLOBAL(start_secondary_resume) > /* > * This subroutine clobbers r11 and r12 > */ > -enable_64b_mode: > +SYM_FUNC_START_LOCAL(enable_64b_mode) > mfmsr r11 /* grab the current MSR */ > #ifdef CONFIG_PPC_BOOK3E > oris r11,r11,0x8000 /* CM bit set, we'll set ICM later */ > @@ -881,6 +883,7 @@ enable_64b_mode: > isync > #endif > blr > +SYM_FUNC_END(enable_64b_mode) > > /* > * This puts the TOC pointer into r2, offset by 0x8000 (as expected > diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S > index fd6d8d3a548e..b36fb89ff718 100644 > --- a/arch/powerpc/kernel/misc_64.S > +++ b/arch/powerpc/kernel/misc_64.S > @@ -9,6 +9,7 @@ > * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com) > */ > > +#include <linux/linkage.h> > #include <linux/sys.h> > #include <asm/unistd.h> > #include <asm/errno.h> > @@ -353,7 +354,7 @@ _GLOBAL(kexec_smp_wait) > * > * don't overwrite r3 here, it is live for kexec_wait above. > */ > -real_mode: /* assume normal blr return */ > +SYM_FUNC_START_LOCAL(real_mode) /* assume normal blr return */ > #ifdef CONFIG_PPC_BOOK3E > /* Create an identity mapping. */ > b kexec_create_tlb > @@ -370,6 +371,7 @@ real_mode: /* assume normal blr return */ > mtspr SPRN_SRR0,r11 > rfid > #endif > +SYM_FUNC_END(real_mode) > > /* > * kexec_sequence(newstack, start, image, control, clear_all(), > diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S > index 5cc24d8cce94..fb96aed2b5c3 100644 > --- a/arch/powerpc/kernel/vector.S > +++ b/arch/powerpc/kernel/vector.S > @@ -9,6 +9,7 @@ > #include <asm/ptrace.h> > #include <asm/export.h> > #include <asm/asm-compat.h> > +#include <linux/linkage.h> > > /* > * Load state from memory into VMX registers including VSCR. > @@ -186,7 +187,7 @@ fphalf: > * Internal routine to enable floating point and set FPSCR to 0. > * Don't call it from C; it doesn't use the normal calling convention. > */ > -fpenable: > +SYM_FUNC_START_LOCAL(fpenable) > #ifdef CONFIG_PPC32 > stwu r1,-64(r1) > #else > @@ -203,6 +204,7 @@ fpenable: > mffs fr31 > MTFSF_L(fr1) > blr > +SYM_FUNC_END(fpenable) > > fpdisable: > mtlr r12 > diff --git a/arch/powerpc/kvm/book3s_hv_interrupts.S b/arch/powerpc/kvm/book3s_hv_interrupts.S > index 59d89e4b154a..c0deeea7eef3 100644 > --- a/arch/powerpc/kvm/book3s_hv_interrupts.S > +++ b/arch/powerpc/kvm/book3s_hv_interrupts.S > @@ -9,6 +9,7 @@ > * Authors: Alexander Graf <agraf@suse.de> > */ > > +#include <linux/linkage.h> > #include <asm/ppc_asm.h> > #include <asm/kvm_asm.h> > #include <asm/reg.h> > @@ -107,7 +108,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) > /* > * void kvmhv_save_host_pmu(void) > */ > -kvmhv_save_host_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_save_host_pmu) > BEGIN_FTR_SECTION > /* Work around P8 PMAE bug */ > li r3, -1 > @@ -154,3 +155,4 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > stw r8, HSTATE_PMC5(r13) > stw r9, HSTATE_PMC6(r13) > 31: blr > +SYM_FUNC_END(kvmhv_save_host_pmu) > diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S > index 7ded202bf995..de91118df0c5 100644 > --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S > +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S > @@ -29,6 +29,7 @@ > #include <asm/asm-compat.h> > #include <asm/feature-fixups.h> > #include <asm/cpuidle.h> > +#include <linux/linkage.h> > > /* Values in HSTATE_NAPPING(r13) */ > #define NAPPING_CEDE 1 > @@ -2358,7 +2359,7 @@ hmi_realmode: > * This routine calls kvmppc_read_intr, a C function, if an external > * interrupt is pending. > */ > -kvmppc_check_wake_reason: > +SYM_FUNC_START_LOCAL(kvmppc_check_wake_reason) > mfspr r6, SPRN_SRR1 > BEGIN_FTR_SECTION > rlwinm r6, r6, 45-31, 0xf /* extract wake reason field (P8) */ > @@ -2427,6 +2428,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > addi r1, r1, PPC_MIN_STKFRM > mtlr r0 > blr > +SYM_FUNC_END(kvmppc_check_wake_reason) > > /* > * Save away FP, VMX and VSX registers. > @@ -2434,7 +2436,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > * N.B. r30 and r31 are volatile across this function, > * thus it is not callable from C. > */ > -kvmppc_save_fp: > +SYM_FUNC_START_LOCAL(kvmppc_save_fp) > mflr r30 > mr r31,r3 > mfmsr r5 > @@ -2462,6 +2464,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) > stw r6,VCPU_VRSAVE(r31) > mtlr r30 > blr > +SYM_FUNC_END(kvmppc_save_fp) > > /* > * Load up FP, VMX and VSX registers > @@ -2469,7 +2472,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) > * N.B. r30 and r31 are volatile across this function, > * thus it is not callable from C. > */ > -kvmppc_load_fp: > +SYM_FUNC_START_LOCAL(kvmppc_load_fp) > mflr r30 > mr r31,r4 > mfmsr r9 > @@ -2498,6 +2501,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) > mtlr r30 > mr r4,r31 > blr > +SYM_FUNC_END(kvmppc_load_fp) > > #ifdef CONFIG_PPC_TRANSACTIONAL_MEM > /* > @@ -2746,7 +2750,7 @@ kvmppc_bad_host_intr: > * r9 has a vcpu pointer (in) > * r0 is used as a scratch register > */ > -kvmppc_msr_interrupt: > +SYM_FUNC_START_LOCAL(kvmppc_msr_interrupt) > rldicl r0, r11, 64 - MSR_TS_S_LG, 62 > cmpwi r0, 2 /* Check if we are in transactional state.. */ > ld r11, VCPU_INTR_MSR(r9) > @@ -2755,13 +2759,14 @@ kvmppc_msr_interrupt: > li r0, 1 > 1: rldimi r11, r0, MSR_TS_S_LG, 63 - MSR_TS_T_LG > blr > +SYM_FUNC_END(kvmppc_msr_interrupt) > > /* > * void kvmhv_load_guest_pmu(struct kvm_vcpu *vcpu) > * > * Load up guest PMU state. R3 points to the vcpu struct. > */ > -kvmhv_load_guest_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_load_guest_pmu) > mr r4, r3 > mflr r0 > li r3, 1 > @@ -2811,13 +2816,14 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > isync > mtlr r0 > blr > +SYM_FUNC_END(kvmhv_load_guest_pmu) > > /* > * void kvmhv_load_host_pmu(void) > * > * Reload host PMU state saved in the PACA by kvmhv_save_host_pmu. > */ > -kvmhv_load_host_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_load_host_pmu) > mflr r0 > lbz r4, PACA_PMCINUSE(r13) /* is the host using the PMU? */ > cmpwi r4, 0 > @@ -2859,6 +2865,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > isync > mtlr r0 > 23: blr > +SYM_FUNC_END(kvmhv_load_host_pmu) > > /* > * void kvmhv_save_guest_pmu(struct kvm_vcpu *vcpu, bool pmu_in_use) > @@ -2866,7 +2873,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > * Save guest PMU state into the vcpu struct. > * r3 = vcpu, r4 = full save flag (PMU in use flag set in VPA) > */ > -kvmhv_save_guest_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_save_guest_pmu) > mr r9, r3 > mr r8, r4 > BEGIN_FTR_SECTION > @@ -2942,6 +2949,7 @@ BEGIN_FTR_SECTION > mtspr SPRN_MMCRS, r4 > END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > 22: blr > +SYM_FUNC_END(kvmhv_save_guest_pmu) > > /* > * This works around a hardware bug on POWER8E processors, where
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Sathvika Vasireddy <sv@linux.ibm.com>, "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org> Cc: "peterz@infradead.org" <peterz@infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "rostedt@goodmis.org" <rostedt@goodmis.org>, "aik@ozlabs.ru" <aik@ozlabs.ru>, "mingo@redhat.com" <mingo@redhat.com>, "npiggin@gmail.com" <npiggin@gmail.com>, "jpoimboe@redhat.com" <jpoimboe@redhat.com>, "naveen.n.rao@linux.vnet.ibm.com" <naveen.n.rao@linux.vnet.ibm.com>, "mbenes@suse.cz" <mbenes@suse.cz>, "chenzhongjin@huawei.com" <chenzhongjin@huawei.com> Subject: Re: [PATCH v2 03/16] powerpc: Fix objtool unannotated intra-function call warnings Date: Tue, 30 Aug 2022 06:16:51 +0000 [thread overview] Message-ID: <5e7d555d-fb1a-264b-8941-bfcd6f72947a@csgroup.eu> (raw) In-Reply-To: <20220829055223.24767-4-sv@linux.ibm.com> Le 29/08/2022 à 07:52, Sathvika Vasireddy a écrit : > objtool throws unannotated intra-function call warnings > in the following assembly files: > > arch/powerpc/kernel/vector.o: warning: objtool: .text+0x53c: unannotated intra-function call > > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x60: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x124: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x5d4: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x5dc: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0xcb8: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0xd0c: unannotated intra-function call > arch/powerpc/kvm/book3s_hv_rmhandlers.o: warning: objtool: .text+0x1030: unannotated intra-function call > > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x358: unannotated intra-function call > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x728: unannotated intra-function call > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x4d94: unannotated intra-function call > arch/powerpc/kernel/head_64.o: warning: objtool: .text+0x4ec4: unannotated intra-function call > > arch/powerpc/kvm/book3s_hv_interrupts.o: warning: objtool: .text+0x6c: unannotated intra-function call > arch/powerpc/kernel/misc_64.o: warning: objtool: .text+0x64: unannotated intra-function call > > objtool does not add STT_NOTYPE symbols with size 0 to the > rbtree, which is why find_call_destination() function is not able > to find the destination symbol for 'bl' instruction. For such symbols, > objtool is throwing unannotated intra-function call warnings in > assembly files. Fix these warnings by adding SYM_FUNC_START_LOCAL() > and SYM_FUNC_END() annotations to those symbols to be able to set symbol > type to STT_FUNC and set size of these symbols accordingly. > > Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com> Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/kernel/exceptions-64s.S | 7 +++++-- > arch/powerpc/kernel/head_64.S | 7 +++++-- > arch/powerpc/kernel/misc_64.S | 4 +++- > arch/powerpc/kernel/vector.S | 4 +++- > arch/powerpc/kvm/book3s_hv_interrupts.S | 4 +++- > arch/powerpc/kvm/book3s_hv_rmhandlers.S | 22 +++++++++++++++------- > 6 files changed, 34 insertions(+), 14 deletions(-) > > diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S > index 3d0dc133a9ae..4242c1a20bcd 100644 > --- a/arch/powerpc/kernel/exceptions-64s.S > +++ b/arch/powerpc/kernel/exceptions-64s.S > @@ -20,6 +20,7 @@ > #include <asm/head-64.h> > #include <asm/feature-fixups.h> > #include <asm/kup.h> > +#include <linux/linkage.h> > > /* > * Following are fixed section helper macros. > @@ -3075,7 +3076,7 @@ CLOSE_FIXED_SECTION(virt_trampolines); > USE_TEXT_SECTION() > > /* MSR[RI] should be clear because this uses SRR[01] */ > -enable_machine_check: > +SYM_FUNC_START_LOCAL(enable_machine_check) > mflr r0 > bcl 20,31,$+4 > 0: mflr r3 > @@ -3087,9 +3088,10 @@ enable_machine_check: > RFI_TO_KERNEL > 1: mtlr r0 > blr > +SYM_FUNC_END(enable_machine_check) > > /* MSR[RI] should be clear because this uses SRR[01] */ > -disable_machine_check: > +SYM_FUNC_START_LOCAL(disable_machine_check) > mflr r0 > bcl 20,31,$+4 > 0: mflr r3 > @@ -3102,3 +3104,4 @@ disable_machine_check: > RFI_TO_KERNEL > 1: mtlr r0 > blr > +SYM_FUNC_END(disable_machine_check) > diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S > index cf2c08902c05..10e2d43420d0 100644 > --- a/arch/powerpc/kernel/head_64.S > +++ b/arch/powerpc/kernel/head_64.S > @@ -18,6 +18,7 @@ > * variants. > */ > > +#include <linux/linkage.h> > #include <linux/threads.h> > #include <linux/init.h> > #include <asm/reg.h> > @@ -465,7 +466,7 @@ generic_secondary_common_init: > * Assumes we're mapped EA == RA if the MMU is on. > */ > #ifdef CONFIG_PPC_BOOK3S > -__mmu_off: > +SYM_FUNC_START_LOCAL(__mmu_off) > mfmsr r3 > andi. r0,r3,MSR_IR|MSR_DR > beqlr > @@ -476,6 +477,7 @@ __mmu_off: > sync > rfid > b . /* prevent speculative execution */ > +SYM_FUNC_END(__mmu_off) > #endif > > > @@ -869,7 +871,7 @@ _GLOBAL(start_secondary_resume) > /* > * This subroutine clobbers r11 and r12 > */ > -enable_64b_mode: > +SYM_FUNC_START_LOCAL(enable_64b_mode) > mfmsr r11 /* grab the current MSR */ > #ifdef CONFIG_PPC_BOOK3E > oris r11,r11,0x8000 /* CM bit set, we'll set ICM later */ > @@ -881,6 +883,7 @@ enable_64b_mode: > isync > #endif > blr > +SYM_FUNC_END(enable_64b_mode) > > /* > * This puts the TOC pointer into r2, offset by 0x8000 (as expected > diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S > index fd6d8d3a548e..b36fb89ff718 100644 > --- a/arch/powerpc/kernel/misc_64.S > +++ b/arch/powerpc/kernel/misc_64.S > @@ -9,6 +9,7 @@ > * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com) > */ > > +#include <linux/linkage.h> > #include <linux/sys.h> > #include <asm/unistd.h> > #include <asm/errno.h> > @@ -353,7 +354,7 @@ _GLOBAL(kexec_smp_wait) > * > * don't overwrite r3 here, it is live for kexec_wait above. > */ > -real_mode: /* assume normal blr return */ > +SYM_FUNC_START_LOCAL(real_mode) /* assume normal blr return */ > #ifdef CONFIG_PPC_BOOK3E > /* Create an identity mapping. */ > b kexec_create_tlb > @@ -370,6 +371,7 @@ real_mode: /* assume normal blr return */ > mtspr SPRN_SRR0,r11 > rfid > #endif > +SYM_FUNC_END(real_mode) > > /* > * kexec_sequence(newstack, start, image, control, clear_all(), > diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S > index 5cc24d8cce94..fb96aed2b5c3 100644 > --- a/arch/powerpc/kernel/vector.S > +++ b/arch/powerpc/kernel/vector.S > @@ -9,6 +9,7 @@ > #include <asm/ptrace.h> > #include <asm/export.h> > #include <asm/asm-compat.h> > +#include <linux/linkage.h> > > /* > * Load state from memory into VMX registers including VSCR. > @@ -186,7 +187,7 @@ fphalf: > * Internal routine to enable floating point and set FPSCR to 0. > * Don't call it from C; it doesn't use the normal calling convention. > */ > -fpenable: > +SYM_FUNC_START_LOCAL(fpenable) > #ifdef CONFIG_PPC32 > stwu r1,-64(r1) > #else > @@ -203,6 +204,7 @@ fpenable: > mffs fr31 > MTFSF_L(fr1) > blr > +SYM_FUNC_END(fpenable) > > fpdisable: > mtlr r12 > diff --git a/arch/powerpc/kvm/book3s_hv_interrupts.S b/arch/powerpc/kvm/book3s_hv_interrupts.S > index 59d89e4b154a..c0deeea7eef3 100644 > --- a/arch/powerpc/kvm/book3s_hv_interrupts.S > +++ b/arch/powerpc/kvm/book3s_hv_interrupts.S > @@ -9,6 +9,7 @@ > * Authors: Alexander Graf <agraf@suse.de> > */ > > +#include <linux/linkage.h> > #include <asm/ppc_asm.h> > #include <asm/kvm_asm.h> > #include <asm/reg.h> > @@ -107,7 +108,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_207S) > /* > * void kvmhv_save_host_pmu(void) > */ > -kvmhv_save_host_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_save_host_pmu) > BEGIN_FTR_SECTION > /* Work around P8 PMAE bug */ > li r3, -1 > @@ -154,3 +155,4 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > stw r8, HSTATE_PMC5(r13) > stw r9, HSTATE_PMC6(r13) > 31: blr > +SYM_FUNC_END(kvmhv_save_host_pmu) > diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S > index 7ded202bf995..de91118df0c5 100644 > --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S > +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S > @@ -29,6 +29,7 @@ > #include <asm/asm-compat.h> > #include <asm/feature-fixups.h> > #include <asm/cpuidle.h> > +#include <linux/linkage.h> > > /* Values in HSTATE_NAPPING(r13) */ > #define NAPPING_CEDE 1 > @@ -2358,7 +2359,7 @@ hmi_realmode: > * This routine calls kvmppc_read_intr, a C function, if an external > * interrupt is pending. > */ > -kvmppc_check_wake_reason: > +SYM_FUNC_START_LOCAL(kvmppc_check_wake_reason) > mfspr r6, SPRN_SRR1 > BEGIN_FTR_SECTION > rlwinm r6, r6, 45-31, 0xf /* extract wake reason field (P8) */ > @@ -2427,6 +2428,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > addi r1, r1, PPC_MIN_STKFRM > mtlr r0 > blr > +SYM_FUNC_END(kvmppc_check_wake_reason) > > /* > * Save away FP, VMX and VSX registers. > @@ -2434,7 +2436,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > * N.B. r30 and r31 are volatile across this function, > * thus it is not callable from C. > */ > -kvmppc_save_fp: > +SYM_FUNC_START_LOCAL(kvmppc_save_fp) > mflr r30 > mr r31,r3 > mfmsr r5 > @@ -2462,6 +2464,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) > stw r6,VCPU_VRSAVE(r31) > mtlr r30 > blr > +SYM_FUNC_END(kvmppc_save_fp) > > /* > * Load up FP, VMX and VSX registers > @@ -2469,7 +2472,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) > * N.B. r30 and r31 are volatile across this function, > * thus it is not callable from C. > */ > -kvmppc_load_fp: > +SYM_FUNC_START_LOCAL(kvmppc_load_fp) > mflr r30 > mr r31,r4 > mfmsr r9 > @@ -2498,6 +2501,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) > mtlr r30 > mr r4,r31 > blr > +SYM_FUNC_END(kvmppc_load_fp) > > #ifdef CONFIG_PPC_TRANSACTIONAL_MEM > /* > @@ -2746,7 +2750,7 @@ kvmppc_bad_host_intr: > * r9 has a vcpu pointer (in) > * r0 is used as a scratch register > */ > -kvmppc_msr_interrupt: > +SYM_FUNC_START_LOCAL(kvmppc_msr_interrupt) > rldicl r0, r11, 64 - MSR_TS_S_LG, 62 > cmpwi r0, 2 /* Check if we are in transactional state.. */ > ld r11, VCPU_INTR_MSR(r9) > @@ -2755,13 +2759,14 @@ kvmppc_msr_interrupt: > li r0, 1 > 1: rldimi r11, r0, MSR_TS_S_LG, 63 - MSR_TS_T_LG > blr > +SYM_FUNC_END(kvmppc_msr_interrupt) > > /* > * void kvmhv_load_guest_pmu(struct kvm_vcpu *vcpu) > * > * Load up guest PMU state. R3 points to the vcpu struct. > */ > -kvmhv_load_guest_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_load_guest_pmu) > mr r4, r3 > mflr r0 > li r3, 1 > @@ -2811,13 +2816,14 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > isync > mtlr r0 > blr > +SYM_FUNC_END(kvmhv_load_guest_pmu) > > /* > * void kvmhv_load_host_pmu(void) > * > * Reload host PMU state saved in the PACA by kvmhv_save_host_pmu. > */ > -kvmhv_load_host_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_load_host_pmu) > mflr r0 > lbz r4, PACA_PMCINUSE(r13) /* is the host using the PMU? */ > cmpwi r4, 0 > @@ -2859,6 +2865,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > isync > mtlr r0 > 23: blr > +SYM_FUNC_END(kvmhv_load_host_pmu) > > /* > * void kvmhv_save_guest_pmu(struct kvm_vcpu *vcpu, bool pmu_in_use) > @@ -2866,7 +2873,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > * Save guest PMU state into the vcpu struct. > * r3 = vcpu, r4 = full save flag (PMU in use flag set in VPA) > */ > -kvmhv_save_guest_pmu: > +SYM_FUNC_START_LOCAL(kvmhv_save_guest_pmu) > mr r9, r3 > mr r8, r4 > BEGIN_FTR_SECTION > @@ -2942,6 +2949,7 @@ BEGIN_FTR_SECTION > mtspr SPRN_MMCRS, r4 > END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) > 22: blr > +SYM_FUNC_END(kvmhv_save_guest_pmu) > > /* > * This works around a hardware bug on POWER8E processors, where
next prev parent reply other threads:[~2022-08-30 6:17 UTC|newest] Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-29 5:52 [PATCH v2 00/16] objtool: Enable and implement --mcount option on powerpc Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-29 5:52 ` [PATCH v2 01/16] powerpc: Replace unreachable() with it's builtin variant in __WARN_FLAGS() Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:15 ` Christophe Leroy 2022-08-30 6:15 ` Christophe Leroy 2022-09-05 10:18 ` Naveen N. Rao 2022-09-05 10:18 ` Naveen N. Rao 2022-08-29 5:52 ` [PATCH v2 02/16] powerpc: override __ALIGN() and __ALIGN_STR() macros Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-29 13:26 ` Christophe Leroy 2022-08-29 13:26 ` Christophe Leroy 2022-08-29 14:39 ` Sathvika Vasireddy 2022-08-29 14:39 ` Sathvika Vasireddy 2022-08-31 3:24 ` Nicholas Piggin 2022-08-31 3:24 ` Nicholas Piggin 2022-08-31 7:22 ` Michael Ellerman 2022-08-31 7:22 ` Michael Ellerman 2022-09-05 11:03 ` Peter Zijlstra 2022-09-05 11:03 ` Peter Zijlstra 2022-08-29 5:52 ` [PATCH v2 03/16] powerpc: Fix objtool unannotated intra-function call warnings Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:16 ` Christophe Leroy [this message] 2022-08-30 6:16 ` Christophe Leroy 2022-08-30 12:42 ` Christophe Leroy 2022-08-30 12:42 ` Christophe Leroy 2022-09-05 11:02 ` Peter Zijlstra 2022-09-05 11:02 ` Peter Zijlstra 2022-08-29 5:52 ` [PATCH v2 04/16] powerpc: Curb objtool unannotated intra-function warnings Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:26 ` Christophe Leroy 2022-08-30 6:26 ` Christophe Leroy 2022-08-29 5:52 ` [PATCH v2 05/16] powerpc: Skip objtool from running on drivers/crypto/vmx/aesp8-ppc.o Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:26 ` Christophe Leroy 2022-08-30 6:26 ` Christophe Leroy 2022-09-01 19:17 ` Peter Zijlstra 2022-09-01 19:17 ` Peter Zijlstra 2022-09-05 10:47 ` Naveen N. Rao 2022-09-05 10:47 ` Naveen N. Rao 2022-08-29 5:52 ` [PATCH v2 06/16] powerpc: Fix objtool unannotated intra-function call warnings on PPC32 Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-29 5:52 ` [PATCH v2 07/16] powerpc: Skip objtool from running on VDSO files Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:27 ` Christophe Leroy 2022-08-30 6:27 ` Christophe Leroy 2022-09-01 19:19 ` Peter Zijlstra 2022-09-01 19:19 ` Peter Zijlstra 2022-09-02 7:40 ` Michael Ellerman 2022-09-02 7:40 ` Michael Ellerman 2022-08-29 5:52 ` [PATCH v2 08/16] objtool: Fix SEGFAULT Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-09-01 19:20 ` Peter Zijlstra 2022-09-01 19:20 ` Peter Zijlstra 2022-09-02 8:06 ` Christophe Leroy 2022-09-02 8:06 ` Christophe Leroy 2022-09-02 8:42 ` Peter Zijlstra 2022-09-02 8:42 ` Peter Zijlstra 2022-08-29 5:52 ` [PATCH v2 09/16] objtool: Use target file endianness instead of a compiled constant Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-09-01 19:22 ` Peter Zijlstra 2022-09-01 19:22 ` Peter Zijlstra 2022-08-29 5:52 ` [PATCH v2 10/16] objtool: Use target file class size " Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-09-01 19:23 ` Peter Zijlstra 2022-09-01 19:23 ` Peter Zijlstra 2022-08-29 5:52 ` [PATCH v2 11/16] objtool: Add --mnop as an option to --mcount Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:28 ` Christophe Leroy 2022-08-30 6:28 ` Christophe Leroy 2022-09-01 19:25 ` Peter Zijlstra 2022-09-01 19:25 ` Peter Zijlstra 2022-09-05 10:55 ` Naveen N. Rao 2022-09-05 10:55 ` Naveen N. Rao 2022-08-29 5:52 ` [PATCH v2 12/16] objtool: Read special sections with alts only when specific options are selected Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:31 ` Christophe Leroy 2022-08-30 6:31 ` Christophe Leroy 2022-08-29 5:52 ` [PATCH v2 13/16] objtool: Use macros to define arch specific reloc types Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:33 ` Christophe Leroy 2022-08-30 6:33 ` Christophe Leroy 2022-09-01 19:28 ` Peter Zijlstra 2022-09-01 19:28 ` Peter Zijlstra 2022-08-29 5:52 ` [PATCH v2 14/16] objtool: Add arch specific function arch_ftrace_match() Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:36 ` Christophe Leroy 2022-08-30 6:36 ` Christophe Leroy 2022-08-29 5:52 ` [PATCH v2 15/16] objtool/powerpc: Enable objtool to be built on ppc Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:41 ` Christophe Leroy 2022-08-30 6:41 ` Christophe Leroy 2022-09-05 10:37 ` Naveen N. Rao 2022-09-05 10:37 ` Naveen N. Rao 2023-02-04 8:19 ` Randy Dunlap 2023-02-04 8:19 ` Randy Dunlap 2023-02-04 8:21 ` Randy Dunlap 2023-02-04 8:21 ` Randy Dunlap 2023-02-04 8:30 ` Randy Dunlap 2023-02-04 8:30 ` Randy Dunlap 2023-02-04 11:55 ` Christophe Leroy 2023-02-04 11:55 ` Christophe Leroy 2023-02-04 13:10 ` Christophe Leroy 2023-02-04 13:10 ` Christophe Leroy 2023-02-04 15:47 ` Josh Poimboeuf 2023-02-04 15:47 ` Josh Poimboeuf 2022-09-01 9:32 ` Christophe Leroy 2022-09-01 9:32 ` Christophe Leroy 2022-09-01 15:11 ` Segher Boessenkool 2022-09-01 15:11 ` Segher Boessenkool 2022-09-01 16:38 ` Christophe Leroy 2022-09-01 16:38 ` Christophe Leroy 2022-09-01 19:01 ` Peter Zijlstra 2022-09-01 19:01 ` Peter Zijlstra 2022-08-29 5:52 ` [PATCH v2 16/16] objtool/powerpc: Add --mcount specific implementation Sathvika Vasireddy 2022-08-29 5:52 ` Sathvika Vasireddy 2022-08-30 6:44 ` Christophe Leroy 2022-08-30 6:44 ` Christophe Leroy 2022-08-31 12:50 ` Christophe Leroy 2022-08-31 12:50 ` Christophe Leroy 2022-08-31 17:51 ` Segher Boessenkool 2022-08-31 17:51 ` Segher Boessenkool 2022-09-05 10:45 ` Naveen N. Rao 2022-09-05 10:45 ` Naveen N. Rao 2022-09-05 20:43 ` Segher Boessenkool 2022-09-05 20:43 ` Segher Boessenkool 2022-09-06 6:22 ` Christophe Leroy 2022-09-06 6:22 ` Christophe Leroy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=5e7d555d-fb1a-264b-8941-bfcd6f72947a@csgroup.eu \ --to=christophe.leroy@csgroup.eu \ --cc=aik@ozlabs.ru \ --cc=chenzhongjin@huawei.com \ --cc=jpoimboe@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mbenes@suse.cz \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=naveen.n.rao@linux.vnet.ibm.com \ --cc=npiggin@gmail.com \ --cc=peterz@infradead.org \ --cc=rostedt@goodmis.org \ --cc=sv@linux.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.