Re: [PATCH v2 1/3] powerpc: inline doorbell sending functions

2020-07-21 Thread Michael Ellerman
Nicholas Piggin  writes:
> These are only called in one place for a given platform, so inline them
> for performance.
>
> Signed-off-by: Nicholas Piggin 
> ---
>  arch/powerpc/include/asm/dbell.h | 63 ++--
>  arch/powerpc/kernel/dbell.c  | 55 
>  2 files changed, 60 insertions(+), 58 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/dbell.h 
> b/arch/powerpc/include/asm/dbell.h
> index 4ce6808deed3..f19d2282e3f8 100644
> --- a/arch/powerpc/include/asm/dbell.h
> +++ b/arch/powerpc/include/asm/dbell.h
> @@ -13,6 +13,7 @@
>  
>  #include 
>  #include 
> +#include 
>  
>  #define PPC_DBELL_MSG_BRDCAST(0x0400)
>  #define PPC_DBELL_TYPE(x)(((x) & 0xf) << (63-36))


This somehow breaks ppc40x_defconfig and others:

In file included from /home/michael/linux/arch/powerpc/include/asm/kvm_ppc.h:24,
 from /home/michael/linux/arch/powerpc/include/asm/dbell.h:16,
 from /home/michael/linux/arch/powerpc/kernel/asm-offsets.c:38:
/home/michael/linux/arch/powerpc/include/asm/kvm_booke.h: In function 
‘kvmppc_get_fault_dar’:
/home/michael/linux/arch/powerpc/include/asm/kvm_booke.h:94:19: error: ‘struct 
kvm_vcpu_arch’ has no member named ‘fault_dear’
   94 |  return vcpu->arch.fault_dear;
  |   ^
make[2]: *** [/home/michael/linux/scripts/Makefile.build:114: 
arch/powerpc/kernel/asm-offsets.s] Error 1
make[1]: *** [/home/michael/linux/Makefile:1175: prepare0] Error 2
make: *** [Makefile:185: __sub-make] Error 2

cheers


[PATCH v2 1/3] powerpc: inline doorbell sending functions

2020-06-30 Thread Nicholas Piggin
These are only called in one place for a given platform, so inline them
for performance.

Signed-off-by: Nicholas Piggin 
---
 arch/powerpc/include/asm/dbell.h | 63 ++--
 arch/powerpc/kernel/dbell.c  | 55 
 2 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/arch/powerpc/include/asm/dbell.h b/arch/powerpc/include/asm/dbell.h
index 4ce6808deed3..f19d2282e3f8 100644
--- a/arch/powerpc/include/asm/dbell.h
+++ b/arch/powerpc/include/asm/dbell.h
@@ -13,6 +13,7 @@
 
 #include 
 #include 
+#include 
 
 #define PPC_DBELL_MSG_BRDCAST  (0x0400)
 #define PPC_DBELL_TYPE(x)  (((x) & 0xf) << (63-36))
@@ -87,9 +88,6 @@ static inline void ppc_msgsync(void)
 
 #endif /* CONFIG_PPC_BOOK3S */
 
-extern void doorbell_global_ipi(int cpu);
-extern void doorbell_core_ipi(int cpu);
-extern int doorbell_try_core_ipi(int cpu);
 extern void doorbell_exception(struct pt_regs *regs);
 
 static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)
@@ -100,4 +98,63 @@ static inline void ppc_msgsnd(enum ppc_dbell type, u32 
flags, u32 tag)
_ppc_msgsnd(msg);
 }
 
+#ifdef CONFIG_SMP
+
+/*
+ * Doorbells must only be used if CPU_FTR_DBELL is available.
+ * msgsnd is used in HV, and msgsndp is used in !HV.
+ *
+ * These should be used by platform code that is aware of restrictions.
+ * Other arch code should use ->cause_ipi.
+ *
+ * doorbell_global_ipi() sends a dbell to any target CPU.
+ * Must be used only by architectures that address msgsnd target
+ * by PIR/get_hard_smp_processor_id.
+ */
+static inline void doorbell_global_ipi(int cpu)
+{
+   u32 tag = get_hard_smp_processor_id(cpu);
+
+   kvmppc_set_host_ipi(cpu);
+   /* Order previous accesses vs. msgsnd, which is treated as a store */
+   ppc_msgsnd_sync();
+   ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
+}
+
+/*
+ * doorbell_core_ipi() sends a dbell to a target CPU in the same core.
+ * Must be used only by architectures that address msgsnd target
+ * by TIR/cpu_thread_in_core.
+ */
+static inline void doorbell_core_ipi(int cpu)
+{
+   u32 tag = cpu_thread_in_core(cpu);
+
+   kvmppc_set_host_ipi(cpu);
+   /* Order previous accesses vs. msgsnd, which is treated as a store */
+   ppc_msgsnd_sync();
+   ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
+}
+
+/*
+ * Attempt to cause a core doorbell if destination is on the same core.
+ * Returns 1 on success, 0 on failure.
+ */
+static inline int doorbell_try_core_ipi(int cpu)
+{
+   int this_cpu = get_cpu();
+   int ret = 0;
+
+   if (cpumask_test_cpu(cpu, cpu_sibling_mask(this_cpu))) {
+   doorbell_core_ipi(cpu);
+   ret = 1;
+   }
+
+   put_cpu();
+
+   return ret;
+}
+
+#endif /* CONFIG_SMP */
+
 #endif /* _ASM_POWERPC_DBELL_H */
diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c
index f17ff1200eaa..52680cf07c9d 100644
--- a/arch/powerpc/kernel/dbell.c
+++ b/arch/powerpc/kernel/dbell.c
@@ -18,61 +18,6 @@
 
 #ifdef CONFIG_SMP
 
-/*
- * Doorbells must only be used if CPU_FTR_DBELL is available.
- * msgsnd is used in HV, and msgsndp is used in !HV.
- *
- * These should be used by platform code that is aware of restrictions.
- * Other arch code should use ->cause_ipi.
- *
- * doorbell_global_ipi() sends a dbell to any target CPU.
- * Must be used only by architectures that address msgsnd target
- * by PIR/get_hard_smp_processor_id.
- */
-void doorbell_global_ipi(int cpu)
-{
-   u32 tag = get_hard_smp_processor_id(cpu);
-
-   kvmppc_set_host_ipi(cpu);
-   /* Order previous accesses vs. msgsnd, which is treated as a store */
-   ppc_msgsnd_sync();
-   ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
-}
-
-/*
- * doorbell_core_ipi() sends a dbell to a target CPU in the same core.
- * Must be used only by architectures that address msgsnd target
- * by TIR/cpu_thread_in_core.
- */
-void doorbell_core_ipi(int cpu)
-{
-   u32 tag = cpu_thread_in_core(cpu);
-
-   kvmppc_set_host_ipi(cpu);
-   /* Order previous accesses vs. msgsnd, which is treated as a store */
-   ppc_msgsnd_sync();
-   ppc_msgsnd(PPC_DBELL_MSGTYPE, 0, tag);
-}
-
-/*
- * Attempt to cause a core doorbell if destination is on the same core.
- * Returns 1 on success, 0 on failure.
- */
-int doorbell_try_core_ipi(int cpu)
-{
-   int this_cpu = get_cpu();
-   int ret = 0;
-
-   if (cpumask_test_cpu(cpu, cpu_sibling_mask(this_cpu))) {
-   doorbell_core_ipi(cpu);
-   ret = 1;
-   }
-
-   put_cpu();
-
-   return ret;
-}
-
 void doorbell_exception(struct pt_regs *regs)
 {
struct pt_regs *old_regs = set_irq_regs(regs);
-- 
2.23.0