* stable-rc/linux-6.10.y: error: no member named 'st' in 'struct kvm_vcpu_arch'
@ 2024-09-28 12:29 Miguel Ojeda
2024-09-29 1:02 ` Huacai Chen
0 siblings, 1 reply; 7+ messages in thread
From: Miguel Ojeda @ 2024-09-28 12:29 UTC (permalink / raw)
To: Sasha Levin, Huacai Chen, WANG Xuerui, Bibo Mao
Cc: Greg KH, loongarch, stable
Hi Sasha, LoongArch,
In a stable-rc/linux-6.10.y build-test today, I got:
arch/loongarch/kvm/vcpu.c:575:15: error: no member named 'st' in
'struct kvm_vcpu_arch'
575 | vcpu->arch.st.guest_addr = 0;
which I guess is triggered by missing prerequisites for commit
56f7eeae40de ("LoongArch: KVM: Invalidate guest steal time address on
vCPU reset").
HTH!
Cheers,
Miguel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: stable-rc/linux-6.10.y: error: no member named 'st' in 'struct kvm_vcpu_arch'
2024-09-28 12:29 stable-rc/linux-6.10.y: error: no member named 'st' in 'struct kvm_vcpu_arch' Miguel Ojeda
@ 2024-09-29 1:02 ` Huacai Chen
2024-09-30 18:33 ` Greg KH
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Huacai Chen @ 2024-09-29 1:02 UTC (permalink / raw)
To: Miguel Ojeda
Cc: Sasha Levin, WANG Xuerui, Bibo Mao, Greg KH, loongarch, stable
On Sat, Sep 28, 2024 at 8:29 PM Miguel Ojeda
<miguel.ojeda.sandonis@gmail.com> wrote:
>
> Hi Sasha, LoongArch,
>
> In a stable-rc/linux-6.10.y build-test today, I got:
>
> arch/loongarch/kvm/vcpu.c:575:15: error: no member named 'st' in
> 'struct kvm_vcpu_arch'
> 575 | vcpu->arch.st.guest_addr = 0;
>
> which I guess is triggered by missing prerequisites for commit
> 56f7eeae40de ("LoongArch: KVM: Invalidate guest steal time address on
> vCPU reset").
Hmm, please drop the backported patch "LoongArch: KVM: Invalidate
guest steal time address on vCPU reset".
Huacai
>
> HTH!
>
> Cheers,
> Miguel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: stable-rc/linux-6.10.y: error: no member named 'st' in 'struct kvm_vcpu_arch'
2024-09-29 1:02 ` Huacai Chen
@ 2024-09-30 18:33 ` Greg KH
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
2 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2024-09-30 18:33 UTC (permalink / raw)
To: Huacai Chen
Cc: Miguel Ojeda, Sasha Levin, WANG Xuerui, Bibo Mao, loongarch,
stable
On Sun, Sep 29, 2024 at 09:02:33AM +0800, Huacai Chen wrote:
> On Sat, Sep 28, 2024 at 8:29 PM Miguel Ojeda
> <miguel.ojeda.sandonis@gmail.com> wrote:
> >
> > Hi Sasha, LoongArch,
> >
> > In a stable-rc/linux-6.10.y build-test today, I got:
> >
> > arch/loongarch/kvm/vcpu.c:575:15: error: no member named 'st' in
> > 'struct kvm_vcpu_arch'
> > 575 | vcpu->arch.st.guest_addr = 0;
> >
> > which I guess is triggered by missing prerequisites for commit
> > 56f7eeae40de ("LoongArch: KVM: Invalidate guest steal time address on
> > vCPU reset").
> Hmm, please drop the backported patch "LoongArch: KVM: Invalidate
> guest steal time address on vCPU reset".
Ick, missed this, can you please send a revert?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset"
2024-09-29 1:02 ` Huacai Chen
2024-09-30 18:33 ` Greg KH
@ 2024-10-01 7:25 ` Huacai Chen
2024-10-01 7:56 ` Greg KH
2024-10-01 8:55 ` Huacai Chen
2 siblings, 1 reply; 7+ 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] 7+ 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; 7+ 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] 7+ messages in thread
* [PATCH 6.10.y] Revert "LoongArch: KVM: Invalidate guest steal time address on vCPU reset"
2024-09-29 1:02 ` Huacai Chen
2024-09-30 18:33 ` Greg KH
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
2 siblings, 1 reply; 7+ 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] 7+ 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; 7+ 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] 7+ messages in thread
end of thread, other threads:[~2024-10-01 10:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-28 12:29 stable-rc/linux-6.10.y: error: no member named 'st' in 'struct kvm_vcpu_arch' Miguel Ojeda
2024-09-29 1:02 ` Huacai Chen
2024-09-30 18:33 ` Greg KH
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