LKML Archive on
help / color / mirror / Atom feed
* [PATCH] KVM: PPC: Defer vtime accounting 'til after IRQ handling
@ 2021-10-06  7:37 Laurent Vivier
  2021-10-06 10:42 ` Greg Kurz
  0 siblings, 1 reply; 3+ messages in thread
From: Laurent Vivier @ 2021-10-06  7:37 UTC (permalink / raw)
  To: kvm-ppc
  Cc: linuxppc-dev, Benjamin Herrenschmidt, Michael Ellerman,
	linux-kernel, Nicholas Piggin, Paul Mackerras, Laurent Vivier

Commit 61bd0f66ff92 has moved guest_enter() out of the interrupt
protected area to be able to have updated tick counters, but
commit 112665286d08 moved back to this area to avoid wrong
context warning (or worse).

None of them are correct, to fix the problem port to POWER
the x86 fix 160457140187 ("KVM: x86: Defer vtime accounting 'til
after IRQ handling"):

"Defer the call to account guest time until after servicing any IRQ(s)
 that happened in the guest or immediately after VM-Exit.  Tick-based
 accounting of vCPU time relies on PF_VCPU being set when the tick IRQ
 handler runs, and IRQs are blocked throughout the main sequence of
 vcpu_enter_guest(), including the call into vendor code to actually
 enter and exit the guest."

Fixes: 61bd0f66ff92 ("KVM: PPC: Book3S HV: Fix guest time accounting with VIRT_CPU_ACCOUNTING_GEN")
Fixes: 112665286d08 ("KVM: PPC: Book3S HV: Context tracking exit guest context before enabling irqs")

Signed-off-by: Laurent Vivier <>
 arch/powerpc/kvm/book3s_hv.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 2acb1c96cfaf..43e1ce853785 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -3695,6 +3695,8 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)
 	srcu_read_unlock(&vc->kvm->srcu, srcu_idx);
+	context_tracking_guest_exit();
@@ -3726,9 +3728,8 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)
-	guest_exit_irqoff();
+	vtime_account_guest_exit();
 	/* Let secondaries go back to the offline loop */
 	for (i = 0; i < controlled_threads; ++i) {
@@ -4506,13 +4507,14 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit,
 	srcu_read_unlock(&kvm->srcu, srcu_idx);
+	context_tracking_guest_exit();
-	guest_exit_irqoff();
+	vtime_account_guest_exit();
 	cpumask_clear_cpu(pcpu, &kvm->arch.cpu_in_guest);

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-07 13:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-06  7:37 [PATCH] KVM: PPC: Defer vtime accounting 'til after IRQ handling Laurent Vivier
2021-10-06 10:42 ` Greg Kurz
2021-10-07 13:45   ` Laurent Vivier

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).