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

Commit 1c1b5228 authored by Tariq Toukan's avatar Tariq Toukan Committed by David S. Miller
Browse files

net/mlx5e: Implement Fragmented Work Queue (WQ) 



Add new type of struct mlx5_frag_buf which is used to allocate fragmented
buffers rather than contiguous, and make the Completion Queues (CQs) use
it as they are big (default of 2MB per CQ in Striding RQ).

This fixes the failures of type:
"mlx5e_open_locked: mlx5e_open_channels failed, -12"
due to dma_zalloc_coherent insufficient contiguous coherent memory to
satisfy the driver's request when the user tries to setup more or larger
rings.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Reported-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c0c6203

drivers/net/ethernet/mellanox/mlx5/core/alloc.c

+66 −0
Original line number Diff line number Diff line
@@ -106,6 +106,63 @@ void mlx5_buf_free(struct mlx5_core_dev *dev, struct mlx5_buf *buf) 
}

EXPORT_SYMBOL_GPL(mlx5_buf_free);



int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size,

			     struct mlx5_frag_buf *buf, int node)

{

	int i;



	buf->size = size;

	buf->npages = 1 << get_order(size);

	buf->page_shift = PAGE_SHIFT;

	buf->frags = kcalloc(buf->npages, sizeof(struct mlx5_buf_list),

			     GFP_KERNEL);

	if (!buf->frags)

		goto err_out;



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

		struct mlx5_buf_list *frag = &buf->frags[i];

		int frag_sz = min_t(int, size, PAGE_SIZE);



		frag->buf = mlx5_dma_zalloc_coherent_node(dev, frag_sz,

							  &frag->map, node);

		if (!frag->buf)

			goto err_free_buf;

		if (frag->map & ((1 << buf->page_shift) - 1)) {

			dma_free_coherent(&dev->pdev->dev, frag_sz,

					  buf->frags[i].buf, buf->frags[i].map);

			mlx5_core_warn(dev, "unexpected map alignment: 0x%p, page_shift=%d\n",

				       (void *)frag->map, buf->page_shift);

			goto err_free_buf;

		}

		size -= frag_sz;

	}



	return 0;



err_free_buf:

	while (i--)

		dma_free_coherent(&dev->pdev->dev, PAGE_SIZE, buf->frags[i].buf,

				  buf->frags[i].map);

	kfree(buf->frags);

err_out:

	return -ENOMEM;

}



void mlx5_frag_buf_free(struct mlx5_core_dev *dev, struct mlx5_frag_buf *buf)

{

	int size = buf->size;

	int i;



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

		int frag_sz = min_t(int, size, PAGE_SIZE);



		dma_free_coherent(&dev->pdev->dev, frag_sz, buf->frags[i].buf,

				  buf->frags[i].map);

		size -= frag_sz;

	}

	kfree(buf->frags);

}



static struct mlx5_db_pgdir *mlx5_alloc_db_pgdir(struct mlx5_core_dev *dev,

						 int node)

{
@@ -230,3 +287,12 @@ void mlx5_fill_page_array(struct mlx5_buf *buf, __be64 *pas) 
	}

}

EXPORT_SYMBOL_GPL(mlx5_fill_page_array);



void mlx5_fill_page_frag_array(struct mlx5_frag_buf *buf, __be64 *pas)

{

	int i;



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

		pas[i] = cpu_to_be64(buf->frags[i].map);

}

EXPORT_SYMBOL_GPL(mlx5_fill_page_frag_array);

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct mlx5e_cq { 
	u16                        decmprs_wqe_counter;



	/* control */

	struct mlx5_wq_ctrl        wq_ctrl;

	struct mlx5_frag_wq_ctrl   wq_ctrl;

} ____cacheline_aligned_in_smp;



struct mlx5e_rq;

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ static int mlx5e_create_cq(struct mlx5e_channel *c, 


static void mlx5e_destroy_cq(struct mlx5e_cq *cq)

{

	mlx5_wq_destroy(&cq->wq_ctrl);

	mlx5_cqwq_destroy(&cq->wq_ctrl);

}



static int mlx5e_enable_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param)
@@ -1218,7 +1218,7 @@ static int mlx5e_enable_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 
	int err;



	inlen = MLX5_ST_SZ_BYTES(create_cq_in) +

		sizeof(u64) * cq->wq_ctrl.buf.npages;

		sizeof(u64) * cq->wq_ctrl.frag_buf.npages;

	in = mlx5_vzalloc(inlen);

	if (!in)

		return -ENOMEM;
@@ -1227,7 +1227,7 @@ static int mlx5e_enable_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 


	memcpy(cqc, param->cqc, sizeof(param->cqc));



	mlx5_fill_page_array(&cq->wq_ctrl.buf,

	mlx5_fill_page_frag_array(&cq->wq_ctrl.frag_buf,

				  (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas));



	mlx5_vector2eqn(mdev, param->eq_ix, &eqn, &irqn_not_used);
@@ -1235,7 +1235,7 @@ static int mlx5e_enable_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 
	MLX5_SET(cqc,   cqc, cq_period_mode, param->cq_period_mode);

	MLX5_SET(cqc,   cqc, c_eqn,         eqn);

	MLX5_SET(cqc,   cqc, uar_page,      mcq->uar->index);

	MLX5_SET(cqc,   cqc, log_page_size, cq->wq_ctrl.buf.page_shift -

	MLX5_SET(cqc,   cqc, log_page_size, cq->wq_ctrl.frag_buf.page_shift -

					    MLX5_ADAPTER_PAGE_SHIFT);

	MLX5_SET64(cqc, cqc, dbr_addr,      cq->wq_ctrl.db.dma);

drivers/net/ethernet/mellanox/mlx5/core/wq.c

+18 −8
Original line number Diff line number Diff line
@@ -101,13 +101,15 @@ int mlx5_wq_cyc_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param, 


int mlx5_cqwq_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,

		     void *cqc, struct mlx5_cqwq *wq,

		     struct mlx5_wq_ctrl *wq_ctrl)

		     struct mlx5_frag_wq_ctrl *wq_ctrl)

{

	int err;



	wq->log_stride	= 6 + MLX5_GET(cqc, cqc, cqe_sz);

	wq->log_sz	= MLX5_GET(cqc, cqc, log_cq_size);

	wq->sz_m1	= (1 << wq->log_sz) - 1;

	wq->log_frag_strides = PAGE_SHIFT - wq->log_stride;

	wq->frag_sz_m1	= (1 << wq->log_frag_strides) - 1;



	err = mlx5_db_alloc_node(mdev, &wq_ctrl->db, param->db_numa_node);

	if (err) {
@@ -115,14 +117,16 @@ int mlx5_cqwq_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param, 
		return err;

	}



	err = mlx5_buf_alloc_node(mdev, mlx5_cqwq_get_byte_size(wq),

				  &wq_ctrl->buf, param->buf_numa_node);

	err = mlx5_frag_buf_alloc_node(mdev, mlx5_cqwq_get_byte_size(wq),

				       &wq_ctrl->frag_buf,

				       param->buf_numa_node);

	if (err) {

		mlx5_core_warn(mdev, "mlx5_buf_alloc_node() failed, %d\n", err);

		mlx5_core_warn(mdev, "mlx5_frag_buf_alloc_node() failed, %d\n",

			       err);

		goto err_db_free;

	}



	wq->buf = wq_ctrl->buf.direct.buf;

	wq->frag_buf = wq_ctrl->frag_buf;

	wq->db  = wq_ctrl->db.db;



	wq_ctrl->mdev = mdev;
@@ -184,3 +188,9 @@ void mlx5_wq_destroy(struct mlx5_wq_ctrl *wq_ctrl) 
	mlx5_buf_free(wq_ctrl->mdev, &wq_ctrl->buf);

	mlx5_db_free(wq_ctrl->mdev, &wq_ctrl->db);

}



void mlx5_cqwq_destroy(struct mlx5_frag_wq_ctrl *wq_ctrl)

{

	mlx5_frag_buf_free(wq_ctrl->mdev, &wq_ctrl->frag_buf);

	mlx5_db_free(wq_ctrl->mdev, &wq_ctrl->db);

}

drivers/net/ethernet/mellanox/mlx5/core/wq.h

+15 −3
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ struct mlx5_wq_ctrl { 
	struct mlx5_db		db;

};



struct mlx5_frag_wq_ctrl {

	struct mlx5_core_dev	*mdev;

	struct mlx5_frag_buf	frag_buf;

	struct mlx5_db		db;

};



struct mlx5_wq_cyc {

	void			*buf;

	__be32			*db;
@@ -55,12 +61,14 @@ struct mlx5_wq_cyc { 
};



struct mlx5_cqwq {

	void			*buf;

	struct mlx5_frag_buf	frag_buf;

	__be32			*db;

	u32			sz_m1;

	u32			frag_sz_m1;

	u32			cc; /* consumer counter */

	u8			log_sz;

	u8			log_stride;

	u8			log_frag_strides;

};



struct mlx5_wq_ll {
@@ -81,7 +89,7 @@ u32 mlx5_wq_cyc_get_size(struct mlx5_wq_cyc *wq); 


int mlx5_cqwq_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,

		     void *cqc, struct mlx5_cqwq *wq,

		     struct mlx5_wq_ctrl *wq_ctrl);

		     struct mlx5_frag_wq_ctrl *wq_ctrl);

u32 mlx5_cqwq_get_size(struct mlx5_cqwq *wq);



int mlx5_wq_ll_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
@@ -90,6 +98,7 @@ int mlx5_wq_ll_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param, 
u32 mlx5_wq_ll_get_size(struct mlx5_wq_ll *wq);



void mlx5_wq_destroy(struct mlx5_wq_ctrl *wq_ctrl);

void mlx5_cqwq_destroy(struct mlx5_frag_wq_ctrl *wq_ctrl);



static inline u16 mlx5_wq_cyc_ctr2ix(struct mlx5_wq_cyc *wq, u16 ctr)

{
@@ -116,7 +125,10 @@ static inline u32 mlx5_cqwq_get_ci(struct mlx5_cqwq *wq) 


static inline void *mlx5_cqwq_get_wqe(struct mlx5_cqwq *wq, u32 ix)

{

	return wq->buf + (ix << wq->log_stride);

	unsigned int frag = (ix >> wq->log_frag_strides);



	return wq->frag_buf.frags[frag].buf +

		((wq->frag_sz_m1 & ix) << wq->log_stride);

}



static inline u32 mlx5_cqwq_get_wrap_cnt(struct mlx5_cqwq *wq)