From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [RFC PATCH] KVM: x86: Set PF_VCPU when processing IRQs to fix tick-based accounting
Date: Fri, 5 Feb 2021 16:42:18 -0800 [thread overview]
Message-ID: <20210206004218.312023-1-seanjc@google.com> (raw)
Temporarily set PF_VCPU while processing IRQ VM-Exits so that a tick IRQ
accounts the time slice to the guest. Tick-based accounting of guest
time is currently broken as PF_VCPU is only set during the relatively
short VM-Enter sequence, which runs entirely with IRQs disabled, and IRQs
that occur in the guest are processed well after PF_VCPU is cleared.
Keep PF_VCPU set across both VMX's processing of already-acked IRQs
(handle_exit_irqoff()) and the explicit IRQ window (SVM's processing,
plus ticks that occur immediately after VM-Exit on both VMX and SVM).
Fixes: 87fa7f3e98a1 ("x86/kvm: Move context tracking where it belongs")
Cc: stable@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
This is quite obnoxious, hence the RFC, but I can't think of a clever,
less ugly way to fix the accounting.
arch/x86/kvm/x86.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d9f931c63293..6ddf341cd755 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -9118,6 +9118,13 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
vcpu->mode = OUTSIDE_GUEST_MODE;
smp_wmb();
+ /*
+ * Temporarily pretend this task is running a vCPU when potentially
+ * processing an IRQ exit, including the below opening of an IRQ
+ * window. Tick-based accounting of guest time relies on PF_VCPU
+ * being set when the tick IRQ handler runs.
+ */
+ current->flags |= PF_VCPU;
static_call(kvm_x86_handle_exit_irqoff)(vcpu);
/*
@@ -9132,6 +9139,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
++vcpu->stat.exits;
local_irq_disable();
kvm_after_interrupt(vcpu);
+ current->flags &= ~PF_VCPU;
if (lapic_in_kernel(vcpu)) {
s64 delta = vcpu->arch.apic->lapic_timer.advance_expire_delta;
--
2.30.0.478.g8a0d178c01-goog
next reply other threads:[~2021-02-06 3:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-06 0:42 Sean Christopherson [this message]
2021-02-08 10:28 ` Vitaly Kuznetsov
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=20210206004218.312023-1-seanjc@google.com \
--to=seanjc@google.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®