Add the new functions prepare_to_busy_poll() and friends to
kvm_vcpu_block. The busy polling cpu will be considered an
idle target during wake up balancing.

cpu_relax is also added to the polling loop to improve the performance
of other hw threads sharing the busy polling core.

Suggested-by: Xi Wang <x...@google.com>
Signed-off-by: Josh Don <josh...@google.com>
Signed-off-by: Xi Wang <x...@google.com>
---
 virt/kvm/kvm_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index cf88233b819a..8f818f0fc979 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2772,7 +2772,9 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
                ktime_t stop = ktime_add_ns(ktime_get(), vcpu->halt_poll_ns);
 
                ++vcpu->stat.halt_attempted_poll;
+               prepare_to_busy_poll(); /* also disables preemption */
                do {
+                       cpu_relax();
                        /*
                         * This sets KVM_REQ_UNHALT if an interrupt
                         * arrives.
@@ -2781,10 +2783,12 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
                                ++vcpu->stat.halt_successful_poll;
                                if (!vcpu_valid_wakeup(vcpu))
                                        ++vcpu->stat.halt_poll_invalid;
+                               end_busy_poll(false);
                                goto out;
                        }
                        poll_end = cur = ktime_get();
-               } while (single_task_running() && ktime_before(cur, stop));
+               } while (continue_busy_poll() && ktime_before(cur, stop));
+               end_busy_poll(false);
        }
 
        prepare_to_rcuwait(&vcpu->wait);
-- 
2.29.0.rc1.297.gfa9743e501-goog

Reply via email to