]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
KVM: rename vtd.c to iommu.c
authorJoerg Roedel <joerg.roedel@amd.com>
Wed, 26 Nov 2008 14:51:19 +0000 (15:51 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Sat, 3 Jan 2009 13:10:09 +0000 (14:10 +0100)
Impact: file renamed

The code in the vtd.c file can be reused for other IOMMUs as well. So
rename it to make it clear that it handle more than VT-d.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
arch/ia64/kvm/Makefile
arch/x86/kvm/Makefile
virt/kvm/iommu.c [new file with mode: 0644]
virt/kvm/vtd.c [deleted file]

index 76464dc312e63f781ded9f8abcbcfb8322c29a89..cb69dfcfb1a65cb93000ae44f48e2a25a51f66a5 100644 (file)
@@ -52,7 +52,7 @@ 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)
+common-objs += $(addprefix ../../../virt/kvm/, iommu.o)
 endif
 
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
index c02343594b4de95bb79ce31bf78de03fb48ed636..00f46c2d14bd90325fca467ab90f2344c2f01c2d 100644 (file)
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_KVM_TRACE),y)
 common-objs += $(addprefix ../../../virt/kvm/, kvm_trace.o)
 endif
 ifeq ($(CONFIG_DMAR),y)
-common-objs += $(addprefix ../../../virt/kvm/, vtd.o)
+common-objs += $(addprefix ../../../virt/kvm/, iommu.o)
 endif
 
 EXTRA_CFLAGS += -Ivirt/kvm -Iarch/x86/kvm
diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
new file mode 100644 (file)
index 0000000..d46de9a
--- /dev/null
@@ -0,0 +1,217 @@
+/*
+ * Copyright (c) 2006, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place - Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * Copyright (C) 2006-2008 Intel Corporation
+ * Copyright IBM Corporation, 2008
+ * Author: Allen M. Kay <allen.m.kay@intel.com>
+ * Author: Weidong Han <weidong.han@intel.com>
+ * Author: Ben-Ami Yassour <benami@il.ibm.com>
+ */
+
+#include <linux/list.h>
+#include <linux/kvm_host.h>
+#include <linux/pci.h>
+#include <linux/dmar.h>
+#include <linux/intel-iommu.h>
+
+static int kvm_iommu_unmap_memslots(struct kvm *kvm);
+static void kvm_iommu_put_pages(struct kvm *kvm,
+                               gfn_t base_gfn, unsigned long npages);
+
+int kvm_iommu_map_pages(struct kvm *kvm,
+                       gfn_t base_gfn, unsigned long npages)
+{
+       gfn_t gfn = base_gfn;
+       pfn_t pfn;
+       int i, r = 0;
+       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
+
+       /* check if iommu exists and in use */
+       if (!domain)
+               return 0;
+
+       for (i = 0; i < npages; i++) {
+               /* check if already mapped */
+               if (intel_iommu_iova_to_phys(domain,
+                                            gfn_to_gpa(gfn)))
+                       continue;
+
+               pfn = gfn_to_pfn(kvm, gfn);
+               r = intel_iommu_map_address(domain,
+                                           gfn_to_gpa(gfn),
+                                           pfn_to_hpa(pfn),
+                                           PAGE_SIZE,
+                                           DMA_PTE_READ | DMA_PTE_WRITE);
+               if (r) {
+                       printk(KERN_ERR "kvm_iommu_map_address:"
+                              "iommu failed to map pfn=%lx\n", pfn);
+                       goto unmap_pages;
+               }
+               gfn++;
+       }
+       return 0;
+
+unmap_pages:
+       kvm_iommu_put_pages(kvm, base_gfn, i);
+       return r;
+}
+
+static int kvm_iommu_map_memslots(struct kvm *kvm)
+{
+       int i, r;
+
+       down_read(&kvm->slots_lock);
+       for (i = 0; i < kvm->nmemslots; i++) {
+               r = kvm_iommu_map_pages(kvm, kvm->memslots[i].base_gfn,
+                                       kvm->memslots[i].npages);
+               if (r)
+                       break;
+       }
+       up_read(&kvm->slots_lock);
+       return r;
+}
+
+int kvm_assign_device(struct kvm *kvm,
+                     struct kvm_assigned_dev_kernel *assigned_dev)
+{
+       struct pci_dev *pdev = NULL;
+       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
+       int r;
+
+       /* check if iommu exists and in use */
+       if (!domain)
+               return 0;
+
+       pdev = assigned_dev->dev;
+       if (pdev == NULL)
+               return -ENODEV;
+
+       r = intel_iommu_attach_device(domain, pdev);
+       if (r) {
+               printk(KERN_ERR "assign device %x:%x.%x failed",
+                       pdev->bus->number,
+                       PCI_SLOT(pdev->devfn),
+                       PCI_FUNC(pdev->devfn));
+               return r;
+       }
+
+       printk(KERN_DEBUG "assign device: host bdf = %x:%x:%x\n",
+               assigned_dev->host_busnr,
+               PCI_SLOT(assigned_dev->host_devfn),
+               PCI_FUNC(assigned_dev->host_devfn));
+
+       return 0;
+}
+
+int kvm_deassign_device(struct kvm *kvm,
+                       struct kvm_assigned_dev_kernel *assigned_dev)
+{
+       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
+       struct pci_dev *pdev = NULL;
+
+       /* check if iommu exists and in use */
+       if (!domain)
+               return 0;
+
+       pdev = assigned_dev->dev;
+       if (pdev == NULL)
+               return -ENODEV;
+
+       intel_iommu_detach_device(domain, pdev);
+
+       printk(KERN_DEBUG "deassign device: host bdf = %x:%x:%x\n",
+               assigned_dev->host_busnr,
+               PCI_SLOT(assigned_dev->host_devfn),
+               PCI_FUNC(assigned_dev->host_devfn));
+
+       return 0;
+}
+
+int kvm_iommu_map_guest(struct kvm *kvm)
+{
+       int r;
+
+       if (!intel_iommu_found()) {
+               printk(KERN_ERR "%s: intel iommu not found\n", __func__);
+               return -ENODEV;
+       }
+
+       kvm->arch.intel_iommu_domain = intel_iommu_alloc_domain();
+       if (!kvm->arch.intel_iommu_domain)
+               return -ENOMEM;
+
+       r = kvm_iommu_map_memslots(kvm);
+       if (r)
+               goto out_unmap;
+
+       return 0;
+
+out_unmap:
+       kvm_iommu_unmap_memslots(kvm);
+       return r;
+}
+
+static void kvm_iommu_put_pages(struct kvm *kvm,
+                               gfn_t base_gfn, unsigned long npages)
+{
+       gfn_t gfn = base_gfn;
+       pfn_t pfn;
+       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
+       unsigned long i;
+       u64 phys;
+
+       /* check if iommu exists and in use */
+       if (!domain)
+               return;
+
+       for (i = 0; i < npages; i++) {
+               phys = intel_iommu_iova_to_phys(domain,
+                                               gfn_to_gpa(gfn));
+               pfn = phys >> PAGE_SHIFT;
+               kvm_release_pfn_clean(pfn);
+               gfn++;
+       }
+
+       intel_iommu_unmap_address(domain,
+                                 gfn_to_gpa(base_gfn),
+                                 PAGE_SIZE * npages);
+}
+
+static int kvm_iommu_unmap_memslots(struct kvm *kvm)
+{
+       int i;
+       down_read(&kvm->slots_lock);
+       for (i = 0; i < kvm->nmemslots; i++) {
+               kvm_iommu_put_pages(kvm, kvm->memslots[i].base_gfn,
+                                   kvm->memslots[i].npages);
+       }
+       up_read(&kvm->slots_lock);
+
+       return 0;
+}
+
+int kvm_iommu_unmap_guest(struct kvm *kvm)
+{
+       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
+
+       /* check if iommu exists and in use */
+       if (!domain)
+               return 0;
+
+       kvm_iommu_unmap_memslots(kvm);
+       intel_iommu_free_domain(domain);
+       return 0;
+}
diff --git a/virt/kvm/vtd.c b/virt/kvm/vtd.c
deleted file mode 100644 (file)
index d46de9a..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2006, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Copyright (C) 2006-2008 Intel Corporation
- * Copyright IBM Corporation, 2008
- * Author: Allen M. Kay <allen.m.kay@intel.com>
- * Author: Weidong Han <weidong.han@intel.com>
- * Author: Ben-Ami Yassour <benami@il.ibm.com>
- */
-
-#include <linux/list.h>
-#include <linux/kvm_host.h>
-#include <linux/pci.h>
-#include <linux/dmar.h>
-#include <linux/intel-iommu.h>
-
-static int kvm_iommu_unmap_memslots(struct kvm *kvm);
-static void kvm_iommu_put_pages(struct kvm *kvm,
-                               gfn_t base_gfn, unsigned long npages);
-
-int kvm_iommu_map_pages(struct kvm *kvm,
-                       gfn_t base_gfn, unsigned long npages)
-{
-       gfn_t gfn = base_gfn;
-       pfn_t pfn;
-       int i, r = 0;
-       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
-
-       /* check if iommu exists and in use */
-       if (!domain)
-               return 0;
-
-       for (i = 0; i < npages; i++) {
-               /* check if already mapped */
-               if (intel_iommu_iova_to_phys(domain,
-                                            gfn_to_gpa(gfn)))
-                       continue;
-
-               pfn = gfn_to_pfn(kvm, gfn);
-               r = intel_iommu_map_address(domain,
-                                           gfn_to_gpa(gfn),
-                                           pfn_to_hpa(pfn),
-                                           PAGE_SIZE,
-                                           DMA_PTE_READ | DMA_PTE_WRITE);
-               if (r) {
-                       printk(KERN_ERR "kvm_iommu_map_address:"
-                              "iommu failed to map pfn=%lx\n", pfn);
-                       goto unmap_pages;
-               }
-               gfn++;
-       }
-       return 0;
-
-unmap_pages:
-       kvm_iommu_put_pages(kvm, base_gfn, i);
-       return r;
-}
-
-static int kvm_iommu_map_memslots(struct kvm *kvm)
-{
-       int i, r;
-
-       down_read(&kvm->slots_lock);
-       for (i = 0; i < kvm->nmemslots; i++) {
-               r = kvm_iommu_map_pages(kvm, kvm->memslots[i].base_gfn,
-                                       kvm->memslots[i].npages);
-               if (r)
-                       break;
-       }
-       up_read(&kvm->slots_lock);
-       return r;
-}
-
-int kvm_assign_device(struct kvm *kvm,
-                     struct kvm_assigned_dev_kernel *assigned_dev)
-{
-       struct pci_dev *pdev = NULL;
-       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
-       int r;
-
-       /* check if iommu exists and in use */
-       if (!domain)
-               return 0;
-
-       pdev = assigned_dev->dev;
-       if (pdev == NULL)
-               return -ENODEV;
-
-       r = intel_iommu_attach_device(domain, pdev);
-       if (r) {
-               printk(KERN_ERR "assign device %x:%x.%x failed",
-                       pdev->bus->number,
-                       PCI_SLOT(pdev->devfn),
-                       PCI_FUNC(pdev->devfn));
-               return r;
-       }
-
-       printk(KERN_DEBUG "assign device: host bdf = %x:%x:%x\n",
-               assigned_dev->host_busnr,
-               PCI_SLOT(assigned_dev->host_devfn),
-               PCI_FUNC(assigned_dev->host_devfn));
-
-       return 0;
-}
-
-int kvm_deassign_device(struct kvm *kvm,
-                       struct kvm_assigned_dev_kernel *assigned_dev)
-{
-       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
-       struct pci_dev *pdev = NULL;
-
-       /* check if iommu exists and in use */
-       if (!domain)
-               return 0;
-
-       pdev = assigned_dev->dev;
-       if (pdev == NULL)
-               return -ENODEV;
-
-       intel_iommu_detach_device(domain, pdev);
-
-       printk(KERN_DEBUG "deassign device: host bdf = %x:%x:%x\n",
-               assigned_dev->host_busnr,
-               PCI_SLOT(assigned_dev->host_devfn),
-               PCI_FUNC(assigned_dev->host_devfn));
-
-       return 0;
-}
-
-int kvm_iommu_map_guest(struct kvm *kvm)
-{
-       int r;
-
-       if (!intel_iommu_found()) {
-               printk(KERN_ERR "%s: intel iommu not found\n", __func__);
-               return -ENODEV;
-       }
-
-       kvm->arch.intel_iommu_domain = intel_iommu_alloc_domain();
-       if (!kvm->arch.intel_iommu_domain)
-               return -ENOMEM;
-
-       r = kvm_iommu_map_memslots(kvm);
-       if (r)
-               goto out_unmap;
-
-       return 0;
-
-out_unmap:
-       kvm_iommu_unmap_memslots(kvm);
-       return r;
-}
-
-static void kvm_iommu_put_pages(struct kvm *kvm,
-                               gfn_t base_gfn, unsigned long npages)
-{
-       gfn_t gfn = base_gfn;
-       pfn_t pfn;
-       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
-       unsigned long i;
-       u64 phys;
-
-       /* check if iommu exists and in use */
-       if (!domain)
-               return;
-
-       for (i = 0; i < npages; i++) {
-               phys = intel_iommu_iova_to_phys(domain,
-                                               gfn_to_gpa(gfn));
-               pfn = phys >> PAGE_SHIFT;
-               kvm_release_pfn_clean(pfn);
-               gfn++;
-       }
-
-       intel_iommu_unmap_address(domain,
-                                 gfn_to_gpa(base_gfn),
-                                 PAGE_SIZE * npages);
-}
-
-static int kvm_iommu_unmap_memslots(struct kvm *kvm)
-{
-       int i;
-       down_read(&kvm->slots_lock);
-       for (i = 0; i < kvm->nmemslots; i++) {
-               kvm_iommu_put_pages(kvm, kvm->memslots[i].base_gfn,
-                                   kvm->memslots[i].npages);
-       }
-       up_read(&kvm->slots_lock);
-
-       return 0;
-}
-
-int kvm_iommu_unmap_guest(struct kvm *kvm)
-{
-       struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
-
-       /* check if iommu exists and in use */
-       if (!domain)
-               return 0;
-
-       kvm_iommu_unmap_memslots(kvm);
-       intel_iommu_free_domain(domain);
-       return 0;
-}