LoongArch: KVM: Fix timer restore issues
Subsystems (3)
v3 cover LoongArch: KVM: Fix timer restore issues
From: Tao Cui <[email protected]>
Fix two issues in kvm_restore_timer():
Patch 1 fixes a one-shot timer firing immediately after migration because vcpu->arch.expire is not migrated.
Patch 2 fixes a division-by-zero crash when a guest programs a periodic timer with a period value of zero.
Both are in the same function (kvm_restore_timer) and are sent as a series for convenience.
Tao Cui (2):
LoongArch: KVM: Reload one-shot TVAL on migration destination
LoongArch: KVM: Prevent division by zero in periodic timer restore
arch/loongarch/kvm/timer.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
---
Changes in v3:
- Add patch 2 (division by zero fix, found by Sashiko AI review).
- Reuse the existing now timestamp instead of a redundant ktime_get().
Changes in v2:
- Move the expire check before ktime_before() (suggested by Bibo Mao)
- Remove the old else-if branch that was one-shot only.
Signature · 1 line
2.43.0
PATCH v3 1/2 LoongArch: KVM: Reload one-shot TVAL on migration destination
From: Tao Cui <[email protected]>
kvm_restore_timer() rebuilds the remaining timer countdown from vcpu->arch.expire, which is host-internal and is not part of the migrated vCPU state. On the migration destination it is still 0, so for a one-shot timer that has not expired yet the computed delta is 0 and write_gcsr_timertick(0) injects the timer interrupt immediately instead of after the remaining time.
The expired one-shot case (TVAL = -1) is already handled earlier. When expire has not been set (i.e. on the migration destination), reload the remaining countdown from the migrated TVAL. This covers both one-shot and periodic timers. The regular preempt/resume path on the source, where expire is valid, is unchanged.
--- arch/loongarch/kvm/timer.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/loongarch/kvm/timer.c +12 -0
@@ -119,6 +119,18 @@ void kvm_restore_timer(struct kvm_vcpu *vcpu) delta =0 ; now =ktime_get (); expire = vcpu->arch.expire; +if (!expire) { +/* +* vcpu->arch.expire is host-internal and is not migrated, +* so it is 0 after migration. Reload the remaining countdown +* from the migrated TVAL. This covers both one-shot and +* periodic timers. +*/ +if (ticks < cfg) + delta =tick_to_ns (vcpu, ticks); + expire =ktime_add_ns (now, delta); + } +if (ktime_before (now, expire)) delta =ktime_to_tick (vcpu,ktime_sub (expire, now));else if (cfg &CSR_TCFG_PERIOD ) {
Signature · 1 line
2.43.0
Re: [PATCH v3 1/2] LoongArch: KVM: Reload one-shot TVAL on migration destination
Quoted 36 lines · Tao Cui
From: Tao Cui <[email protected]>
kvm_restore_timer()rebuilds the remaining timer countdown fromvcpu->arch.expire, which is host-internal and is not part of the migrated vCPU state. On the migration destination it is still 0, so for a one-shot timer that has not expired yet the computed delta is 0 andwrite_gcsr_timertick(0)injects the timer interrupt immediately instead of after the remaining time.The expired one-shot case (TVAL = -1) is already handled earlier. When expire has not been set (i.e. on the migration destination), reload the remaining countdown from the migrated TVAL. This covers both one-shot and periodic timers. The regular preempt/resume path on the source, where expire is valid, is unchanged.
Suggested-by Bibo Mao <[email protected]>Fixes a5857b9ff6e0 ("LoongArch: KVM: Implement vcpu timer operations")Signed-off-by Tao Cui <[email protected]>--- arch/loongarch/kvm/timer.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/loongarch/kvm/timer.c +5
-0@@ -119,6 +119,18 @@ void kvm_restore_timer(struct kvm_vcpu *vcpu) delta =0 ; now =ktime_get (); expire = vcpu->arch.expire; +if (!expire) { +/* +* vcpu->arch.expire is host-internal and is not migrated, +* so it is 0 after migration. Reload the remaining countdown +* from the migrated TVAL. This covers both one-shot and
arch/loongarch/kvm/timer.c void kvm_restore_timer(struct kvm_vcpu *vcpu) · line 136
Quoted 10 lines
arch/loongarch/kvm/timer.c +7
-0+* periodic timers. +*/ +if (ticks < cfg) + delta =tick_to_ns (vcpu, ticks); + expire =ktime_add_ns (now, delta); + } +if (ktime_before (now, expire)) delta =ktime_to_tick (vcpu,ktime_sub (expire, now));else if (cfg &CSR_TCFG_PERIOD ) {
PATCH v3 2/2 LoongArch: KVM: Prevent division by zero in periodic timer restore
In reply to Tao CuiFrom: Tao Cui <[email protected]>
A guest can write CSR_TCFG with the periodic bit set but a period value of zero. When kvm_restore_timer() later enters the periodic branch, period = cfg & CSR_TCFG_VAL evaluates to 0, causing delta % period to trigger a division by zero and crash the host kernel.
Clamp the period to 1 to avoid the panic.
--- arch/loongarch/kvm/timer.c | 2 ++ 1 file changed, 2 insertions(+)
arch/loongarch/kvm/timer.c +2 -0
@@ -135,6 +135,8 @@ void kvm_restore_timer(struct kvm_vcpu *vcpu) delta =ktime_to_tick (vcpu,ktime_sub (expire, now)); else if (cfg & CSR_TCFG_PERIOD) { period = cfg &CSR_TCFG_VAL ; +if (!period) + period =1 ; delta =ktime_to_tick (vcpu,ktime_sub (now, expire)); delta = period - (delta % period);
Signature · 1 line
2.43.0
Re: [PATCH v3 2/2] LoongArch: KVM: Prevent division by zero in periodic timer restore
Quoted 21 lines · Tao Cui
From: Tao Cui <[email protected]>
A guest can write
CSR_TCFGwith the periodic bit set but a period value of zero. Whenkvm_restore_timer()later enters the periodic branch, period = cfg &CSR_TCFG_VALevaluates to 0, causing delta % period to trigger a division by zero and crash the host kernel.Clamp the period to 1 to avoid the panic.
Fixes a5857b9ff6e0 ("LoongArch: KVM: Implement vcpu timer operations")Signed-off-by Tao Cui <[email protected]>--- arch/loongarch/kvm/timer.c | 2 ++ 1 file changed, 2 insertions(+)arch/loongarch/kvm/timer.c +0
-0
arch/loongarch/kvm/timer.c void kvm_restore_timer(struct kvm_vcpu *vcpu) · line 142
Quoted 8 lines
arch/loongarch/kvm/timer.c +2
-0@@ -135,6 +135,8 @@ void kvm_restore_timer(struct kvm_vcpu *vcpu) delta =ktime_to_tick (vcpu,ktime_sub (expire, now)); else if (cfg & CSR_TCFG_PERIOD) { period = cfg &CSR_TCFG_VAL ; +if (!period) + period =1 ; delta =ktime_to_tick (vcpu,ktime_sub (now, expire)); delta = period - (delta % period);
Huacai Chen
maintainerSeries applied, thanks.
Huacai
Quoted 32 lines · Tao Cui
From: Tao Cui <[email protected]>
Fix two issues in
kvm_restore_timer():Patch 1 fixes a one-shot timer firing immediately after migration because
vcpu->arch.expireis not migrated.Patch 2 fixes a division-by-zero crash when a guest programs a periodic timer with a period value of zero.
Both are in the same function (
kvm_restore_timer) and are sent as a series for convenience.Tao Cui (2):
LoongArch: KVM: Reload one-shot TVAL on migration destination
LoongArch: KVM: Prevent division by zero in periodic timer restorearch/loongarch/kvm/timer.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)---
Changes in v3:
- Add patch 2 (division by zero fix, found by Sashiko AI review).
- Reuse the existing now timestamp instead of a redundantktime_get().Changes in v2:
- Move the expire check beforektime_before()(suggested by Bibo Mao)
- Remove the old else-if branch that was one-shot only.
--
2.43.0