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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04D33C433F5 for ; Wed, 27 Apr 2022 16:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241337AbiD0Q06 (ORCPT ); Wed, 27 Apr 2022 12:26:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243107AbiD0Q0m (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 3591756FBF for ; Wed, 27 Apr 2022 09:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651076375; 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=1cvcOaXCpruv4T1c9qiJWLMyaDmKLEQmVrfnev71Sng=; b=f2AxcsMvXuQXhtf/mx6TsHncyuVlkdl9IgnhpGBAfKnNIPF6Ozkxop1q4fdqAIM9p6eI55 6vlSEsnPcqP046bqmTiukMhos2BR4TspnT71Zo3tm3SVHuKrEEjQY6LMCP5NeVSawdJsFu aSbD5ACGm7Pf12AEBgBSI7gmutkeyYU= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-77-_JUL4nVdOPm-m7x2bL4ufA-1; Wed, 27 Apr 2022 12:19:33 -0400 X-MC-Unique: _JUL4nVdOPm-m7x2bL4ufA-1 Received: by mail-ed1-f69.google.com with SMTP id cw28-20020a056402229c00b00425dda4b67dso1266692edb.10 for ; Wed, 27 Apr 2022 09:19:33 -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=1cvcOaXCpruv4T1c9qiJWLMyaDmKLEQmVrfnev71Sng=; b=hqA2pYBhnIoVLGk/VbsHEnKG24RjJ759paKhmqHM6cEFDn2HruBGgHXOBdlJD+JCvL g8fyKdnqUN8TWPGO+lwDDxJqiVcPDvleZEygd7zb/hoh7gojsawq0nHOQqrcnCAByKku x6234A6xCMg6oTM92atAfIDiPDUN4zLKfN9OHXfF0dhIuwirszlSZ4V6GeQ7lePgdVqC x8sE30fIhg1VcAMR2THvj2qX1PqgISizVGNXob3hnSkq2ZHvC7MyiKAim4Ls0N7jVvsJ fDdLaCY5PYigH+gl28jPzc6HObnrvRTeeIgxWTSkFJBgqqm73Nz0XSqG35ydHyV4ps18 sBbg== X-Gm-Message-State: AOAM533ku501JDCDr4T7R32C0104Y+Wbamh2EJnCI0jFZDmNaFh+bBGQ ZVQD3BhUFg/lkhSZFBJ2ClW8jTjRkuZwQX/2auoGHtSijV1WTlwaFqVpenzlw5tTZznAMyYSR4D BiBBcuyxlUzc5mltYh2P+oxZ0 X-Received: by 2002:a17:907:1c8d:b0:6f2:eb2:1cd6 with SMTP id nb13-20020a1709071c8d00b006f20eb21cd6mr19630450ejc.568.1651076372555; Wed, 27 Apr 2022 09:19:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOw3/rr2uhK+bOiKaMJvU87tDXfQr2FFam0AAS2cqlmruwG3KHI4kJpoc4faRL6UiMeQMUlQ== X-Received: by 2002:a17:907:1c8d:b0:6f2:eb2:1cd6 with SMTP id nb13-20020a1709071c8d00b006f20eb21cd6mr19630317ejc.568.1651076370838; Wed, 27 Apr 2022 09:19:30 -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 q6-20020a17090622c600b006f3876cd90csm5206122eja.198.2022.04.27.09.19.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Apr 2022 09:19:29 -0700 (PDT) Message-ID: Date: Wed, 27 Apr 2022 18:19:28 +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.15 3/7] 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: <20220427155431.19458-1-sashal@kernel.org> <20220427155431.19458-3-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20220427155431.19458-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 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 bd7b65081eb0..d36b58e705b6 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 > */ > @@ -650,14 +651,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