powerpc/64: move account_stolen_time into its own function

This will be used by interrupt entry as well.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-38-npiggin@gmail.com

diff --git a/arch/powerpc/include/asm/cputime.h b/arch/powerpc/include/asm/cputime.h
index ed75d1c318e3124af7ec195902c2051db3fc14fa..504f7fe6711a32783b148e9e59734a78bf4f3b97 100644 (file)
--- a/arch/powerpc/include/asm/cputime.h
+++ b/arch/powerpc/include/asm/cputime.h
@@ -87,6 +87,17 @@ static notrace inline void account_cpu_user_exit(void)
        acct->starttime_user = tb;
 }
 
+static notrace inline void account_stolen_time(void)
+{
+#ifdef CONFIG_PPC_SPLPAR
+       if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
+               struct lppaca *lp = local_paca->lppaca_ptr;
+
+               if (unlikely(local_paca->dtl_ridx != be64_to_cpu(lp->dtl_idx)))
+                       accumulate_stolen_time();
+       }
+#endif
+}
 
 #endif /* __KERNEL__ */
 #else /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
@@ -96,5 +107,8 @@ static inline void account_cpu_user_entry(void)
 static inline void account_cpu_user_exit(void)
 {
 }
+static notrace inline void account_stolen_time(void)
+{
+}
 #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
 #endif /* __POWERPC_CPUTIME_H */

diff --git a/arch/powerpc/kernel/syscall_64.c b/arch/powerpc/kernel/syscall_64.c
index a2102e7a27136425000b8ac948b18216d4212cbf..d6be4f9a67e50790ccdfcab37502c86a6d65ccdd 100644 (file)
--- a/arch/powerpc/kernel/syscall_64.c
+++ b/arch/powerpc/kernel/syscall_64.c
@@ -69,15 +69,7 @@ notrace long system_call_exception(long r3, long r4, long r5,
 
        account_cpu_user_entry();
 
-#ifdef CONFIG_PPC_SPLPAR
-       if (IS_ENABLED(CONFIG_VIRT_CPU_ACCOUNTING_NATIVE) &&
-           firmware_has_feature(FW_FEATURE_SPLPAR)) {
-               struct lppaca *lp = local_paca->lppaca_ptr;
-
-               if (unlikely(local_paca->dtl_ridx != be64_to_cpu(lp->dtl_idx)))
-                       accumulate_stolen_time();
-       }
-#endif
+       account_stolen_time();
 
        /*
         * This is not required for the syscall exit path, but makes the