On 08/07/2019 12:14, Michal Kalderon wrote:
Hi, a few nits:
> Remove the functions related to managing the mmap_xa database.
> This code was copied to the ib_core. Use the common API's instead.
>
> Signed-off-by: Michal Kalderon <michal.kalderon@xxxxxxxxxxx>
> ---
> drivers/infiniband/hw/efa/efa.h | 3 +-
> drivers/infiniband/hw/efa/efa_main.c | 1 +
> drivers/infiniband/hw/efa/efa_verbs.c | 183 ++++++++--------------------------
> 3 files changed, 42 insertions(+), 145 deletions(-)
> diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
> index df77bc312a25..5dff892da161 100644
> --- a/drivers/infiniband/hw/efa/efa_verbs.c
> +++ b/drivers/infiniband/hw/efa/efa_verbs.c
> @@ -13,34 +13,15 @@
>
> #include "efa.h"
>
> -#define EFA_MMAP_FLAG_SHIFT 56
> -#define EFA_MMAP_PAGE_MASK GENMASK(EFA_MMAP_FLAG_SHIFT - 1, 0)
> -#define EFA_MMAP_INVALID U64_MAX
> -
Don't delete the blank line please.
> enum {
> EFA_MMAP_DMA_PAGE = 0,
> EFA_MMAP_IO_WC,
> EFA_MMAP_IO_NC,
> };
> -
> #define EFA_AENQ_ENABLED_GROUPS \
> (BIT(EFA_ADMIN_FATAL_ERROR) | BIT(EFA_ADMIN_WARNING) | \
> BIT(EFA_ADMIN_NOTIFICATION) | BIT(EFA_ADMIN_KEEP_ALIVE))
>
> -struct efa_mmap_entry {
> - void *obj;
> - u64 address;
> - u64 length;
> - u32 mmap_page;
> - u8 mmap_flag;
> -};
> -
> -static inline u64 get_mmap_key(const struct efa_mmap_entry *efa)
> -{
> - return ((u64)efa->mmap_flag << EFA_MMAP_FLAG_SHIFT) |
> - ((u64)efa->mmap_page << PAGE_SHIFT);
> -}
> -
> #define EFA_CHUNK_PAYLOAD_SHIFT 12
> #define EFA_CHUNK_PAYLOAD_SIZE BIT(EFA_CHUNK_PAYLOAD_SHIFT)
> #define EFA_CHUNK_PAYLOAD_PTR_SIZE 8
> @@ -145,105 +126,7 @@ static void *efa_zalloc_mapped(struct efa_dev *dev, dma_addr_t *dma_addr,
> return addr;
> }
>
> -/*
> - * This is only called when the ucontext is destroyed and there can be no
> - * concurrent query via mmap or allocate on the xarray, thus we can be sure no
> - * other thread is using the entry pointer. We also know that all the BAR
> - * pages have either been zap'd or munmaped at this point. Normal pages are
> - * refcounted and will be freed at the proper time.
> - */
> -static void mmap_entries_remove_free(struct efa_dev *dev,
> - struct efa_ucontext *ucontext)
> -{
> - struct efa_mmap_entry *entry;
> - unsigned long mmap_page;
>
> - xa_for_each(&ucontext->mmap_xa, mmap_page, entry) {
> - xa_erase(&ucontext->mmap_xa, mmap_page);
> -
> - ibdev_dbg(
> - &dev->ibdev,
> - "mmap: obj[0x%p] key[%#llx] addr[%#llx] len[%#llx] removed\n",
> - entry->obj, get_mmap_key(entry), entry->address,
> - entry->length);
> - if (entry->mmap_flag == EFA_MMAP_DMA_PAGE)
> - /* DMA mapping is already gone, now free the pages */
> - free_pages_exact(phys_to_virt(entry->address),
> - entry->length);
> - kfree(entry);
> - }
> -}
> -
> -static struct efa_mmap_entry *mmap_entry_get(struct efa_dev *dev,
> - struct efa_ucontext *ucontext,
> - u64 key, u64 len)
> -{
> - struct efa_mmap_entry *entry;
> - u64 mmap_page;
> -
> - mmap_page = (key & EFA_MMAP_PAGE_MASK) >> PAGE_SHIFT;
> - if (mmap_page > U32_MAX)
> - return NULL;
> -
> - entry = xa_load(&ucontext->mmap_xa, mmap_page);
> - if (!entry || get_mmap_key(entry) != key || entry->length != len)
> - return NULL;
> -
> - ibdev_dbg(&dev->ibdev,
> - "mmap: obj[0x%p] key[%#llx] addr[%#llx] len[%#llx] removed\n",
> - entry->obj, key, entry->address, entry->length);
> -
> - return entry;
> -}
> -
> -/*
> - * Note this locking scheme cannot support removal of entries, except during
> - * ucontext destruction when the core code guarentees no concurrency.
> - */
> -static u64 mmap_entry_insert(struct efa_dev *dev, struct efa_ucontext *ucontext,
> - void *obj, u64 address, u64 length, u8 mmap_flag)
> -{
> - struct efa_mmap_entry *entry;
> - u32 next_mmap_page;
> - int err;
> -
> - entry = kmalloc(sizeof(*entry), GFP_KERNEL);
> - if (!entry)
> - return EFA_MMAP_INVALID;
> -
> - entry->obj = obj;
> - entry->address = address;
> - entry->length = length;
> - entry->mmap_flag = mmap_flag;
> -
> - xa_lock(&ucontext->mmap_xa);
> - if (check_add_overflow(ucontext->mmap_xa_page,
> - (u32)(length >> PAGE_SHIFT),
> - &next_mmap_page))
> - goto err_unlock;
> -
> - entry->mmap_page = ucontext->mmap_xa_page;
> - ucontext->mmap_xa_page = next_mmap_page;
> - err = __xa_insert(&ucontext->mmap_xa, entry->mmap_page, entry,
> - GFP_KERNEL);
> - if (err)
> - goto err_unlock;
> -
> - xa_unlock(&ucontext->mmap_xa);
> -
> - ibdev_dbg(
> - &dev->ibdev,
> - "mmap: obj[0x%p] addr[%#llx], len[%#llx], key[%#llx] inserted\n",
> - entry->obj, entry->address, entry->length, get_mmap_key(entry));
> -
> - return get_mmap_key(entry);
> -
> -err_unlock:
> - xa_unlock(&ucontext->mmap_xa);
> - kfree(entry);
> - return EFA_MMAP_INVALID;
> -
> -}
>
You left two extra blank lines between efa_zalloc_mapped and efa_query_device.
> int efa_query_device(struct ib_device *ibdev,
> struct ib_device_attr *props,
> @@ -488,45 +371,52 @@ static int qp_mmap_entries_setup(struct efa_qp *qp,
> struct efa_com_create_qp_params *params,
> struct efa_ibv_create_qp_resp *resp)
> {
> + u64 address;
> + u64 length;
Line break.
> /*
> * Once an entry is inserted it might be mmapped, hence cannot be
> * cleaned up until dealloc_ucontext.
> */
> resp->sq_db_mmap_key =
> - mmap_entry_insert(dev, ucontext, qp,
> - dev->db_bar_addr + resp->sq_db_offset,
> - PAGE_SIZE, EFA_MMAP_IO_NC);
> - if (resp->sq_db_mmap_key == EFA_MMAP_INVALID)
> + rdma_user_mmap_entry_insert(&ucontext->ibucontext, qp,
> + dev->db_bar_addr +
> + resp->sq_db_offset,
> + PAGE_SIZE, EFA_MMAP_IO_NC);
> + if (resp->sq_db_mmap_key == RDMA_USER_MMAP_INVALID)
> return -ENOMEM;
>
> resp->sq_db_offset &= ~PAGE_MASK;
>
> + address = dev->mem_bar_addr + resp->llq_desc_offset;
> + length = PAGE_ALIGN(params->sq_ring_size_in_bytes +
> + (resp->llq_desc_offset & ~PAGE_MASK));
> resp->llq_desc_mmap_key =
> - mmap_entry_insert(dev, ucontext, qp,
> - dev->mem_bar_addr + resp->llq_desc_offset,
> - PAGE_ALIGN(params->sq_ring_size_in_bytes +
> - (resp->llq_desc_offset & ~PAGE_MASK)),
> - EFA_MMAP_IO_WC);
> - if (resp->llq_desc_mmap_key == EFA_MMAP_INVALID)
> + rdma_user_mmap_entry_insert(&ucontext->ibucontext, qp,
> + address,
> + length,
> + EFA_MMAP_IO_WC);
> + if (resp->llq_desc_mmap_key == RDMA_USER_MMAP_INVALID)
> return -ENOMEM;
>
> resp->llq_desc_offset &= ~PAGE_MASK;
>
> if (qp->rq_size) {
> + address = dev->db_bar_addr + resp->rq_db_offset;
> resp->rq_db_mmap_key =
> - mmap_entry_insert(dev, ucontext, qp,
> - dev->db_bar_addr + resp->rq_db_offset,
> - PAGE_SIZE, EFA_MMAP_IO_NC);
> - if (resp->rq_db_mmap_key == EFA_MMAP_INVALID)
> + rdma_user_mmap_entry_insert(&ucontext->ibucontext, qp,
> + address, PAGE_SIZE,
> + EFA_MMAP_IO_NC);
> + if (resp->rq_db_mmap_key == RDMA_USER_MMAP_INVALID)
> return -ENOMEM;
>
> resp->rq_db_offset &= ~PAGE_MASK;
>
> + address = virt_to_phys(qp->rq_cpu_addr);
> resp->rq_mmap_key =
> - mmap_entry_insert(dev, ucontext, qp,
> - virt_to_phys(qp->rq_cpu_addr),
> - qp->rq_size, EFA_MMAP_DMA_PAGE);
> - if (resp->rq_mmap_key == EFA_MMAP_INVALID)
> + rdma_user_mmap_entry_insert(&ucontext->ibucontext, qp,
> + address, qp->rq_size,
> + EFA_MMAP_DMA_PAGE);
> + if (resp->rq_mmap_key == RDMA_USER_MMAP_INVALID)
> return -ENOMEM;
>
> resp->rq_mmap_size = qp->rq_size;
> @@ -875,11 +765,13 @@ void efa_destroy_cq(struct ib_cq *ibcq, struct ib_udata *udata)
> static int cq_mmap_entries_setup(struct efa_dev *dev, struct efa_cq *cq,
> struct efa_ibv_create_cq_resp *resp)
> {
> + struct efa_ucontext *ucontext = cq->ucontext;
Line break.
> resp->q_mmap_size = cq->size;
> - resp->q_mmap_key = mmap_entry_insert(dev, cq->ucontext, cq,
> - virt_to_phys(cq->cpu_addr),
> - cq->size, EFA_MMAP_DMA_PAGE);
> - if (resp->q_mmap_key == EFA_MMAP_INVALID)
> + resp->q_mmap_key =
> + rdma_user_mmap_entry_insert(&ucontext->ibucontext, cq,
> + virt_to_phys(cq->cpu_addr),
> + cq->size, EFA_MMAP_DMA_PAGE);
> + if (resp->q_mmap_key == RDMA_USER_MMAP_INVALID)
> return -ENOMEM;
>
> return 0;
> @@ -1531,7 +1423,6 @@ int efa_alloc_ucontext(struct ib_ucontext *ibucontext, struct ib_udata *udata)
> goto err_out;
>
> ucontext->uarn = result.uarn;
> - xa_init(&ucontext->mmap_xa);
>
> resp.cmds_supp_udata_mask |= EFA_USER_CMDS_SUPP_UDATA_QUERY_DEVICE;
> resp.cmds_supp_udata_mask |= EFA_USER_CMDS_SUPP_UDATA_CREATE_AH;
> @@ -1560,19 +1451,25 @@ void efa_dealloc_ucontext(struct ib_ucontext *ibucontext)
> struct efa_ucontext *ucontext = to_eucontext(ibucontext);
> struct efa_dev *dev = to_edev(ibucontext->device);
>
> - mmap_entries_remove_free(dev, ucontext);
> efa_dealloc_uar(dev, ucontext->uarn);
> }
>
> +void efa_mmap_free(u64 address, u64 length, u8 mmap_flag)
> +{
> + /* DMA mapping is already gone, now free the pages */
> + if (mmap_flag == EFA_MMAP_DMA_PAGE)
> + free_pages_exact(phys_to_virt(address), length);
> +}
> +
> static int __efa_mmap(struct efa_dev *dev, struct efa_ucontext *ucontext,
> struct vm_area_struct *vma, u64 key, u64 length)
> {
> - struct efa_mmap_entry *entry;
> + struct rdma_user_mmap_entry *entry;
> unsigned long va;
> u64 pfn;
> int err;
>
> - entry = mmap_entry_get(dev, ucontext, key, length);
> + entry = rdma_user_mmap_entry_get(&ucontext->ibucontext, key, length);
> if (!entry) {
> ibdev_dbg(&dev->ibdev, "key[%#llx] does not have valid entry\n",
> key);
>
