Merge pull request #186 from bo3z/bugfix/driver-fixes

Various driver fixes and safe-guards

Author: maximilianheer

driver/src/coyote_setup.c

@@ -445,7 +445,20 @@ int setup_vfpga_devices(struct bus_driver_data *data) {
         device_destroy(data->vfpga_class, MKDEV(data->vfpga_major, j));
         cdev_del(&data->vfpga_dev[j].cdev);
     }
-    if( data->en_wb) {
+	// Unmap control register regions if they were mapped
+	if (data->vfpga_dev[i].fpga_lTlb) {
+        iounmap(data->vfpga_dev[i].fpga_lTlb);
+        data->vfpga_dev[i].fpga_lTlb = NULL;
+    }
+    if (data->vfpga_dev[i].fpga_sTlb) {
+        iounmap(data->vfpga_dev[i].fpga_sTlb);
+        data->vfpga_dev[i].fpga_sTlb = NULL;
+    }
+    if (data->vfpga_dev[i].cnfg_regs) {
+        iounmap(data->vfpga_dev[i].cnfg_regs);
+        data->vfpga_dev[i].cnfg_regs = NULL;
+	}
+    if (data->en_wb) {
         set_memory_wb((uint64_t)data->vfpga_dev[i].wb_addr_virt, N_WB_PAGES);
         dma_free_coherent(&data->pci_dev->dev, WB_SIZE, data->vfpga_dev[i].wb_addr_virt, data->vfpga_dev[i].wb_phys_addr);
     }
@@ -487,6 +500,20 @@ void teardown_vfpga_devices(struct bus_driver_data *data) {
         device_destroy(data->vfpga_class, MKDEV(data->vfpga_major, i));
         cdev_del(&data->vfpga_dev[i].cdev);
 
+        // Unmap control register regions if they were mapped
+        if (data->vfpga_dev[i].fpga_lTlb) {
+            iounmap(data->vfpga_dev[i].fpga_lTlb);
+            data->vfpga_dev[i].fpga_lTlb = NULL;
+        }
+        if (data->vfpga_dev[i].fpga_sTlb) {
+            iounmap(data->vfpga_dev[i].fpga_sTlb);
+            data->vfpga_dev[i].fpga_sTlb = NULL;
+        }
+        if (data->vfpga_dev[i].cnfg_regs) {
+            iounmap(data->vfpga_dev[i].cnfg_regs);
+            data->vfpga_dev[i].cnfg_regs = NULL;
+        }
+
         if(data->en_wb) {
             set_memory_wb((uint64_t)data->vfpga_dev[i].wb_addr_virt, N_WB_PAGES);
             dma_free_coherent(&data->pci_dev->dev, WB_SIZE, data->vfpga_dev[i].wb_addr_virt, data->vfpga_dev[i].wb_phys_addr);

driver/src/vfpga/vfpga_gup.c

@@ -281,7 +281,7 @@ struct user_pages* tlb_get_user_pages(struct vfpga_dev *device, struct pf_aligne
 
     user_pg->pages = vmalloc(pf_desc->n_pages * sizeof(*user_pg->pages));
     BUG_ON(!user_pg->pages);
-    for (int i = 0; i < pf_desc->n_pages - 1; i++) {
+    for (int i = 0; i < pf_desc->n_pages; i++) {
         user_pg->pages[i] = NULL;
     }
 

driver/src/vfpga/vfpga_isr.c

@@ -58,7 +58,7 @@ irqreturn_t vfpga_isr(int irq, void *d) {
         case IRQ_PFAULT:
             // vFPGA issued page fault; issue asynchronous work via vfpga_pfault_handler to handle the page fault
             dbg_info("(irq=%d) page fault, vFPGA %d\n", irq, device->id);
-            struct vfpga_irq_pfault *irq_pf = kzalloc(sizeof(struct vfpga_irq_pfault), GFP_KERNEL);
+            struct vfpga_irq_pfault *irq_pf = kzalloc(sizeof(struct vfpga_irq_pfault), GFP_ATOMIC);
             BUG_ON(!irq_pf);
 
             irq_pf->device = device;
@@ -67,14 +67,15 @@ irqreturn_t vfpga_isr(int irq, void *d) {
             INIT_WORK(&irq_pf->work_pfault, vfpga_pfault_handler);
 
             if(!queue_work(device->wqueue_pfault, &irq_pf->work_pfault)) {
-                pr_err("could not enqueue a workqueue, page fault ISR");
+                pr_err("could not enqueue a workqueue, page fault ISR\n");
+                kfree(irq_pf);
             }
             break;
 
         case IRQ_NOTIFY:
             // vFPGA issued a user interrupt (notification); issue asynchronous work via vfpga_notify_handler to handle the user interrupt
             dbg_info("(irq=%d) notify, vFPGA %d\n", irq, device->id);
-            struct vfpga_irq_notify *irq_not = kzalloc(sizeof(struct vfpga_irq_notify), GFP_KERNEL);
+            struct vfpga_irq_notify *irq_not = kzalloc(sizeof(struct vfpga_irq_notify), GFP_ATOMIC);
             BUG_ON(!irq_not);
 
             irq_not->device = device;
@@ -83,7 +84,8 @@ irqreturn_t vfpga_isr(int irq, void *d) {
             INIT_WORK(&irq_not->work_notify, vfpga_notify_handler);
 
             if(!queue_work(device->wqueue_notify, &irq_not->work_notify)) {
-                pr_err("could not enqueue a workqueue, notify ISR");
+                pr_err("could not enqueue a workqueue, notify ISR\n");
+                kfree(irq_not);
             }
             break;
 
@@ -186,7 +188,10 @@ void vfpga_pfault_handler(struct work_struct *work) {
     mutex_unlock(&device->mmu_lock);
     dbg_info("page fault vFPGA %d handled\n", device->id);
     kfree(irq_pf);
+    return;
 
 err_mmu:
+    mutex_unlock(&device->mmu_lock);
+    kfree(irq_pf);
     return;
 }

driver/src/vfpga/vfpga_ops.c

@@ -135,6 +135,7 @@ long vfpga_dev_ioctl(struct file *file, unsigned int command, unsigned long arg)
                 // Check if a new Coyote thread can be registered
                 if (device->num_free_ctid_chunks == 0) {
                     dbg_info("no free ctid chunks left for hpid %d, spid %d\n", hpid, spid);
+                    mutex_unlock(&device->pid_lock);
                     return -ENOMEM;
                 }
 
@@ -663,7 +664,7 @@ int vfpga_dev_mmap(struct file *file, struct vm_area_struct *vma) {
 
         // dma_mmap_coherent expects vma->pg_offs to be 0; hence MMAP_WB was changed to 0 and MMAP_CTRL to 3
         int ret_val = dma_mmap_coherent(
-            &device->bd_data->pci_dev->dev, vma, (void *) device->wb_addr_virt, device->wb_phys_addr, PAGE_SIZE 
+            &device->bd_data->pci_dev->dev, vma, (void *) device->wb_addr_virt, device->wb_phys_addr, WB_SIZE 
         );
 
         if (ret_val) {