Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <1569719216-32080-1-git-send-email-wanpengli@tencent.com>
In-Reply-To: <1569719216-32080-1-git-send-email-wanpengli@tencent.com>
From:   Wanpeng Li <kernellwp@gmail.com>
Date:   Tue, 8 Oct 2019 09:07:18 +0800
Message-ID: <CANRm+CyFvpWRCEtsfZNDExPqDOeX9o=yin+tBF2MHN0ThtAfmg@mail.gmail.com>
Subject: Re: [PATCH v2] KVM: Don't shrink/grow vCPU halt_poll_ns if host side
 polling is disabled
To:     LKML <linux-kernel@vger.kernel.org>, kvm <kvm@vger.kernel.org>
Cc:     Paolo Bonzini <pbonzini@redhat.com>,
        =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        Sean Christopherson <sean.j.christopherson@intel.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>,
        Marcelo Tosatti <mtosatti@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

ping,
On Sun, 29 Sep 2019 at 09:07, Wanpeng Li <kernellwp@gmail.com> wrote:
>
> From: Wanpeng Li <wanpengli@tencent.com>
>
> Don't waste cycles to shrink/grow vCPU halt_poll_ns if host
> side polling is disabled.
>
> Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
> Cc: Marcelo Tosatti <mtosatti@redhat.com>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
> v1 -> v2:
>  * fix coding style
>
>  virt/kvm/kvm_main.c | 29 ++++++++++++++++-------------
>  1 file changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index e6de315..9d5eed9 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -2359,20 +2359,23 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu)
>         kvm_arch_vcpu_unblocking(vcpu);
>         block_ns = ktime_to_ns(cur) - ktime_to_ns(start);
>
> -       if (!vcpu_valid_wakeup(vcpu))
> -               shrink_halt_poll_ns(vcpu);
> -       else if (halt_poll_ns) {
> -               if (block_ns <= vcpu->halt_poll_ns)
> -                       ;
> -               /* we had a long block, shrink polling */
> -               else if (vcpu->halt_poll_ns && block_ns > halt_poll_ns)
> +       if (!kvm_arch_no_poll(vcpu)) {
> +               if (!vcpu_valid_wakeup(vcpu)) {
>                         shrink_halt_poll_ns(vcpu);
> -               /* we had a short halt and our poll time is too small */
> -               else if (vcpu->halt_poll_ns < halt_poll_ns &&
> -                       block_ns < halt_poll_ns)
> -                       grow_halt_poll_ns(vcpu);
> -       } else
> -               vcpu->halt_poll_ns = 0;
> +               } else if (halt_poll_ns) {
> +                       if (block_ns <= vcpu->halt_poll_ns)
> +                               ;
> +                       /* we had a long block, shrink polling */
> +                       else if (vcpu->halt_poll_ns && block_ns > halt_poll_ns)
> +                               shrink_halt_poll_ns(vcpu);
> +                       /* we had a short halt and our poll time is too small */
> +                       else if (vcpu->halt_poll_ns < halt_poll_ns &&
> +                               block_ns < halt_poll_ns)
> +                               grow_halt_poll_ns(vcpu);
> +               } else {
> +                       vcpu->halt_poll_ns = 0;
> +               }
> +       }
>
>         trace_kvm_vcpu_wakeup(block_ns, waited, vcpu_valid_wakeup(vcpu));
>         kvm_arch_vcpu_block_finish(vcpu);
> --
> 2.7.4
>