[PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset"

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset"
       [not found] <CAAhV-H4WLByJ53oqQgEnVjy4bT0pS77fT5BA4NaCp8AOn+cyJw@mail.gmail.com>
@ 2024-10-01  7:25 ` Huacai Chen
  2024-10-01  7:56   ` Greg KH
  2024-10-01  8:55 ` Huacai Chen
  1 sibling, 1 reply; 4+ messages in thread
From: Huacai Chen @ 2024-10-01  7:25 UTC (permalink / raw)
  To: Paolo Bonzini, Huacai Chen, Greg KH, Sasha Levin
  Cc: Bibo Mao, loongarch, linux-kernel, Xuerui Wang, stable,
	Huacai Chen

This reverts commit 05969a6944713f159e8f28be2388500174521818.

LoongArch's PV steal time support is add after 6.10, so 6.10.y doesn't
need this fix.
---
 arch/loongarch/include/asm/kvm_vcpu.h | 1 +
 arch/loongarch/kvm/timer.c            | 7 +++++++
 arch/loongarch/kvm/vcpu.c             | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/loongarch/include/asm/kvm_vcpu.h b/arch/loongarch/include/asm/kvm_vcpu.h
index d7e8f7d50ee0..f468450b24ab 100644
--- a/arch/loongarch/include/asm/kvm_vcpu.h
+++ b/arch/loongarch/include/asm/kvm_vcpu.h
@@ -82,6 +82,7 @@ static inline int kvm_own_lbt(struct kvm_vcpu *vcpu) { return -EINVAL; }
 #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 74a4b5c272d6..bcc6b6d063d9 100644
--- a/arch/loongarch/kvm/timer.c
+++ b/arch/loongarch/kvm/timer.c
@@ -188,3 +188,10 @@ 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 0697b1064251..16ad19a09660 100644
--- a/arch/loongarch/kvm/vcpu.c
+++ b/arch/loongarch/kvm/vcpu.c
@@ -869,7 +869,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:
-			vcpu->arch.st.guest_addr = 0;
+			kvm_reset_timer(vcpu);
 			memset(&vcpu->arch.irq_pending, 0, sizeof(vcpu->arch.irq_pending));
 			memset(&vcpu->arch.irq_clear, 0, sizeof(vcpu->arch.irq_clear));
 			break;
-- 
2.43.5


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

* Re: [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset"
  2024-10-01  7:25 ` [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset" Huacai Chen
@ 2024-10-01  7:56   ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2024-10-01  7:56 UTC (permalink / raw)
  To: Huacai Chen
  Cc: Paolo Bonzini, Huacai Chen, Sasha Levin, Bibo Mao, loongarch,
	linux-kernel, Xuerui Wang, stable

On Tue, Oct 01, 2024 at 03:25:11PM +0800, Huacai Chen wrote:
> This reverts commit 05969a6944713f159e8f28be2388500174521818.
> 
> LoongArch's PV steal time support is add after 6.10, so 6.10.y doesn't
> need this fix.
> ---

No signed-off-by line :(


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

* [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset"
       [not found] <CAAhV-H4WLByJ53oqQgEnVjy4bT0pS77fT5BA4NaCp8AOn+cyJw@mail.gmail.com>
  2024-10-01  7:25 ` [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset" Huacai Chen
@ 2024-10-01  8:55 ` Huacai Chen
  2024-10-01 10:12   ` Greg KH
  1 sibling, 1 reply; 4+ messages in thread
From: Huacai Chen @ 2024-10-01  8:55 UTC (permalink / raw)
  To: Paolo Bonzini, Huacai Chen, Greg KH, Sasha Levin
  Cc: Bibo Mao, loongarch, linux-kernel, Xuerui Wang, stable,
	Huacai Chen

This reverts commit 05969a6944713f159e8f28be2388500174521818.

LoongArch's PV steal time support is add after 6.10, so 6.10.y doesn't
need this fix.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
 arch/loongarch/include/asm/kvm_vcpu.h | 1 +
 arch/loongarch/kvm/timer.c            | 7 +++++++
 arch/loongarch/kvm/vcpu.c             | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/loongarch/include/asm/kvm_vcpu.h b/arch/loongarch/include/asm/kvm_vcpu.h
index d7e8f7d50ee0..f468450b24ab 100644
--- a/arch/loongarch/include/asm/kvm_vcpu.h
+++ b/arch/loongarch/include/asm/kvm_vcpu.h
@@ -82,6 +82,7 @@ static inline int kvm_own_lbt(struct kvm_vcpu *vcpu) { return -EINVAL; }
 #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 74a4b5c272d6..bcc6b6d063d9 100644
--- a/arch/loongarch/kvm/timer.c
+++ b/arch/loongarch/kvm/timer.c
@@ -188,3 +188,10 @@ 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 0697b1064251..16ad19a09660 100644
--- a/arch/loongarch/kvm/vcpu.c
+++ b/arch/loongarch/kvm/vcpu.c
@@ -869,7 +869,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:
-			vcpu->arch.st.guest_addr = 0;
+			kvm_reset_timer(vcpu);
 			memset(&vcpu->arch.irq_pending, 0, sizeof(vcpu->arch.irq_pending));
 			memset(&vcpu->arch.irq_clear, 0, sizeof(vcpu->arch.irq_clear));
 			break;
-- 
2.43.5


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

* Re: [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset"
  2024-10-01  8:55 ` Huacai Chen
@ 2024-10-01 10:12   ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2024-10-01 10:12 UTC (permalink / raw)
  To: Huacai Chen
  Cc: Paolo Bonzini, Huacai Chen, Sasha Levin, Bibo Mao, loongarch,
	linux-kernel, Xuerui Wang, stable

On Tue, Oct 01, 2024 at 04:55:21PM +0800, Huacai Chen wrote:
> This reverts commit 05969a6944713f159e8f28be2388500174521818.
> 
> LoongArch's PV steal time support is add after 6.10, so 6.10.y doesn't
> need this fix.
> 
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>

Now queued up, thanks.

but really, this should have been "v2" :)

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

end of thread, other threads:[~2024-10-01 10:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <CAAhV-H4WLByJ53oqQgEnVjy4bT0pS77fT5BA4NaCp8AOn+cyJw@mail.gmail.com>
2024-10-01  7:25 ` [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset" Huacai Chen
2024-10-01  7:56   ` Greg KH
2024-10-01  8:55 ` Huacai Chen
2024-10-01 10:12   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox