Commit 19020f8a authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

KVM: make halt_poll_ns per-vCPU 



Change halt_poll_ns into per-VCPU variable, seeded from module parameter,
to allow greater flexibility.

Signed-off-by: default avatarWanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e8dd2d2d

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ struct kvm_vcpu { 
	int sigset_active;

	sigset_t sigset;

	struct kvm_vcpu_stat stat;

	unsigned int halt_poll_ns;



#ifdef CONFIG_HAS_IOMEM

	int mmio_needed;

virt/kvm/kvm_main.c

+3 −2
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) 
	vcpu->kvm = kvm;

	vcpu->vcpu_id = id;

	vcpu->pid = NULL;

	vcpu->halt_poll_ns = 0;

	init_waitqueue_head(&vcpu->wq);

	kvm_async_pf_vcpu_init(vcpu);
@@ -1930,8 +1931,8 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) 
	bool waited = false;



	start = cur = ktime_get();

	if (halt_poll_ns) {

		ktime_t stop = ktime_add_ns(ktime_get(), halt_poll_ns);

	if (vcpu->halt_poll_ns) {

		ktime_t stop = ktime_add_ns(ktime_get(), vcpu->halt_poll_ns);



		do {

			/*