Unverified Commit 9ace3a04 authored Mar 12, 2025 by openeuler-ci-bot Committed by Gitee Mar 12, 2025

!15164 [openEuler-24.03-LTS][linux-6.6.y sync] KVM: x86: Play nice with...

!15164 [openEuler-24.03-LTS][linux-6.6.y sync] KVM: x86: Play nice with protected guests in complete_hypercall_exit()

Merge Pull Request from: @koishimind 
 
1. KVM: x86: Play nice with protected guests in complete_hypercall_exit() 
 
Link:https://gitee.com/openeuler/kernel/pulls/15164

 

Reviewed-by: Han Liyang <hanliyang@hygon.cn>
Signed-off-by: Zhang Peng <zhangpeng362@huawei.com>

parents 1b688d5f beb9b301

arch/x86/kvm/x86.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -9956,13 +9956,8 @@ static int complete_hypercall_exit(struct kvm_vcpu *vcpu)
		{
		u64 ret = vcpu->run->hypercall.ret;

		/* Use is_64_bit_hypercall() instead of is_64_bit_mode() for Hygon CPUs */
		if (is_x86_vendor_hygon()) {
		if (!is_64_bit_hypercall(vcpu))
		ret = (u32)ret;
		} else if (!is_64_bit_mode(vcpu)) {
		ret = (u32)ret;
		}
		kvm_rax_write(vcpu, ret);
		++vcpu->stat.hypercalls;
		return kvm_skip_emulated_instruction(vcpu);