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

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

KVM; SVM: Add correct handling of nested iopm 



This patch adds the correct handling of the nested io
permission bitmap. Old behavior was to not lookup the port
in the iopm but only reinject an io intercept to the guest.

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

arch/x86/kvm/svm.c

+25 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ struct nested_state { 




	/* gpa pointers to the real vectors */

	/* gpa pointers to the real vectors */

	u64 vmcb_msrpm;

	u64 vmcb_msrpm;

	u64 vmcb_iopm;





	/* A VMEXIT is required but not yet emulated */

	/* A VMEXIT is required but not yet emulated */

	bool exit_required;

	bool exit_required;
@@ -1658,6 +1659,26 @@ static void nested_svm_unmap(struct page *page) 
	kvm_release_page_dirty(page);

	kvm_release_page_dirty(page);

}

}





static int nested_svm_intercept_ioio(struct vcpu_svm *svm)

{

	unsigned port;

	u8 val, bit;

	u64 gpa;



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

		return NESTED_EXIT_HOST;



	port = svm->vmcb->control.exit_info_1 >> 16;

	gpa  = svm->nested.vmcb_iopm + (port / 8);

	bit  = port % 8;

	val  = 0;



	if (kvm_read_guest(svm->vcpu.kvm, gpa, &val, 1))

		val &= (1 << bit);



	return val ? NESTED_EXIT_DONE : NESTED_EXIT_HOST;

}



static int nested_svm_exit_handled_msr(struct vcpu_svm *svm)

static int nested_svm_exit_handled_msr(struct vcpu_svm *svm)

{

{

	u32 offset, msr, value;

	u32 offset, msr, value;
@@ -1723,6 +1744,9 @@ static int nested_svm_intercept(struct vcpu_svm *svm) 
	case SVM_EXIT_MSR:

	case SVM_EXIT_MSR:

		vmexit = nested_svm_exit_handled_msr(svm);

		vmexit = nested_svm_exit_handled_msr(svm);

		break;

		break;

	case SVM_EXIT_IOIO:

		vmexit = nested_svm_intercept_ioio(svm);

		break;

	case SVM_EXIT_READ_CR0 ... SVM_EXIT_READ_CR8: {

	case SVM_EXIT_READ_CR0 ... SVM_EXIT_READ_CR8: {

		u32 cr_bits = 1 << (exit_code - SVM_EXIT_READ_CR0);

		u32 cr_bits = 1 << (exit_code - SVM_EXIT_READ_CR0);

		if (svm->nested.intercept_cr_read & cr_bits)

		if (svm->nested.intercept_cr_read & cr_bits)
@@ -2047,6 +2071,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 
	svm->vmcb->save.cpl = nested_vmcb->save.cpl;

	svm->vmcb->save.cpl = nested_vmcb->save.cpl;





	svm->nested.vmcb_msrpm = nested_vmcb->control.msrpm_base_pa;

	svm->nested.vmcb_msrpm = nested_vmcb->control.msrpm_base_pa;

	svm->nested.vmcb_iopm  = nested_vmcb->control.iopm_base_pa  & ~0x0fffULL;





	/* cache intercepts */

	/* cache intercepts */

	svm->nested.intercept_cr_read    = nested_vmcb->control.intercept_cr_read;

	svm->nested.intercept_cr_read    = nested_vmcb->control.intercept_cr_read;