Browse Source

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: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Wanpeng Li 10 years ago
parent
commit
19020f8ab8
2 changed files with 4 additions and 2 deletions
  1. 1 0
      include/linux/kvm_host.h
  2. 3 2
      virt/kvm/kvm_main.c

+ 1 - 0
include/linux/kvm_host.h

@@ -242,6 +242,7 @@ struct kvm_vcpu {
 	int sigset_active;
 	int sigset_active;
 	sigset_t sigset;
 	sigset_t sigset;
 	struct kvm_vcpu_stat stat;
 	struct kvm_vcpu_stat stat;
+	unsigned int halt_poll_ns;
 
 
 #ifdef CONFIG_HAS_IOMEM
 #ifdef CONFIG_HAS_IOMEM
 	int mmio_needed;
 	int mmio_needed;

+ 3 - 2
virt/kvm/kvm_main.c

@@ -217,6 +217,7 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id)
 	vcpu->kvm = kvm;
 	vcpu->kvm = kvm;
 	vcpu->vcpu_id = id;
 	vcpu->vcpu_id = id;
 	vcpu->pid = NULL;
 	vcpu->pid = NULL;
+	vcpu->halt_poll_ns = 0;
 	init_waitqueue_head(&vcpu->wq);
 	init_waitqueue_head(&vcpu->wq);
 	kvm_async_pf_vcpu_init(vcpu);
 	kvm_async_pf_vcpu_init(vcpu);
 
 
@@ -1930,8 +1931,8 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
 	bool waited = false;
 	bool waited = false;
 
 
 	start = cur = ktime_get();
 	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 {
 		do {
 			/*
 			/*