Patch "LoongArch: KVM: Invalidate guest steal time address on vCPU reset" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    LoongArch: KVM: Invalidate guest steal time address on vCPU reset

to the 6.10-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:
     loongarch-kvm-invalidate-guest-steal-time-address-on.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 09a6a503b8c8724ca718d224aade078ffdb771f8
Author: Bibo Mao <maobibo@xxxxxxxxxxx>
Date:   Mon Aug 26 23:11:32 2024 +0800

    LoongArch: KVM: Invalidate guest steal time address on vCPU reset
    
    [ Upstream commit 4956e07f05e239b274d042618a250c9fa3e92629 ]
    
    If ParaVirt steal time feature is enabled, there is a percpu gpa address
    passed from guest vCPU and host modifies guest memory space with this gpa
    address. When vCPU is reset normally, it will notify host and invalidate
    gpa address.
    
    However if VM is crashed and VMM reboots VM forcely, the vCPU reboot
    notification callback will not be called in VM. Host needs invalidate
    the gpa address, else host will modify guest memory during VM reboots.
    Here it is invalidated from the vCPU KVM_REG_LOONGARCH_VCPU_RESET ioctl
    interface.
    
    Also funciton kvm_reset_timer() is removed at vCPU reset stage, since SW
    emulated timer is only used in vCPU block state. When a vCPU is removed
    from the block waiting queue, kvm_restore_timer() is called and SW timer
    is cancelled. And the timer register is also cleared at VMM when a vCPU
    is reset.
    
    Signed-off-by: Bibo Mao <maobibo@xxxxxxxxxxx>
    Signed-off-by: Huacai Chen <chenhuacai@xxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/loongarch/include/asm/kvm_vcpu.h b/arch/loongarch/include/asm/kvm_vcpu.h
index 590a92cb54165..d741c3e9933a5 100644
--- a/arch/loongarch/include/asm/kvm_vcpu.h
+++ b/arch/loongarch/include/asm/kvm_vcpu.h
@@ -76,7 +76,6 @@ static inline void kvm_restore_lasx(struct loongarch_fpu *fpu) { }
 #endif
 
 void kvm_init_timer(struct kvm_vcpu *vcpu, unsigned long hz);
-void kvm_reset_timer(struct kvm_vcpu *vcpu);
 void kvm_save_timer(struct kvm_vcpu *vcpu);
 void kvm_restore_timer(struct kvm_vcpu *vcpu);
 
diff --git a/arch/loongarch/kvm/timer.c b/arch/loongarch/kvm/timer.c
index bcc6b6d063d91..74a4b5c272d60 100644
--- a/arch/loongarch/kvm/timer.c
+++ b/arch/loongarch/kvm/timer.c
@@ -188,10 +188,3 @@ void kvm_save_timer(struct kvm_vcpu *vcpu)
 	kvm_save_hw_gcsr(csr, LOONGARCH_CSR_ESTAT);
 	preempt_enable();
 }
-
-void kvm_reset_timer(struct kvm_vcpu *vcpu)
-{
-	write_gcsr_timercfg(0);
-	kvm_write_sw_gcsr(vcpu->arch.csr, LOONGARCH_CSR_TCFG, 0);
-	hrtimer_cancel(&vcpu->arch.swtimer);
-}
diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c
index 9e8030d451290..0b53f4d9fddf9 100644
--- a/arch/loongarch/kvm/vcpu.c
+++ b/arch/loongarch/kvm/vcpu.c
@@ -572,7 +572,7 @@ static int kvm_set_one_reg(struct kvm_vcpu *vcpu,
 				vcpu->kvm->arch.time_offset = (signed long)(v - drdtime());
 			break;
 		case KVM_REG_LOONGARCH_VCPU_RESET:
-			kvm_reset_timer(vcpu);
+			vcpu->arch.st.guest_addr = 0;
 			memset(&vcpu->arch.irq_pending, 0, sizeof(vcpu->arch.irq_pending));
 			memset(&vcpu->arch.irq_clear, 0, sizeof(vcpu->arch.irq_clear));
 			break;