diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:53:20 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2021-11-08 13:53:20 +0200 |
| commit | b101fdeb4c9fc20ffae06e425649ccfcc1062e22 (patch) | |
| tree | 9a225451ac0181bab4f9be6ca824f10ac9e66dfd /virt | |
| parent | 4f3a08cd3b023ee3f0410c1ef801c8ad76a761a0 (diff) | |
| parent | faaca480fd5cd1976b6db743c43ac1f8d583de72 (diff) | |
Merge tag 'v5.4.152' into 5.4-2.3.x-imx
This is the 5.4.152 stable release
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 77f84cbca740..f31976010622 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2470,15 +2470,19 @@ out: static void shrink_halt_poll_ns(struct kvm_vcpu *vcpu) { - unsigned int old, val, shrink; + unsigned int old, val, shrink, grow_start; old = val = vcpu->halt_poll_ns; shrink = READ_ONCE(halt_poll_ns_shrink); + grow_start = READ_ONCE(halt_poll_ns_grow_start); if (shrink == 0) val = 0; else val /= shrink; + if (val < grow_start) + val = 0; + vcpu->halt_poll_ns = val; trace_kvm_halt_poll_ns_shrink(vcpu->vcpu_id, val, old); } |