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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2D53C433EF for ; Wed, 27 Apr 2022 16:23:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243085AbiD0Q0w (ORCPT ); Wed, 27 Apr 2022 12:26:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243076AbiD0Q0m (ORCPT ); Wed, 27 Apr 2022 12:26:42 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1D2C0257441 for ; Wed, 27 Apr 2022 09:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651076348; 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=KCM+kR4pTupLxaN7Pzr4seAbVUE+H+zCFEJvKXyp008=; b=ZRfOiGashDmdovoPQIq9xI7w58h4BgeNUp/YFRBjO5HYfbZayxNnhzQdB1MTm9IsLrwBRU 7Z0DqFrzWD/wY2vfFewNHfXv58e/ZoHklz7hbp5ZRN0XHd93Hu9ZjNLgMbPN30mmXsxoyR EveE9AsQa/rEcDzxo0POFoObcKDHCXE= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-345-UKIAB_RPNh6L3VKoY0c_cg-1; Wed, 27 Apr 2022 12:19:06 -0400 X-MC-Unique: UKIAB_RPNh6L3VKoY0c_cg-1 Received: by mail-ej1-f70.google.com with SMTP id nd34-20020a17090762a200b006e0ef16745cso1425929ejc.20 for ; Wed, 27 Apr 2022 09:19:06 -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=KCM+kR4pTupLxaN7Pzr4seAbVUE+H+zCFEJvKXyp008=; b=J6KeGYxa4pGcNSYhWBNlq4ddwlyb+05MjOCQa/w27oPp4qwg/i202i2amvbhyq5mNT fiBOeMXGB59lznp3afb459Wylpktc98AxIe9rQxtgj/xLSO9Wvw3NCp5Q0CPJBAx2KIu wzK5eLoY91d6B2tBObWn6QcCTJshBuvSzrszeyG/xGu7bbiy/GVyuIeuQE5nKPdYuV5x FkDyTz1pt5uG3H+aknmUs9cACPqi12FHG1bv8nTVlDaEbmQbXPpGBdet4BA1LdKmyxM+ Cf2h3wBbgCfi94IgLhmuQSeBaFrzLHtyi5p/shl7TPEif43LQmcWSkZ4NWOXKiz6eY8P 0yLA== X-Gm-Message-State: AOAM533caZZCfHnlNwfvw+9HhJ3sZMRISiCactFMKmG8yPLg2dARbakW mEbfov7V1Du8HnHjMIIcu5csByrZKo8BvI4VXrOYu/m114BVq9leJRtb85CjMJoib/2zv0ScC0h FyxPF0UrWWygizq7e X-Received: by 2002:a05:6402:5201:b0:426:124:a40b with SMTP id s1-20020a056402520100b004260124a40bmr7129625edd.198.1651076345477; Wed, 27 Apr 2022 09:19:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoHUy4nFsODaBAroyqMZG+PQ9rRZ5tD2/3U187eXKeQcTQ49CZmgADEk7rJYMAIQsQErds4g== X-Received: by 2002:a05:6402:5201:b0:426:124:a40b with SMTP id s1-20020a056402520100b004260124a40bmr7129587edd.198.1651076345207; Wed, 27 Apr 2022 09:19:05 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:1c09:f536:3de6:228c? ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.googlemail.com with ESMTPSA id mb22-20020a170906eb1600b006f38dcf211bsm4894492ejb.138.2022.04.27.09.19.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Apr 2022 09:19:04 -0700 (PDT) Message-ID: Date: Wed, 27 Apr 2022 18:19:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH MANUALSEL 5.10 1/4] x86/kvm: Preserve BSP MSR_KVM_POLL_CONTROL across suspend/resume Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wanpeng Li , Marcelo Tosatti , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, kvm@vger.kernel.org References: <20220427155435.19554-1-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20220427155435.19554-1-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 4/27/22 17:54, Sasha Levin wrote: > From: Wanpeng Li > > [ Upstream commit 0361bdfddca20c8855ea3bdbbbc9c999912b10ff ] > > MSR_KVM_POLL_CONTROL is cleared on reset, thus reverting guests to > host-side polling after suspend/resume. Non-bootstrap CPUs are > restored correctly by the haltpoll driver because they are hot-unplugged > during suspend and hot-plugged during resume; however, the BSP > is not hotpluggable and remains in host-sde polling mode after > the guest resume. The makes the guest pay for the cost of vmexits > every time the guest enters idle. > > Fix it by recording BSP's haltpoll state and resuming it during guest > resume. > > Cc: Marcelo Tosatti > Signed-off-by: Wanpeng Li > Message-Id: <1650267752-46796-1-git-send-email-wanpengli@tencent.com> > Signed-off-by: Paolo Bonzini > Signed-off-by: Sasha Levin > --- > arch/x86/kernel/kvm.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c > index 18e952fed021..6c3d38b5a8ad 100644 > --- a/arch/x86/kernel/kvm.c > +++ b/arch/x86/kernel/kvm.c > @@ -66,6 +66,7 @@ static DEFINE_PER_CPU_DECRYPTED(struct kvm_vcpu_pv_apf_data, apf_reason) __align > DEFINE_PER_CPU_DECRYPTED(struct kvm_steal_time, steal_time) __aligned(64) __visible; > static int has_steal_clock = 0; > > +static int has_guest_poll = 0; > /* > * No need for any "IO delay" on KVM > */ > @@ -624,14 +625,26 @@ static int kvm_cpu_down_prepare(unsigned int cpu) > > static int kvm_suspend(void) > { > + u64 val = 0; > + > kvm_guest_cpu_offline(false); > > +#ifdef CONFIG_ARCH_CPUIDLE_HALTPOLL > + if (kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL)) > + rdmsrl(MSR_KVM_POLL_CONTROL, val); > + has_guest_poll = !(val & 1); > +#endif > return 0; > } > > static void kvm_resume(void) > { > kvm_cpu_online(raw_smp_processor_id()); > + > +#ifdef CONFIG_ARCH_CPUIDLE_HALTPOLL > + if (kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL) && has_guest_poll) > + wrmsrl(MSR_KVM_POLL_CONTROL, 0); > +#endif > } > > static struct syscore_ops kvm_syscore_ops = { Acked-by: Paolo Bonzini