[Qemu-devel] [PATCH v11 06/22] vfio iommu type1: Update arguments of vfio_lock_acct

[Kirti Wankhede]

Updated arguments of vfio_lock_acct to take mm structure as input argument

Signed-off-by: Kirti Wankhede <address@hidden>
Signed-off-by: Neo Jia <address@hidden>
Change-Id: I5d3673cc9d3786bb436b395d5f74537f1a36da80
---
 drivers/vfio/vfio_iommu_type1.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 7fb87f008e0a..02b302d0b7de 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -150,17 +150,16 @@ static void vfio_lock_acct_bg(struct work_struct *work)
        kfree(vwork);
 }
 
-static void vfio_lock_acct(long npage)
+static void vfio_lock_acct(struct mm_struct *mm, long npage)
 {
        struct vwork *vwork;
-       struct mm_struct *mm;
 
-       if (!current->mm || !npage)
+       if (!mm || !npage)
                return; /* process exited or nothing to do */
 
-       if (down_write_trylock(&current->mm->mmap_sem)) {
-               current->mm->locked_vm += npage;
-               up_write(&current->mm->mmap_sem);
+       if (down_write_trylock(&mm->mmap_sem)) {
+               mm->locked_vm += npage;
+               up_write(&mm->mmap_sem);
                return;
        }
 
@@ -172,8 +171,7 @@ static void vfio_lock_acct(long npage)
        vwork = kmalloc(sizeof(struct vwork), GFP_KERNEL);
        if (!vwork)
                return;
-       mm = get_task_mm(current);
-       if (!mm) {
+       if (!mmget_not_zero(mm)) {
                kfree(vwork);
                return;
        }
@@ -285,7 +283,7 @@ static long __vfio_pin_pages_remote(unsigned long vaddr, 
long npage,
 
        if (unlikely(disable_hugepages)) {
                if (!rsvd)
-                       vfio_lock_acct(1);
+                       vfio_lock_acct(current->mm, 1);
                return 1;
        }
 
@@ -313,7 +311,7 @@ static long __vfio_pin_pages_remote(unsigned long vaddr, 
long npage,
        }
 
        if (!rsvd)
-               vfio_lock_acct(i);
+               vfio_lock_acct(current->mm, i);
 
        return i;
 }
@@ -328,7 +326,7 @@ static long __vfio_unpin_pages_remote(unsigned long pfn, 
long npage,
                unlocked += put_pfn(pfn++, prot);
 
        if (do_accounting)
-               vfio_lock_acct(-unlocked);
+               vfio_lock_acct(current->mm, -unlocked);
 
        return unlocked;
 }
@@ -390,7 +388,7 @@ static void vfio_unmap_unpin(struct vfio_iommu *iommu, 
struct vfio_dma *dma)
                cond_resched();
        }
 
-       vfio_lock_acct(-unlocked);
+       vfio_lock_acct(current->mm, -unlocked);
 }
 
 static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma)
-- 
2.7.0