RDMA/efa: Do not delay freeing of DMA pages

When destroying a DMA mmapped object, there is no need to artificially
delay the freeing of the pages to the mmap entry removal.  Since the vma
keeps a reference count on these pages, free_pages_exact can be called on
the destroy verb as it won't really free the pages until the reference
count is cleared (in case the user hasn't called munmap yet).

Remove the special handling of DMA pages and call free_pages_exact on
destroy_qp/cq. The mmap entry removal is moved to the beginning of the
destroy flows, so the driver can safely free the pages.

Link: https://lore.kernel.org/r/20200225114010.21790-4-galpress@amazon.com
Reviewed-by: Firas JahJah <firasj@amazon.com>
Reviewed-by: Yossi Leybovich <sleybo@amazon.com>
Signed-off-by: Gal Pressman <galpress@amazon.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index ec55458..bf3120f 100644 (file)
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
 /*
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All rights reserved.
+ * Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All rights reserved.
  */
 
 #include <linux/vmalloc.h>
@@ -169,6 +169,14 @@ static void *efa_zalloc_mapped(struct efa_dev *dev, dma_addr_t *dma_addr,
        return addr;
 }
 
+static void efa_free_mapped(struct efa_dev *dev, void *cpu_addr,
+                           dma_addr_t dma_addr,
+                           size_t size, enum dma_data_direction dir)
+{
+       dma_unmap_single(&dev->pdev->dev, dma_addr, size, dir);
+       free_pages_exact(cpu_addr, size);
+}
+
 int efa_query_device(struct ib_device *ibdev,
                     struct ib_device_attr *props,
                     struct ib_udata *udata)
@@ -402,6 +410,9 @@ int efa_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)
        int err;
 
        ibdev_dbg(&dev->ibdev, "Destroy qp[%u]\n", ibqp->qp_num);
+
+       efa_qp_user_mmap_entries_remove(qp);
+
        err = efa_destroy_qp_handle(dev, qp->qp_handle);
        if (err)
                return err;
@@ -411,11 +422,10 @@ int efa_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)
                          "qp->cpu_addr[0x%p] freed: size[%lu], dma[%pad]\n",
                          qp->rq_cpu_addr, qp->rq_size,
                          &qp->rq_dma_addr);
-               dma_unmap_single(&dev->pdev->dev, qp->rq_dma_addr, qp->rq_size,
-                                DMA_TO_DEVICE);
+               efa_free_mapped(dev, qp->rq_cpu_addr, qp->rq_dma_addr,
+                               qp->rq_size, DMA_TO_DEVICE);
        }
 
-       efa_qp_user_mmap_entries_remove(qp);
        kfree(qp);
        return 0;
 }
@@ -720,13 +730,9 @@ err_remove_mmap_entries:
 err_destroy_qp:
        efa_destroy_qp_handle(dev, create_qp_resp.qp_handle);
 err_free_mapped:
-       if (qp->rq_size) {
-               dma_unmap_single(&dev->pdev->dev, qp->rq_dma_addr, qp->rq_size,
-                                DMA_TO_DEVICE);
-
-               if (!qp->rq_mmap_entry)
-                       free_pages_exact(qp->rq_cpu_addr, qp->rq_size);
-       }
+       if (qp->rq_size)
+               efa_free_mapped(dev, qp->rq_cpu_addr, qp->rq_dma_addr,
+                               qp->rq_size, DMA_TO_DEVICE);
 err_free_qp:
        kfree(qp);
 err_out:
@@ -845,10 +851,10 @@ void efa_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)
                  "Destroy cq[%d] virt[0x%p] freed: size[%lu], dma[%pad]\n",
                  cq->cq_idx, cq->cpu_addr, cq->size, &cq->dma_addr);
 
-       efa_destroy_cq_idx(dev, cq->cq_idx);
-       dma_unmap_single(&dev->pdev->dev, cq->dma_addr, cq->size,
-                        DMA_FROM_DEVICE);
        rdma_user_mmap_entry_remove(cq->mmap_entry);
+       efa_destroy_cq_idx(dev, cq->cq_idx);
+       efa_free_mapped(dev, cq->cpu_addr, cq->dma_addr, cq->size,
+                       DMA_FROM_DEVICE);
 }
 
 static int cq_mmap_entries_setup(struct efa_dev *dev, struct efa_cq *cq,
@@ -985,10 +991,8 @@ err_remove_mmap:
 err_destroy_cq:
        efa_destroy_cq_idx(dev, cq->cq_idx);
 err_free_mapped:
-       dma_unmap_single(&dev->pdev->dev, cq->dma_addr, cq->size,
-                        DMA_FROM_DEVICE);
-       if (!cq->mmap_entry)
-               free_pages_exact(cq->cpu_addr, cq->size);
+       efa_free_mapped(dev, cq->cpu_addr, cq->dma_addr, cq->size,
+                       DMA_FROM_DEVICE);
 
 err_out:
        atomic64_inc(&dev->stats.sw_stats.create_cq_err);
@@ -1550,10 +1554,6 @@ void efa_mmap_free(struct rdma_user_mmap_entry *rdma_entry)
 {
        struct efa_user_mmap_entry *entry = to_emmap(rdma_entry);
 
-       /* DMA mapping is already gone, now free the pages */
-       if (entry->mmap_flag == EFA_MMAP_DMA_PAGE)
-               free_pages_exact(phys_to_virt(entry->address),
-                                entry->rdma_entry.npages * PAGE_SIZE);
        kfree(entry);
 }