Commit 365d3d55 authored by Aaron Lewis's avatar Aaron Lewis Committed by Paolo Bonzini
Browse files

kvm: nested: Introduce read_and_check_msr_entry() 



Add the function read_and_check_msr_entry() which just pulls some code
out of nested_vmx_store_msr().  This will be useful as reusable code in
upcoming patches.

Reviewed-by: default avatarLiran Alon <liran.alon@oracle.com>
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarAaron Lewis <aaronlewis@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d4069dbe

arch/x86/kvm/vmx/nested.c

+22 −13
Original line number Diff line number Diff line
@@ -940,6 +940,26 @@ static u32 nested_vmx_load_msr(struct kvm_vcpu *vcpu, u64 gpa, u32 count) 
	return i + 1;

}



static bool read_and_check_msr_entry(struct kvm_vcpu *vcpu, u64 gpa, int i,

				     struct vmx_msr_entry *e)

{

	if (kvm_vcpu_read_guest(vcpu,

				gpa + i * sizeof(*e),

				e, 2 * sizeof(u32))) {

		pr_debug_ratelimited(

			"%s cannot read MSR entry (%u, 0x%08llx)\n",

			__func__, i, gpa + i * sizeof(*e));

		return false;

	}

	if (nested_vmx_store_msr_check(vcpu, e)) {

		pr_debug_ratelimited(

			"%s check failed (%u, 0x%x, 0x%x)\n",

			__func__, i, e->index, e->reserved);

		return false;

	}

	return true;

}



static int nested_vmx_store_msr(struct kvm_vcpu *vcpu, u64 gpa, u32 count)

{

	u64 data;
@@ -951,20 +971,9 @@ static int nested_vmx_store_msr(struct kvm_vcpu *vcpu, u64 gpa, u32 count) 
		if (unlikely(i >= max_msr_list_size))

			return -EINVAL;



		if (kvm_vcpu_read_guest(vcpu,

					gpa + i * sizeof(e),

					&e, 2 * sizeof(u32))) {

			pr_debug_ratelimited(

				"%s cannot read MSR entry (%u, 0x%08llx)\n",

				__func__, i, gpa + i * sizeof(e));

			return -EINVAL;

		}

		if (nested_vmx_store_msr_check(vcpu, &e)) {

			pr_debug_ratelimited(

				"%s check failed (%u, 0x%x, 0x%x)\n",

				__func__, i, e.index, e.reserved);

		if (!read_and_check_msr_entry(vcpu, gpa, i, &e))

			return -EINVAL;

		}



		if (kvm_get_msr(vcpu, e.index, &data)) {

			pr_debug_ratelimited(

				"%s cannot read MSR (%u, 0x%x)\n",