Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef2f05c authored by Wengang Wang's avatar Wengang Wang Committed by Doug Ledford
Browse files

IB/mlx4: Use vmalloc for WR buffers when needed 



There are several hits that WR buffer allocation(kmalloc) failed.
It failed at order 3 and/or 4 contigous pages allocation. At the same time
there are actually 100MB+ free memory but well fragmented.
So try vmalloc when kmalloc failed.

Signed-off-by: default avatarWengang Wang <wen.gang.wang@oracle.com>
Acked-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 73d4da7b

drivers/infiniband/hw/mlx4/qp.c

+13 −6
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/log2.h>

#include <linux/slab.h>

#include <linux/netdevice.h>

#include <linux/vmalloc.h>



#include <rdma/ib_cache.h>

#include <rdma/ib_pack.h>
@@ -796,7 +797,13 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
			goto err_mtt;



		qp->sq.wrid = kmalloc(qp->sq.wqe_cnt * sizeof(u64), gfp);

		if (!qp->sq.wrid)

			qp->sq.wrid = __vmalloc(qp->sq.wqe_cnt * sizeof(u64),

						gfp, PAGE_KERNEL);

		qp->rq.wrid = kmalloc(qp->rq.wqe_cnt * sizeof(u64), gfp);

		if (!qp->rq.wrid)

			qp->rq.wrid = __vmalloc(qp->rq.wqe_cnt * sizeof(u64),

						gfp, PAGE_KERNEL);

		if (!qp->sq.wrid || !qp->rq.wrid) {

			err = -ENOMEM;

			goto err_wrid;
@@ -886,8 +893,8 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
		if (qp_has_rq(init_attr))

			mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &qp->db);

	} else {

		kfree(qp->sq.wrid);

		kfree(qp->rq.wrid);

		kvfree(qp->sq.wrid);

		kvfree(qp->rq.wrid);

	}



err_mtt:
@@ -1062,8 +1069,8 @@ static void destroy_qp_common(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp, 
					      &qp->db);

		ib_umem_release(qp->umem);

	} else {

		kfree(qp->sq.wrid);

		kfree(qp->rq.wrid);

		kvfree(qp->sq.wrid);

		kvfree(qp->rq.wrid);

		if (qp->mlx4_ib_qp_type & (MLX4_IB_QPT_PROXY_SMI_OWNER |

		    MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI))

			free_proxy_bufs(&dev->ib_dev, qp);

drivers/infiniband/hw/mlx4/srq.c

+8 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/mlx4/qp.h>

#include <linux/mlx4/srq.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>



#include "mlx4_ib.h"

#include "user.h"
@@ -171,11 +172,15 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd, 
			goto err_mtt;



		srq->wrid = kmalloc(srq->msrq.max * sizeof (u64), GFP_KERNEL);

		if (!srq->wrid) {

			srq->wrid = __vmalloc(srq->msrq.max * sizeof(u64),

					      GFP_KERNEL, PAGE_KERNEL);

			if (!srq->wrid) {

				err = -ENOMEM;

				goto err_mtt;

			}

		}

	}



	cqn = (init_attr->srq_type == IB_SRQT_XRC) ?

		to_mcq(init_attr->ext.xrc.cq)->mcq.cqn : 0;
@@ -204,7 +209,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd, 
	if (pd->uobject)

		mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &srq->db);

	else

		kfree(srq->wrid);

		kvfree(srq->wrid);



err_mtt:

	mlx4_mtt_cleanup(dev->dev, &srq->mtt);