X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-host-pci-hw.h;h=0439b51243ae791e6076c1df0a64c9c262ce1681;hb=2cb41f7db5b9f89113432d6b3daff4807ba8e5f2;hp=2a575b6a328a49247102e5118bbf7eab4ef2d7ab;hpb=ea744834e3c756db65cdc211be929891cecafe09;p=palacios.git

diff --git a/linux_module/iface-host-pci-hw.h b/linux_module/iface-host-pci-hw.h
index 2a575b6..0439b51 100644
--- a/linux_module/iface-host-pci-hw.h
+++ b/linux_module/iface-host-pci-hw.h
@@ -30,7 +30,7 @@ static int setup_hw_pci_dev(struct host_pci_device * host_dev) {
     host_dev->hw_dev.dev = dev;
 
     host_dev->hw_dev.intx_disabled = 1;
-    spin_lock_init(&(host_dev->hw_dev.intx_lock));
+    palacios_spinlock_init(&(host_dev->hw_dev.intx_lock));
 
     if (pci_enable_device(dev)) {
 	printk("Could not enable Device\n");
@@ -153,10 +153,10 @@ static irqreturn_t host_pci_intx_irq_handler(int irq, void * priv_data) {
 
     //   printk("Host PCI IRQ handler (%d)\n", irq);
 
-    spin_lock(&(host_dev->hw_dev.intx_lock));
+    palacios_spinlock_lock(&(host_dev->hw_dev.intx_lock));
     disable_irq_nosync(irq);
     host_dev->hw_dev.intx_disabled = 1;
-    spin_unlock(&(host_dev->hw_dev.intx_lock));
+    palacios_spinlock_unlock(&(host_dev->hw_dev.intx_lock));
 
     V3_host_pci_raise_irq(&(host_dev->v3_dev), 0);
 
@@ -289,7 +289,7 @@ static int hw_pci_cmd(struct host_pci_device * host_dev, host_pci_cmd_t cmd, u64
 	    }
 
 	    host_dev->hw_dev.num_msix_vecs = 0;
-	    kfree(host_dev->hw_dev.msix_entries);
+	    palacios_free(host_dev->hw_dev.msix_entries);
 
 	    pci_disable_msix(dev);
 
@@ -311,11 +311,11 @@ static int hw_ack_irq(struct host_pci_device * host_dev, u32 vector) {
 
     //    printk("Acking IRQ vector %d\n", vector);
 
-    spin_lock_irqsave(&(host_dev->hw_dev.intx_lock), flags);
+    palacios_spinlock_lock_irqsave(&(host_dev->hw_dev.intx_lock), flags);
     //    printk("Enabling IRQ %d\n", dev->irq);
     enable_irq(dev->irq);
     host_dev->hw_dev.intx_disabled = 0;
-    spin_unlock_irqrestore(&(host_dev->hw_dev.intx_lock), flags);
+    palacios_spinlock_unlock_irqrestore(&(host_dev->hw_dev.intx_lock), flags);
     
     return 0;
 }
@@ -329,64 +329,62 @@ static int reserve_hw_pci_dev(struct host_pci_device * host_dev, void * v3_ctx)
     struct v3_host_pci_dev * v3_dev = &(host_dev->v3_dev);
     struct pci_dev * dev = host_dev->hw_dev.dev;
 
-    spin_lock_irqsave(&lock, flags);
+    palacios_spinlock_lock_irqsave(&lock, flags);
     if (host_dev->hw_dev.in_use == 0) {
 	host_dev->hw_dev.in_use = 1;
     } else {
 	ret = -1;
     }
-    spin_unlock_irqrestore(&lock, flags);
+    palacios_spinlock_unlock_irqrestore(&lock, flags);
 
 
     if (v3_dev->iface == IOMMU) {
 	struct v3_guest_mem_region region;
 	int flags = 0;
+	uintptr_t gpa = 0;
 
 	host_dev->hw_dev.iommu_domain = iommu_domain_alloc();
 
-	if (V3_get_guest_mem_region(v3_ctx, &region) == -1) {
-	    printk("Error getting VM memory region for IOMMU support\n");
-	    return -1;
-	}
+	while (V3_get_guest_mem_region(v3_ctx, &region, gpa)) {
 	
-	printk("Memory region: start=%p, end=%p\n", (void *)region.start, (void *)region.end);
+	    printk("Memory region: start=%p, end=%p\n", (void *)region.start, (void *)region.end);
 
 
-	flags = IOMMU_READ | IOMMU_WRITE; // Need to see what IOMMU_CACHE means
+	    flags = IOMMU_READ | IOMMU_WRITE; // Need to see what IOMMU_CACHE means
 	
-	/* This version could be wrong */
+	    /* This version could be wrong */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38) 
-	// Guest VAs start at zero and go to end of memory
-	iommu_map_range(host_dev->hw_dev.iommu_domain, 0, region.start, (region.end - region.start), flags);
+	    // Guest VAs start at zero and go to end of memory
+	    iommu_map_range(host_dev->hw_dev.iommu_domain, 0, region.start, (region.end - region.start), flags);
 #else 
-	/* Linux actually made the interface worse... Now you can only map memory in powers of 2 (meant to only be pages...) */
-	{	
-	    u64 size = region.end - region.start;
-	    u32 page_size = 512 * 4096; // assume large 64bit pages (2MB)
-	    u64 dpa = 0; // same as gpa
-	    u64 hpa = region.start;
-
-	    do {
-		if (size < page_size) {
-		    page_size = 4096; // less than a 2MB granularity, so we switch to small pages (4KB)
-		}
-		
-		printk("Mapping IOMMU region dpa=%p hpa=%p (size=%d)\n", (void *)dpa, (void *)hpa, page_size);
-
-		if (iommu_map(host_dev->hw_dev.iommu_domain, dpa, hpa, 
-			      get_order(page_size), flags)) {
-		    printk("ERROR: Could not map sub region (DPA=%p) (HPA=%p) (order=%d)\n", 
-			   (void *)dpa, (void *)hpa, get_order(page_size));
-		    break;
-		}
-
-		hpa += page_size;
-		dpa += page_size;
-
-		size -= page_size;
-	    } while (size);
-	}
+	    /* Linux actually made the interface worse... Now you can only map memory in powers of 2 (meant to only be pages...) */
+	    {	
+		u64 size = region.end - region.start;
+		u32 page_size = 512 * 4096; // assume large 64bit pages (2MB)
+		u64 hpa = region.start;
+
+		do {
+		    if (size < page_size) {
+			page_size = 4096; // less than a 2MB granularity, so we switch to small pages (4KB)
+		    }
+		    
+		    printk("Mapping IOMMU region gpa=%p hpa=%p (size=%d)\n", (void *)gpa, (void *)hpa, page_size);
+		    
+		    if (iommu_map(host_dev->hw_dev.iommu_domain, gpa, hpa, 
+				  get_order(page_size), flags)) {
+			printk("ERROR: Could not map sub region (GPA=%p) (HPA=%p) (order=%d)\n", 
+			       (void *)gpa, (void *)hpa, get_order(page_size));
+			break;
+		    }
+		    
+		    hpa += page_size;
+		    gpa += page_size;
+		    
+		    size -= page_size;
+		} while (size > 0);
+	    }
 #endif
+	}
 
 	if (iommu_attach_device(host_dev->hw_dev.iommu_domain, &(dev->dev))) {
 	    printk("ERROR attaching host PCI device to IOMMU domain\n");
@@ -451,3 +449,9 @@ static int read_hw_pci_config(struct host_pci_device * host_dev, u32 reg, void *
 
     return 0; 
 }
+
+
+//
+// Should be a matching teardown function here, otherwise we
+// are at least leaking the lock from the lockchecker's perspective
+// we would like to be able to do a palacios_spinlock_deinit() here...