Merge tag 'powerpc-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-block.git] / include / linux / context_tracking.h

diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index 8150f5ac176cabad006c4aa668a7458414fe0253..8cac62ee6add1d96a8e7bc5e9a0d6919293e2413 100644 (file)
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -101,12 +101,14 @@ static inline void context_tracking_init(void) { }
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
 /* must be called with irqs disabled */
-static inline void guest_enter_irqoff(void)
+static __always_inline void guest_enter_irqoff(void)
 {
+       instrumentation_begin();
        if (vtime_accounting_enabled_this_cpu())
                vtime_guest_enter(current);
        else
                current->flags |= PF_VCPU;
+       instrumentation_end();
 
        if (context_tracking_enabled())
                __context_tracking_enter(CONTEXT_GUEST);
@@ -118,39 +120,48 @@ static inline void guest_enter_irqoff(void)
         * one time slice). Lets treat guest mode as quiescent state, just like
         * we do with user-mode execution.
         */
-       if (!context_tracking_enabled_this_cpu())
+       if (!context_tracking_enabled_this_cpu()) {
+               instrumentation_begin();
                rcu_virt_note_context_switch(smp_processor_id());
+               instrumentation_end();
+       }
 }
 
-static inline void guest_exit_irqoff(void)
+static __always_inline void guest_exit_irqoff(void)
 {
        if (context_tracking_enabled())
                __context_tracking_exit(CONTEXT_GUEST);
 
+       instrumentation_begin();
        if (vtime_accounting_enabled_this_cpu())
                vtime_guest_exit(current);
        else
                current->flags &= ~PF_VCPU;
+       instrumentation_end();
 }
 
 #else
-static inline void guest_enter_irqoff(void)
+static __always_inline void guest_enter_irqoff(void)
 {
        /*
         * This is running in ioctl context so its safe
         * to assume that it's the stime pending cputime
         * to flush.
         */
+       instrumentation_begin();
        vtime_account_kernel(current);
        current->flags |= PF_VCPU;
        rcu_virt_note_context_switch(smp_processor_id());
+       instrumentation_end();
 }
 
-static inline void guest_exit_irqoff(void)
+static __always_inline void guest_exit_irqoff(void)
 {
+       instrumentation_begin();
        /* Flush the guest cputime we spent on the guest */
        vtime_account_kernel(current);
        current->flags &= ~PF_VCPU;
+       instrumentation_end();
 }
 #endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */