Commit 2381ad24 authored by Xiantao Zhang's avatar Xiantao Zhang Committed by Avi Kivity
Browse files

KVM: ia64: Add intel iommu support for guests. 



With intel iommu hardware, we can assign devices to kvm/ia64 guests.

Signed-off-by: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent b010eb51

arch/ia64/kvm/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 
common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o irq_comm.o)



ifeq ($(CONFIG_DMAR),y)

common-objs += $(addprefix ../../../virt/kvm/, vtd.o)

endif



kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o

obj-$(CONFIG_KVM) += kvm.o

arch/ia64/kvm/kvm-ia64.c

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/bitops.h>

#include <linux/hrtimer.h>

#include <linux/uaccess.h>

#include <linux/intel-iommu.h>



#include <asm/pgtable.h>

#include <asm/gcc_intrin.h>
@@ -187,6 +188,9 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_COALESCED_MMIO:

		r = KVM_COALESCED_MMIO_PAGE_OFFSET;

		break;

	case KVM_CAP_IOMMU:

		r = intel_iommu_found();

		break;

	default:

		r = 0;

	}
@@ -773,6 +777,7 @@ static void kvm_init_vm(struct kvm *kvm) 
	 */

	kvm_build_io_pmt(kvm);



	INIT_LIST_HEAD(&kvm->arch.assigned_dev_head);

}



struct  kvm *kvm_arch_create_vm(void)
@@ -1336,6 +1341,10 @@ static void kvm_release_vm_pages(struct kvm *kvm) 


void kvm_arch_destroy_vm(struct kvm *kvm)

{

	kvm_iommu_unmap_guest(kvm);

#ifdef  KVM_CAP_DEVICE_ASSIGNMENT

	kvm_free_all_assigned_devices(kvm);

#endif

	kfree(kvm->arch.vioapic);

	kvm_release_vm_pages(kvm);

	kvm_free_physmem(kvm);

include/linux/kvm.h

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ struct kvm_trace_rec { 
#define KVM_CAP_MP_STATE 14

#define KVM_CAP_COALESCED_MMIO 15

#define KVM_CAP_SYNC_MMU 16  /* Changes to host mmap are reflected in guest */

#ifdef CONFIG_X86

#if defined(CONFIG_X86)||defined(CONFIG_IA64)

#define KVM_CAP_DEVICE_ASSIGNMENT 17

#endif

#define KVM_CAP_IOMMU 18