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: Wengang Wang <wen.gang.wang@oracle.com> Acked-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Родитель
73d4da7b9f
Коммит
0ef2f05c7e
|
@ -34,6 +34,7 @@
|
||||||
#include <linux/log2.h>
|
#include <linux/log2.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
|
#include <linux/vmalloc.h>
|
||||||
|
|
||||||
#include <rdma/ib_cache.h>
|
#include <rdma/ib_cache.h>
|
||||||
#include <rdma/ib_pack.h>
|
#include <rdma/ib_pack.h>
|
||||||
|
@ -795,8 +796,14 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,
|
||||||
if (err)
|
if (err)
|
||||||
goto err_mtt;
|
goto err_mtt;
|
||||||
|
|
||||||
qp->sq.wrid = kmalloc(qp->sq.wqe_cnt * sizeof (u64), gfp);
|
qp->sq.wrid = kmalloc(qp->sq.wqe_cnt * sizeof(u64), gfp);
|
||||||
qp->rq.wrid = kmalloc(qp->rq.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) {
|
if (!qp->sq.wrid || !qp->rq.wrid) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto err_wrid;
|
goto err_wrid;
|
||||||
|
@ -886,8 +893,8 @@ err_wrid:
|
||||||
if (qp_has_rq(init_attr))
|
if (qp_has_rq(init_attr))
|
||||||
mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &qp->db);
|
mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &qp->db);
|
||||||
} else {
|
} else {
|
||||||
kfree(qp->sq.wrid);
|
kvfree(qp->sq.wrid);
|
||||||
kfree(qp->rq.wrid);
|
kvfree(qp->rq.wrid);
|
||||||
}
|
}
|
||||||
|
|
||||||
err_mtt:
|
err_mtt:
|
||||||
|
@ -1062,8 +1069,8 @@ static void destroy_qp_common(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp,
|
||||||
&qp->db);
|
&qp->db);
|
||||||
ib_umem_release(qp->umem);
|
ib_umem_release(qp->umem);
|
||||||
} else {
|
} else {
|
||||||
kfree(qp->sq.wrid);
|
kvfree(qp->sq.wrid);
|
||||||
kfree(qp->rq.wrid);
|
kvfree(qp->rq.wrid);
|
||||||
if (qp->mlx4_ib_qp_type & (MLX4_IB_QPT_PROXY_SMI_OWNER |
|
if (qp->mlx4_ib_qp_type & (MLX4_IB_QPT_PROXY_SMI_OWNER |
|
||||||
MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI))
|
MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI))
|
||||||
free_proxy_bufs(&dev->ib_dev, qp);
|
free_proxy_bufs(&dev->ib_dev, qp);
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
#include <linux/mlx4/qp.h>
|
#include <linux/mlx4/qp.h>
|
||||||
#include <linux/mlx4/srq.h>
|
#include <linux/mlx4/srq.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
#include <linux/vmalloc.h>
|
||||||
|
|
||||||
#include "mlx4_ib.h"
|
#include "mlx4_ib.h"
|
||||||
#include "user.h"
|
#include "user.h"
|
||||||
|
@ -171,11 +172,15 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
|
||||||
goto err_mtt;
|
goto err_mtt;
|
||||||
|
|
||||||
srq->wrid = kmalloc(srq->msrq.max * sizeof (u64), GFP_KERNEL);
|
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) {
|
if (!srq->wrid) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto err_mtt;
|
goto err_mtt;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cqn = (init_attr->srq_type == IB_SRQT_XRC) ?
|
cqn = (init_attr->srq_type == IB_SRQT_XRC) ?
|
||||||
to_mcq(init_attr->ext.xrc.cq)->mcq.cqn : 0;
|
to_mcq(init_attr->ext.xrc.cq)->mcq.cqn : 0;
|
||||||
|
@ -204,7 +209,7 @@ err_wrid:
|
||||||
if (pd->uobject)
|
if (pd->uobject)
|
||||||
mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &srq->db);
|
mlx4_ib_db_unmap_user(to_mucontext(pd->uobject->context), &srq->db);
|
||||||
else
|
else
|
||||||
kfree(srq->wrid);
|
kvfree(srq->wrid);
|
||||||
|
|
||||||
err_mtt:
|
err_mtt:
|
||||||
mlx4_mtt_cleanup(dev->dev, &srq->mtt);
|
mlx4_mtt_cleanup(dev->dev, &srq->mtt);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче