UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM/riscv fixes for 6.3, take #1 

- Fix VM hang in case of timer delta being zero
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEZdn75s5e6LHDQ+f/rUjsVaLHLAcFAmQUI3wACgkQrUjsVaLH
 LAegrw//VbFOzCfwHCHJjAaEK5V6TaeROfDvBFnpPsktj/qqyVtKZQ6RaRBQ8+M/
 MVKjBIWu27jiHdjSutbQhyb4bDFk36L374Pcmp5JXN5NintGfMNfAK6ZEAWpCBXd
 t6/UydtM7DoncrosZpin2JuvzfKlD8vu2Um3zI1mmkbzx4YQfpf9f1JLuuguH5/r
 4ChPBalhOnmSF/phgBwmgyYWFxN0mhmGNydjb6/+PFb6Dkz6G2sPYIVos7hRRmTh
 FT21RAJgmVYs+b7la4eormmI/fxHSCYv80/AGFu9BxMANchxgKBwOqZUx6ZrNBrX
 l3H/VRP8x0MNDvu8Mah0QSsC9sF2Wnpodi7FJfOWF9T4A+DIzujVL+rRB5cAgMxP
 K1YeaMEIGsr/k3awokGV+CuE2yefarYYypru1pVzZl0XiEp0BIKIAdqslcVaX1c2
 a71kcxBKG2LnVR2YAh+UAALBVfgxgUcoYewuxyXEP1GIXtlkfmHrjD64dtfIXar4
 tMuo/vqAPvtQf4czLdZuJ1k/m3RFMz3XTtW+BjSI9yOGk8g6xWrab6y4FZehgcpl
 G3eHq0PlpygqoZgCQDDs+aHogMXF/H5YPTUntSW9AEyEx0DTUwUjESFSCAyjzGuj
 nWUdgieHbtuxksvtJSKe7c7aTf9pyj3guMNhRkWD0e8ebie2ogk=
 =lDDD
 -----END PGP SIGNATURE-----

Merge tag 'kvm-riscv-fixes-6.3-1' of https://github.com/kvm-riscv/linux into HEAD

KVM/riscv fixes for 6.3, take #1

- Fix VM hang in case of timer delta being zero
This commit is contained in:
Paolo Bonzini 2023-03-27 10:04:07 -04:00
parent 8607daa214 6eff380489
commit 9e347ba030
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/riscv/kvm/vcpu_timer.c
View File

@ -147,10 +147,8 @@ static void kvm_riscv_vcpu_timer_blocking(struct kvm_vcpu *vcpu)
return; return;
delta_ns = kvm_riscv_delta_cycles2ns(t->next_cycles, gt, t); delta_ns = kvm_riscv_delta_cycles2ns(t->next_cycles, gt, t);
if (delta_ns) { hrtimer_start(&t->hrt, ktime_set(0, delta_ns), HRTIMER_MODE_REL);
hrtimer_start(&t->hrt, ktime_set(0, delta_ns), HRTIMER_MODE_REL); t->next_set = true;
t->next_set = true;
}
} }
static void kvm_riscv_vcpu_timer_unblocking(struct kvm_vcpu *vcpu) static void kvm_riscv_vcpu_timer_unblocking(struct kvm_vcpu *vcpu)