From: Mark Rutland <mark.rutland@arm.com>
To: Sean Christopherson <seanjc@google.com>
Cc: linux-kernel@vger.kernel.org, aleksandar.qemu.devel@gmail.com,
alexandru.elisei@arm.com, anup.patel@wdc.com,
aou@eecs.berkeley.edu, atish.patra@wdc.com,
benh@kernel.crashing.org, borntraeger@linux.ibm.com,
bp@alien8.de, catalin.marinas@arm.com, chenhuacai@kernel.org,
dave.hansen@linux.intel.com, david@redhat.com,
frankja@linux.ibm.com, frederic@kernel.org, gor@linux.ibm.com,
hca@linux.ibm.com, imbrenda@linux.ibm.com, james.morse@arm.com,
jmattson@google.com, joro@8bytes.org, kvm@vger.kernel.org,
maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au,
nsaenzju@redhat.com, palmer@dabbelt.com, paulmck@kernel.org,
paulus@samba.org, paul.walmsley@sifive.com, pbonzini@redhat.com,
suzuki.poulose@arm.com, tglx@linutronix.de,
tsbogend@alpha.franken.de, vkuznets@redhat.com,
wanpengli@tencent.com, will@kernel.org
Subject: Re: [PATCH 5/5] kvm/x86: rework guest entry logic
Date: Fri, 14 Jan 2022 12:05:35 +0000 [thread overview]
Message-ID: <YeFnD8l/OoMtPYvh@FVFF77S0Q05N> (raw)
In-Reply-To: <YeCQeHbswboaosoV@google.com>
On Thu, Jan 13, 2022 at 08:50:00PM +0000, Sean Christopherson wrote:
> On Tue, Jan 11, 2022, Mark Rutland wrote:
> > For consistency and clarity, migrate x86 over to the generic helpers for
> > guest timing and lockdep/RCU/tracing management, and remove the
> > x86-specific helpers.
> >
> > Prior to this patch, the guest timing was entered in
> > kvm_guest_enter_irqoff() (called by svm_vcpu_enter_exit() and
> > svm_vcpu_enter_exit()), and was exited by the call to
> > vtime_account_guest_exit() within vcpu_enter_guest().
> >
> > To minimize duplication and to more clearly balance entry and exit, both
> > entry and exit of guest timing are placed in vcpu_enter_guest(), using
> > the new guest_timing_{enter,exit}_irqoff() helpers. This may result in a
> > small amount of additional time being acounted towards guests.
>
> This can be further qualified to state that it only affects time accounting when
> using context tracking; tick-based accounting is unaffected because IRQs are
> disabled the entire time.
Ok. I'll replace that last sentence with:
When context tracking is used a small amount of additional time will be
accounted towards guests; tick-based accounting is unnaffected as IRQs are
disabled at this point and not enabled until after the return from the guest.
>
> And this might actually be a (benign?) bug fix for context tracking accounting in
> the EXIT_FASTPATH_REENTER_GUEST case (commits ae95f566b3d2 "KVM: X86: TSCDEADLINE
> MSR emulation fastpath" and 26efe2fd92e5, "KVM: VMX: Handle preemption timer
> fastpath"). In those cases, KVM will enter the guest multiple times without
> bouncing through vtime_account_guest_exit(). That means vtime_guest_enter() will
> be called when the CPU is already "in guest", and call vtime_account_system()
> when it really should call vtime_account_guest(). account_system_time() does
> check PF_VCPU and redirect to account_guest_time(), so it appears to be benign,
> but it's at least odd.
>
> > Other than this, there should be no functional change as a result of
> > this patch.
I've added wording:
This also corrects (benign) mis-balanced context tracking accounting
introduced in commits:
ae95f566b3d22ade ("KVM: X86: TSCDEADLINE MSR emulation fastpath")
26efe2fd92e50822 ("KVM: VMX: Handle preemption timer fastpath")
Where KVM can enter a guest multiple times, calling vtime_guest_enter()
without a corresponding call to vtime_account_guest_exit(), and with
vtime_account_system() called when vtime_account_guest() should be used.
As account_system_time() checks PF_VCPU and calls account_guest_time(),
this doesn't result in any functional problem, but is unnecessarily
confusing.
... and deleted the "no functional change" line for now.
I assume that other than the naming of the entry/exit functions you're happy
with this patch?
Thanks,
Mark.
> ...
>
> > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > index e50e97ac4408..bd3873b90889 100644
> > --- a/arch/x86/kvm/x86.c
> > +++ b/arch/x86/kvm/x86.c
> > @@ -9876,6 +9876,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
> > set_debugreg(0, 7);
> > }
> >
> > + guest_timing_enter_irqoff();
> > +
> > for (;;) {
> > /*
> > * Assert that vCPU vs. VM APICv state is consistent. An APICv
> > @@ -9949,7 +9951,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
> > * of accounting via context tracking, but the loss of accuracy is
> > * acceptable for all known use cases.
> > */
> > - vtime_account_guest_exit();
> > + guest_timing_exit_irqoff();
> >
> > if (lapic_in_kernel(vcpu)) {
> > s64 delta = vcpu->arch.apic->lapic_timer.advance_expire_delta;
next prev parent reply other threads:[~2022-01-14 12:05 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-11 15:35 [PATCH 0/5] kvm: fix latent guest entry/exit bugs Mark Rutland
2022-01-11 15:35 ` [PATCH 1/5] kvm: add exit_to_guest_mode() and enter_from_guest_mode() Mark Rutland
2022-01-11 17:54 ` Marc Zyngier
2022-01-13 11:01 ` Mark Rutland
2022-01-13 11:55 ` Marc Zyngier
2022-01-13 13:01 ` Mark Rutland
2022-01-13 20:32 ` Sean Christopherson
2022-01-14 11:48 ` Mark Rutland
2022-01-14 16:11 ` Sean Christopherson
2022-01-18 13:01 ` Mark Rutland
2022-01-11 15:35 ` [PATCH 2/5] kvm/arm64: rework guest entry logic Mark Rutland
2022-01-11 17:55 ` Marc Zyngier
2022-01-13 11:17 ` Mark Rutland
2022-01-13 11:43 ` Marc Zyngier
2022-01-13 12:58 ` Mark Rutland
2022-01-11 15:35 ` [PATCH 3/5] kvm/mips: " Mark Rutland
2022-01-11 15:35 ` [PATCH 4/5] kvm/riscv: " Mark Rutland
2022-01-11 15:35 ` [PATCH 5/5] kvm/x86: " Mark Rutland
2022-01-13 20:50 ` Sean Christopherson
2022-01-14 12:05 ` Mark Rutland [this message]
2022-01-14 16:49 ` Sean Christopherson
2022-01-11 18:47 ` [PATCH 0/5] kvm: fix latent guest entry/exit bugs Palmer Dabbelt
2022-01-13 15:20 ` Christian Borntraeger
2022-01-14 12:19 ` Mark Rutland
2022-01-14 12:29 ` Christian Borntraeger
2022-01-14 13:32 ` Mark Rutland
2022-01-14 13:51 ` Christian Borntraeger
2022-01-14 15:19 ` Mark Rutland
2022-01-17 17:45 ` Paolo Bonzini
2022-01-18 12:02 ` Mark Rutland
2022-01-18 12:08 ` Christian Borntraeger
2022-01-18 12:42 ` Christian Borntraeger
2022-01-18 13:12 ` Mark Rutland
2022-01-18 14:15 ` Christian Borntraeger
2022-01-18 15:43 ` Mark Rutland
2022-01-18 16:09 ` Sven Schnelle
2022-01-18 17:50 ` Mark Rutland
2022-01-18 18:12 ` Mark Rutland
2022-01-19 6:41 ` Sven Schnelle
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=YeFnD8l/OoMtPYvh@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=alexandru.elisei@arm.com \
--cc=anup.patel@wdc.com \
--cc=aou@eecs.berkeley.edu \
--cc=atish.patra@wdc.com \
--cc=benh@kernel.crashing.org \
--cc=borntraeger@linux.ibm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=frederic@kernel.org \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=james.morse@arm.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=nsaenzju@redhat.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=paulmck@kernel.org \
--cc=paulus@samba.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=will@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).