Commit 8900b894 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

{net, IB}/mlx4: Remove gfp flags argument 



The caller to the driver marks GFP_NOIO allocations with help
of memalloc_noio-* calls now. This makes redundant to pass down
to the driver gfp flags, which can be GFP_KERNEL only.

The patch removes the gfp flags argument and updates all driver paths.

Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 0f4d027c

drivers/infiniband/hw/mlx4/cq.c

+3 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int mlx4_ib_alloc_cq_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq_buf * 
	int err;



	err = mlx4_buf_alloc(dev->dev, nent * dev->dev->caps.cqe_size,

			     PAGE_SIZE * 2, &buf->buf, GFP_KERNEL);

			     PAGE_SIZE * 2, &buf->buf);



	if (err)

		goto out;
@@ -113,7 +113,7 @@ static int mlx4_ib_alloc_cq_buf(struct mlx4_ib_dev *dev, struct mlx4_ib_cq_buf * 
	if (err)

		goto err_buf;



	err = mlx4_buf_write_mtt(dev->dev, &buf->mtt, &buf->buf, GFP_KERNEL);

	err = mlx4_buf_write_mtt(dev->dev, &buf->mtt, &buf->buf);

	if (err)

		goto err_mtt;
@@ -219,7 +219,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, 


		uar = &to_mucontext(context)->uar;

	} else {

		err = mlx4_db_alloc(dev->dev, &cq->db, 1, GFP_KERNEL);

		err = mlx4_db_alloc(dev->dev, &cq->db, 1);

		if (err)

			goto err_cq;

drivers/infiniband/hw/mlx4/mlx4_ib.h

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ enum mlx4_ib_qp_flags { 
	MLX4_IB_QP_LSO = IB_QP_CREATE_IPOIB_UD_LSO,

	MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK = IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK,

	MLX4_IB_QP_NETIF = IB_QP_CREATE_NETIF_QP,

	MLX4_IB_QP_CREATE_USE_GFP_NOIO = IB_QP_CREATE_USE_GFP_NOIO,



	/* Mellanox specific flags start from IB_QP_CREATE_RESERVED_START */

	MLX4_IB_ROCE_V2_GSI_QP = MLX4_IB_QP_CREATE_ROCE_V2_GSI,

drivers/infiniband/hw/mlx4/qp.c

+17 −23
Original line number Diff line number Diff line
@@ -634,8 +634,8 @@ static void mlx4_ib_free_qp_counter(struct mlx4_ib_dev *dev, 


static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd,

			    struct ib_qp_init_attr *init_attr,

			    struct ib_udata *udata, int sqpn, struct mlx4_ib_qp **caller_qp,

			    gfp_t gfp)

			    struct ib_udata *udata, int sqpn,

			    struct mlx4_ib_qp **caller_qp)

{

	int qpn;

	int err;
@@ -691,14 +691,14 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
		if (qp_type == MLX4_IB_QPT_SMI || qp_type == MLX4_IB_QPT_GSI ||

		    (qp_type & (MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_SMI_OWNER |

				MLX4_IB_QPT_PROXY_GSI | MLX4_IB_QPT_TUN_SMI_OWNER))) {

			sqp = kzalloc(sizeof (struct mlx4_ib_sqp), gfp);

			sqp = kzalloc(sizeof(struct mlx4_ib_sqp), GFP_KERNEL);

			if (!sqp)

				return -ENOMEM;

			qp = &sqp->qp;

			qp->pri.vid = 0xFFFF;

			qp->alt.vid = 0xFFFF;

		} else {

			qp = kzalloc(sizeof (struct mlx4_ib_qp), gfp);

			qp = kzalloc(sizeof(struct mlx4_ib_qp), GFP_KERNEL);

			if (!qp)

				return -ENOMEM;

			qp->pri.vid = 0xFFFF;
@@ -780,7 +780,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
			goto err;



		if (qp_has_rq(init_attr)) {

			err = mlx4_db_alloc(dev->dev, &qp->db, 0, gfp);

			err = mlx4_db_alloc(dev->dev, &qp->db, 0);

			if (err)

				goto err;
@@ -788,7 +788,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
		}



		if (mlx4_buf_alloc(dev->dev, qp->buf_size, qp->buf_size,

				   &qp->buf, gfp)) {

				   &qp->buf)) {

			memcpy(&init_attr->cap, &backup_cap,

			       sizeof(backup_cap));

			err = set_kernel_sq_size(dev, &init_attr->cap, qp_type,
@@ -797,7 +797,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
				goto err_db;



			if (mlx4_buf_alloc(dev->dev, qp->buf_size,

					   PAGE_SIZE * 2, &qp->buf, gfp)) {

					   PAGE_SIZE * 2, &qp->buf)) {

				err = -ENOMEM;

				goto err_db;

			}
@@ -808,20 +808,20 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
		if (err)

			goto err_buf;



		err = mlx4_buf_write_mtt(dev->dev, &qp->mtt, &qp->buf, gfp);

		err = mlx4_buf_write_mtt(dev->dev, &qp->mtt, &qp->buf);

		if (err)

			goto err_mtt;



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

					gfp | __GFP_NOWARN);

					GFP_KERNEL | __GFP_NOWARN);

		if (!qp->sq.wrid)

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

						gfp, PAGE_KERNEL);

						GFP_KERNEL, PAGE_KERNEL);

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

					gfp | __GFP_NOWARN);

					GFP_KERNEL | __GFP_NOWARN);

		if (!qp->rq.wrid)

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

						gfp, PAGE_KERNEL);

						GFP_KERNEL, PAGE_KERNEL);

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

			err = -ENOMEM;

			goto err_wrid;
@@ -859,7 +859,7 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, 
	if (init_attr->create_flags & IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK)

		qp->flags |= MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK;



	err = mlx4_qp_alloc(dev->dev, qpn, &qp->mqp, gfp);

	err = mlx4_qp_alloc(dev->dev, qpn, &qp->mqp);

	if (err)

		goto err_qpn;
@@ -1127,10 +1127,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd, 
	int err;

	int sup_u_create_flags = MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK;

	u16 xrcdn = 0;

	gfp_t gfp;



	gfp = (init_attr->create_flags & MLX4_IB_QP_CREATE_USE_GFP_NOIO) ?

		GFP_NOIO : GFP_KERNEL;

	/*

	 * We only support LSO, vendor flag1, and multicast loopback blocking,

	 * and only for kernel UD QPs.
@@ -1140,8 +1137,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd, 
					MLX4_IB_SRIOV_TUNNEL_QP |

					MLX4_IB_SRIOV_SQP |

					MLX4_IB_QP_NETIF |

					MLX4_IB_QP_CREATE_ROCE_V2_GSI |

					MLX4_IB_QP_CREATE_USE_GFP_NOIO))

					MLX4_IB_QP_CREATE_ROCE_V2_GSI))

		return ERR_PTR(-EINVAL);



	if (init_attr->create_flags & IB_QP_CREATE_NETIF_QP) {
@@ -1154,7 +1150,6 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd, 
			return ERR_PTR(-EINVAL);



		if ((init_attr->create_flags & ~(MLX4_IB_SRIOV_SQP |

						 MLX4_IB_QP_CREATE_USE_GFP_NOIO |

						 MLX4_IB_QP_CREATE_ROCE_V2_GSI  |

						 MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK) &&

		     init_attr->qp_type != IB_QPT_UD) ||
@@ -1179,7 +1174,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd, 
	case IB_QPT_RC:

	case IB_QPT_UC:

	case IB_QPT_RAW_PACKET:

		qp = kzalloc(sizeof *qp, gfp);

		qp = kzalloc(sizeof(*qp), GFP_KERNEL);

		if (!qp)

			return ERR_PTR(-ENOMEM);

		qp->pri.vid = 0xFFFF;
@@ -1188,7 +1183,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd, 
	case IB_QPT_UD:

	{

		err = create_qp_common(to_mdev(pd->device), pd, init_attr,

				       udata, 0, &qp, gfp);

				       udata, 0, &qp);

		if (err) {

			kfree(qp);

			return ERR_PTR(err);
@@ -1217,8 +1212,7 @@ static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd, 
		}



		err = create_qp_common(to_mdev(pd->device), pd, init_attr, udata,

				       sqpn,

				       &qp, gfp);

				       sqpn, &qp);

		if (err)

			return ERR_PTR(err);

drivers/infiniband/hw/mlx4/srq.c

+4 −4
Original line number Diff line number Diff line
@@ -135,14 +135,14 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd, 
		if (err)

			goto err_mtt;

	} else {

		err = mlx4_db_alloc(dev->dev, &srq->db, 0, GFP_KERNEL);

		err = mlx4_db_alloc(dev->dev, &srq->db, 0);

		if (err)

			goto err_srq;



		*srq->db.db = 0;



		if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2, &srq->buf,

				   GFP_KERNEL)) {

		if (mlx4_buf_alloc(dev->dev, buf_size, PAGE_SIZE * 2,

				   &srq->buf)) {

			err = -ENOMEM;

			goto err_db;

		}
@@ -167,7 +167,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd, 
		if (err)

			goto err_buf;



		err = mlx4_buf_write_mtt(dev->dev, &srq->mtt, &srq->buf, GFP_KERNEL);

		err = mlx4_buf_write_mtt(dev->dev, &srq->mtt, &srq->buf);

		if (err)

			goto err_mtt;

drivers/net/ethernet/mellanox/mlx4/alloc.c

+14 −15
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ out: 
}



static int mlx4_buf_direct_alloc(struct mlx4_dev *dev, int size,

				 struct mlx4_buf *buf, gfp_t gfp)

				 struct mlx4_buf *buf)

{

	dma_addr_t t;
@@ -587,7 +587,7 @@ static int mlx4_buf_direct_alloc(struct mlx4_dev *dev, int size, 
	buf->page_shift   = get_order(size) + PAGE_SHIFT;

	buf->direct.buf   =

		dma_zalloc_coherent(&dev->persist->pdev->dev,

				    size, &t, gfp);

				    size, &t, GFP_KERNEL);

	if (!buf->direct.buf)

		return -ENOMEM;
@@ -607,10 +607,10 @@ static int mlx4_buf_direct_alloc(struct mlx4_dev *dev, int size, 
 *  multiple pages, so we don't require too much contiguous memory.

 */

int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct,

		   struct mlx4_buf *buf, gfp_t gfp)

		   struct mlx4_buf *buf)

{

	if (size <= max_direct) {

		return mlx4_buf_direct_alloc(dev, size, buf, gfp);

		return mlx4_buf_direct_alloc(dev, size, buf);

	} else {

		dma_addr_t t;

		int i;
@@ -620,14 +620,14 @@ int mlx4_buf_alloc(struct mlx4_dev *dev, int size, int max_direct, 
		buf->npages	= buf->nbufs;

		buf->page_shift  = PAGE_SHIFT;

		buf->page_list   = kcalloc(buf->nbufs, sizeof(*buf->page_list),

					   gfp);

					   GFP_KERNEL);

		if (!buf->page_list)

			return -ENOMEM;



		for (i = 0; i < buf->nbufs; ++i) {

			buf->page_list[i].buf =

				dma_zalloc_coherent(&dev->persist->pdev->dev,

						    PAGE_SIZE, &t, gfp);

						    PAGE_SIZE, &t, GFP_KERNEL);

			if (!buf->page_list[i].buf)

				goto err_free;
@@ -663,12 +663,11 @@ void mlx4_buf_free(struct mlx4_dev *dev, int size, struct mlx4_buf *buf) 
}

EXPORT_SYMBOL_GPL(mlx4_buf_free);



static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device,

						 gfp_t gfp)

static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device)

{

	struct mlx4_db_pgdir *pgdir;



	pgdir = kzalloc(sizeof *pgdir, gfp);

	pgdir = kzalloc(sizeof(*pgdir), GFP_KERNEL);

	if (!pgdir)

		return NULL;
@@ -676,7 +675,7 @@ static struct mlx4_db_pgdir *mlx4_alloc_db_pgdir(struct device *dma_device, 
	pgdir->bits[0] = pgdir->order0;

	pgdir->bits[1] = pgdir->order1;

	pgdir->db_page = dma_alloc_coherent(dma_device, PAGE_SIZE,

					    &pgdir->db_dma, gfp);

					    &pgdir->db_dma, GFP_KERNEL);

	if (!pgdir->db_page) {

		kfree(pgdir);

		return NULL;
@@ -716,7 +715,7 @@ found: 
	return 0;

}



int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order, gfp_t gfp)

int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order)

{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_db_pgdir *pgdir;
@@ -728,7 +727,7 @@ int mlx4_db_alloc(struct mlx4_dev *dev, struct mlx4_db *db, int order, gfp_t gfp 
		if (!mlx4_alloc_db_from_pgdir(pgdir, db, order))

			goto out;



	pgdir = mlx4_alloc_db_pgdir(&dev->persist->pdev->dev, gfp);

	pgdir = mlx4_alloc_db_pgdir(&dev->persist->pdev->dev);

	if (!pgdir) {

		ret = -ENOMEM;

		goto out;
@@ -780,13 +779,13 @@ int mlx4_alloc_hwq_res(struct mlx4_dev *dev, struct mlx4_hwq_resources *wqres, 
{

	int err;



	err = mlx4_db_alloc(dev, &wqres->db, 1, GFP_KERNEL);

	err = mlx4_db_alloc(dev, &wqres->db, 1);

	if (err)

		return err;



	*wqres->db.db = 0;



	err = mlx4_buf_direct_alloc(dev, size, &wqres->buf, GFP_KERNEL);

	err = mlx4_buf_direct_alloc(dev, size, &wqres->buf);

	if (err)

		goto err_db;
@@ -795,7 +794,7 @@ int mlx4_alloc_hwq_res(struct mlx4_dev *dev, struct mlx4_hwq_resources *wqres, 
	if (err)

		goto err_buf;



	err = mlx4_buf_write_mtt(dev, &wqres->mtt, &wqres->buf, GFP_KERNEL);

	err = mlx4_buf_write_mtt(dev, &wqres->mtt, &wqres->buf);

	if (err)

		goto err_mtt;

CRA Git | Maintained and supported by SUSTech CRA and CCSE