Commit 37824952 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/odp: Use kvcalloc for the dma_list and page_list 

There is no specific need for these to be in the valloc space, let the
system decide automatically how to do the allocation.

Link: https://lore.kernel.org/r/20190819111710.18440-10-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 204e3e56

drivers/infiniband/core/umem_odp.c

+8 −8
Original line number Diff line number Diff line
@@ -314,13 +314,13 @@ static inline int ib_init_umem_odp(struct ib_umem_odp *umem_odp, 
		 */

		umem_odp->interval_tree.last--;



		umem_odp->page_list = vzalloc(

			array_size(sizeof(*umem_odp->page_list), pages));

		umem_odp->page_list = kvcalloc(

			pages, sizeof(*umem_odp->page_list), GFP_KERNEL);

		if (!umem_odp->page_list)

			return -ENOMEM;



		umem_odp->dma_list =

			vzalloc(array_size(sizeof(*umem_odp->dma_list), pages));

		umem_odp->dma_list = kvcalloc(

			pages, sizeof(*umem_odp->dma_list), GFP_KERNEL);

		if (!umem_odp->dma_list) {

			ret = -ENOMEM;

			goto out_page_list;
@@ -354,9 +354,9 @@ static inline int ib_init_umem_odp(struct ib_umem_odp *umem_odp, 


out_unlock:

	mutex_unlock(&ctx->per_mm_list_lock);

	vfree(umem_odp->dma_list);

	kvfree(umem_odp->dma_list);

out_page_list:

	vfree(umem_odp->page_list);

	kvfree(umem_odp->page_list);

	return ret;

}
@@ -532,8 +532,8 @@ void ib_umem_odp_release(struct ib_umem_odp *umem_odp) 
		ib_umem_odp_unmap_dma_pages(umem_odp, ib_umem_start(umem_odp),

					    ib_umem_end(umem_odp));

		remove_umem_from_per_mm(umem_odp);

		vfree(umem_odp->dma_list);

		vfree(umem_odp->page_list);

		kvfree(umem_odp->dma_list);

		kvfree(umem_odp->page_list);

	}

	put_per_mm(umem_odp);

	mmdrop(umem_odp->umem.owning_mm);

CRA Git | Maintained and supported by SUSTech CRA and CCSE