| Message ID | BLU436-SMTP201BF939A6C9DAB38BCCC1B80570@phx.gbl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/09/2015 16:07, Wanpeng Li wrote: > 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> > --- > include/linux/kvm_host.h | 1 + > virt/kvm/kvm_main.c | 5 +++-- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 81089cf..1bef9e2 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -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; > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index d8db2f8f..c06e57c 100644 > --- a/virt/kvm/kvm_main.c > +++ b/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->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 { > /* > Applied, thanks. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 81089cf..1bef9e2 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -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; diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index d8db2f8f..c06e57c 100644 --- a/virt/kvm/kvm_main.c +++ b/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->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 { /*
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> --- include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)