Commit b5f6c150 authored by Wanpeng Li's avatar Wanpeng Li Committed by Zheng Zengkai
Browse files

x86/kvm: Preserve BSP MSR_KVM_POLL_CONTROL across suspend/resume 

stable inclusion
from stable-v5.10.115
commit 64e3e16dbc26c88bc182028b53c27df7af40239a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5IZ9C

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=64e3e16dbc26c88bc182028b53c27df7af40239a



--------------------------------

[ Upstream commit 0361bdfd ]

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 <mtosatti@redhat.com>
Signed-off-by: default avatarWanpeng Li <wanpengli@tencent.com>
Message-Id: <1650267752-46796-1-git-send-email-wanpengli@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent 210c3ca0

arch/x86/kernel/kvm.c

+13 −0
Original line number Diff line number Diff line
@@ -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 = {