Nicholas Piggin <npiggin@xxxxxxxxx> writes:
> Small cleanup makes it a bit easier to match up entry and exit
> operations.
>
> Signed-off-by: Nicholas Piggin <npiggin@xxxxxxxxx>
Reviewed-by: Fabiano Rosas <farosas@xxxxxxxxxxxxx>
> ---
> arch/powerpc/kvm/book3s_hv.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
> index b8b0695a9312..86c85e303a6d 100644
> --- a/arch/powerpc/kvm/book3s_hv.c
> +++ b/arch/powerpc/kvm/book3s_hv.c
> @@ -2948,6 +2948,13 @@ static void kvmppc_start_thread(struct kvm_vcpu *vcpu, struct kvmppc_vcore *vc)
> kvmppc_ipi_thread(cpu);
> }
>
> +/* Old path does this in asm */
> +static void kvmppc_stop_thread(struct kvm_vcpu *vcpu)
> +{
> + vcpu->cpu = -1;
> + vcpu->arch.thread_cpu = -1;
> +}
> +
> static void kvmppc_wait_for_nap(int n_threads)
> {
> int cpu = smp_processor_id();
> @@ -4154,8 +4161,6 @@ static int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit,
> dec = (s32) dec;
> tb = mftb();
> vcpu->arch.dec_expires = dec + tb;
> - vcpu->cpu = -1;
> - vcpu->arch.thread_cpu = -1;
>
> store_spr_state(vcpu);
>
> @@ -4627,6 +4632,8 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit,
>
> guest_exit_irqoff();
>
> + kvmppc_stop_thread(vcpu);
> +
> powerpc_local_irq_pmu_restore(flags);
>
> cpumask_clear_cpu(pcpu, &kvm->arch.cpu_in_guest);
