From: Wanpeng Li wanpengli@tencent.com
commit 866a6dadbb027b2955a7ae00bab9705d382def12 upstream.
Provide separate context tracking helpers for guest exit, the standalone helpers will be called separately by KVM x86 in later patches to fix tick-based accounting.
Suggested-by: Thomas Gleixner tglx@linutronix.de Signed-off-by: Wanpeng Li wanpengli@tencent.com Co-developed-by: Sean Christopherson seanjc@google.com Signed-off-by: Sean Christopherson seanjc@google.com Signed-off-by: Thomas Gleixner tglx@linutronix.de Link: https://lore.kernel.org/r/20210505002735.1684165-2-seanjc@google.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- include/linux/context_tracking.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
--- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -129,10 +129,15 @@ static __always_inline void guest_enter_ } }
-static __always_inline void guest_exit_irqoff(void) +static __always_inline void context_tracking_guest_exit(void) { if (context_tracking_enabled()) __context_tracking_exit(CONTEXT_GUEST); +} + +static __always_inline void guest_exit_irqoff(void) +{ + context_tracking_guest_exit();
instrumentation_begin(); if (vtime_accounting_enabled_this_cpu()) @@ -157,6 +162,8 @@ static __always_inline void guest_enter_ instrumentation_end(); }
+static __always_inline void context_tracking_guest_exit(void) { } + static __always_inline void guest_exit_irqoff(void) { instrumentation_begin();