This is a note to let you know that I've just added the patch titled
KVM: PPC: Book3S HV P9: Clear vcpu cpu fields before enabling host irqs
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
kvm-ppc-book3s-hv-p9-clear-vcpu-cpu-fields-before-en.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 3f7b9afa2b8e5b655f45b72f75eadd94a2ece613
Author: Nicholas Piggin <npiggin@xxxxxxxxx>
Date: Thu Sep 8 23:25:41 2022 +1000
KVM: PPC: Book3S HV P9: Clear vcpu cpu fields before enabling host irqs
[ Upstream commit bc91c04bfff7cdf676011b97bb21b2861d7b21c9 ]
On guest entry, vcpu->cpu and vcpu->arch.thread_cpu are set after
disabling host irqs. On guest exit there is a window whre tick time
accounting briefly enables irqs before these fields are cleared.
Move them up to ensure they are cleared before host irqs are run.
This is possibly not a problem, but is more symmetric and makes the
fields less surprising.
Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220908132545.4085849-1-npiggin@xxxxxxxxx
Stable-dep-of: 1a5486b3c351 ("KVM: PPC: Book3S HV P9: Restore stolen time logging in dtl")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index d72df696837d..0f8dee657336 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -4629,6 +4629,9 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit,
set_irq_happened(trap);
+ vcpu->cpu = -1;
+ vcpu->arch.thread_cpu = -1;
+
context_tracking_guest_exit();
if (!vtime_accounting_enabled_this_cpu()) {
powerpc_local_irq_pmu_restore(flags);
@@ -4644,9 +4647,6 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit,
}
vtime_account_guest_exit();
- vcpu->cpu = -1;
- vcpu->arch.thread_cpu = -1;
-
powerpc_local_irq_pmu_restore(flags);
preempt_enable();
