Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ed43cae authored by Haozhong Zhang's avatar Haozhong Zhang Committed by Greg Kroah-Hartman
Browse files

kvm: vmx: allow host to access guest MSR_IA32_BNDCFGS 



commit 691bd4340bef49cf7e5855d06cf24444b5bf2d85 upstream.

It's easier for host applications, such as QEMU, if they can always
access guest MSR_IA32_BNDCFGS in VMCS, even though MPX is disabled in
guest cpuid.

Signed-off-by: default avatarHaozhong Zhang <haozhong.zhang@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ffa92ff

arch/x86/kvm/vmx.c

+4 −2
Original line number Diff line number Diff line
@@ -2812,7 +2812,8 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		msr_info->data = vmcs_readl(GUEST_SYSENTER_ESP);

		break;

	case MSR_IA32_BNDCFGS:

		if (!kvm_mpx_supported() || !guest_cpuid_has_mpx(vcpu))

		if (!kvm_mpx_supported() ||

		    (!msr_info->host_initiated && !guest_cpuid_has_mpx(vcpu)))

			return 1;

		msr_info->data = vmcs_read64(GUEST_BNDCFGS);

		break;
@@ -2889,7 +2890,8 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		vmcs_writel(GUEST_SYSENTER_ESP, data);

		break;

	case MSR_IA32_BNDCFGS:

		if (!kvm_mpx_supported() || !guest_cpuid_has_mpx(vcpu))

		if (!kvm_mpx_supported() ||

		    (!msr_info->host_initiated && !guest_cpuid_has_mpx(vcpu)))

			return 1;

		if (is_noncanonical_address(data & PAGE_MASK) ||

		    (data & MSR_IA32_BNDCFGS_RSVD))