From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C668DC433F5 for ; Wed, 6 Oct 2021 11:23:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B144561151 for ; Wed, 6 Oct 2021 11:23:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238456AbhJFLZK (ORCPT ); Wed, 6 Oct 2021 07:25:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30013 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238289AbhJFLZA (ORCPT ); Wed, 6 Oct 2021 07:25:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633519388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IHNPWvH8IdSItCatEhURToP4NiNrO6JvBUwAheoZRXE=; b=E8BBYGua+gyOVT1LY8055TTH6alTmP156uTNKrravlCsaZKCuZMJyHhL234f98IMDMqOop EselYh2P7G9eL17qzUMNzUbE7KuxtDLEiQjQuCibiqn6r/7piJmYAmFaZzE+J6qCJhxjBN xCVPwVKuoxTK0B4qZo96mx1mbu5fURo= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-9tAYCeTfNKmmWhNykaDJqQ-1; Wed, 06 Oct 2021 07:23:07 -0400 X-MC-Unique: 9tAYCeTfNKmmWhNykaDJqQ-1 Received: by mail-ed1-f71.google.com with SMTP id p20-20020a50cd94000000b003db23619472so2296996edi.19 for ; Wed, 06 Oct 2021 04:23:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=IHNPWvH8IdSItCatEhURToP4NiNrO6JvBUwAheoZRXE=; b=ULPnY/Gy32GpXr7iO5uYSHBepJuCBvLT2EJ17dhR5kO0jtstjlgafY/BS1g0dYQ4WL gpClyQdd73BY/5CppBpg2Ve1Tqxfz4ocrGkgmK+go1q5Bb6um+yk9uTb/FM85uqg46rn 2gXHbBxrUdw/YQJJF185Vae55VxhrzZYPFsIh7o8w0Cl+3dkP3ILsL3/SV7aT72+J4St gv+V6oKzNKWYkBxX4GjdXt60hA+L2sASc3m1kmsb++cv/MHE17/w+bIoljpbEU05nfQ+ Nk0T7CnTcmNQHos4KVxSrj1apvaVVyeB7mCEgePtd+rXzL1hfLRiCf+zRQZd3iqY8ZJg yGuw== X-Gm-Message-State: AOAM533DieIiVaDEs7GqQjBY/04b0Eoh/N83xXeT7jSzRZIZQhbA4LDk A18dA53CUZvz3Y99kHN6x6GLnMK8cdjtspcK3pGiyX6/03YlI7TKVERfMdL2qPr9UWNjnqac6CQ cj6Z6LGbGvsSZOC/MkNDh/Wab X-Received: by 2002:a17:906:280f:: with SMTP id r15mr30187273ejc.559.1633519386421; Wed, 06 Oct 2021 04:23:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw1R5OiDfTUFCbiGI85SCjOZAdyXVSTkog8lUinznoJ4IdzInmYSLsZl+IRVq4M3m708noiMw== X-Received: by 2002:a17:906:280f:: with SMTP id r15mr30187247ejc.559.1633519386187; Wed, 06 Oct 2021 04:23:06 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id r22sm4669140ejd.109.2021.10.06.04.23.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Oct 2021 04:23:05 -0700 (PDT) Message-ID: <9664819e-a767-3a92-5e5d-6a0418984cd4@redhat.com> Date: Wed, 6 Oct 2021 13:23:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH MANUALSEL 5.10 3/7] KVM: do not shrink halt_poll_ns below grow_start Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sergey Senozhatsky , kvm@vger.kernel.org References: <20211006111234.264020-1-sashal@kernel.org> <20211006111234.264020-3-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20211006111234.264020-3-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/10/21 13:12, Sasha Levin wrote: > From: Sergey Senozhatsky > > [ Upstream commit ae232ea460888dc5a8b37e840c553b02521fbf18 ] > > grow_halt_poll_ns() ignores values between 0 and > halt_poll_ns_grow_start (10000 by default). However, > when we shrink halt_poll_ns we may fall way below > halt_poll_ns_grow_start and endup with halt_poll_ns > values that don't make a lot of sense: like 1 or 9, > or 19. > > VCPU1 trace (halt_poll_ns_shrink equals 2): > > VCPU1 grow 10000 > VCPU1 shrink 5000 > VCPU1 shrink 2500 > VCPU1 shrink 1250 > VCPU1 shrink 625 > VCPU1 shrink 312 > VCPU1 shrink 156 > VCPU1 shrink 78 > VCPU1 shrink 39 > VCPU1 shrink 19 > VCPU1 shrink 9 > VCPU1 shrink 4 > > Mirror what grow_halt_poll_ns() does and set halt_poll_ns > to 0 as soon as new shrink-ed halt_poll_ns value falls > below halt_poll_ns_grow_start. > > Signed-off-by: Sergey Senozhatsky > Signed-off-by: Paolo Bonzini > Message-Id: <20210902031100.252080-1-senozhatsky@chromium.org> > Signed-off-by: Paolo Bonzini > Signed-off-by: Sasha Levin > --- > 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 0e4310c415a8..57c0c3b18bde 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2756,15 +2756,19 @@ static void grow_halt_poll_ns(struct kvm_vcpu *vcpu) > > static void shrink_halt_poll_ns(struct kvm_vcpu *vcpu) > { > - unsigned int old, val, shrink; > + unsigned int old, val, shrink, grow_start; > > old = val = vcpu->halt_poll_ns; > shrink = READ_ONCE(halt_poll_ns_shrink); > + grow_start = READ_ONCE(halt_poll_ns_grow_start); > if (shrink == 0) > val = 0; > else > val /= shrink; > > + if (val < grow_start) > + val = 0; > + > vcpu->halt_poll_ns = val; > trace_kvm_halt_poll_ns_shrink(vcpu->vcpu_id, val, old); > } > Acked-by: Paolo Bonzini