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

Commit 0d6b3537 authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: Use svm_msrpm_offset in nested_svm_exit_handled_msr 



There is a generic function now to calculate msrpm offsets.
Use that function in nested_svm_exit_handled_msr() remove
the duplicate logic (which had a bug anyway).

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 323c3d80

arch/x86/kvm/svm.c

+17 −30
Original line number Original line Diff line number Diff line
@@ -1660,40 +1660,27 @@ static void nested_svm_unmap(struct page *page) 




static int nested_svm_exit_handled_msr(struct vcpu_svm *svm)

static int nested_svm_exit_handled_msr(struct vcpu_svm *svm)

{

{

	u32 param = svm->vmcb->control.exit_info_1 & 1;

	u32 offset, msr, value;

	u32 msr = svm->vcpu.arch.regs[VCPU_REGS_RCX];

	int write, mask;

	u32 t0, t1;

	int ret;

	u8 val;





	if (!(svm->nested.intercept & (1ULL << INTERCEPT_MSR_PROT)))

	if (!(svm->nested.intercept & (1ULL << INTERCEPT_MSR_PROT)))

		return NESTED_EXIT_HOST;

		return NESTED_EXIT_HOST;





	switch (msr) {

	msr    = svm->vcpu.arch.regs[VCPU_REGS_RCX];

	case 0 ... 0x1fff:

	offset = svm_msrpm_offset(msr);

		t0 = (msr * 2) % 8;

	write  = svm->vmcb->control.exit_info_1 & 1;

		t1 = msr / 8;

	mask   = 1 << ((2 * (msr & 0xf)) + write);

		break;

	case 0xc0000000 ... 0xc0001fff:

		t0 = (8192 + msr - 0xc0000000) * 2;

		t1 = (t0 / 8);

		t0 %= 8;

		break;

	case 0xc0010000 ... 0xc0011fff:

		t0 = (16384 + msr - 0xc0010000) * 2;

		t1 = (t0 / 8);

		t0 %= 8;

		break;

	default:

		ret = NESTED_EXIT_DONE;

		goto out;

	}





	if (!kvm_read_guest(svm->vcpu.kvm, svm->nested.vmcb_msrpm + t1, &val, 1))

	if (offset == MSR_INVALID)

		ret = val & ((1 << param) << t0) ? NESTED_EXIT_DONE : NESTED_EXIT_HOST;

		return NESTED_EXIT_DONE;





out:

	/* Offset is in 32 bit units but need in 8 bit units */

	return ret;

	offset *= 4;



	if (kvm_read_guest(svm->vcpu.kvm, svm->nested.vmcb_msrpm + offset, &value, 4))

		return NESTED_EXIT_DONE;



	return (value & mask) ? NESTED_EXIT_DONE : NESTED_EXIT_HOST;

}

}





static int nested_svm_exit_special(struct vcpu_svm *svm)

static int nested_svm_exit_special(struct vcpu_svm *svm)
@@ -1954,8 +1941,8 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) 
		if (msrpm_offsets[i] == 0xffffffff)

		if (msrpm_offsets[i] == 0xffffffff)

			break;

			break;





		offset = svm->nested.vmcb_msrpm + msrpm_offsets[i];

		p      = msrpm_offsets[i];

		p      = msrpm_offsets[i] / 4;

		offset = svm->nested.vmcb_msrpm + (p * 4);





		if (kvm_read_guest(svm->vcpu.kvm, offset, &value, 4))

		if (kvm_read_guest(svm->vcpu.kvm, offset, &value, 4))

			return false;

			return false;