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

Commit fc11fbf9 authored by Saeed Mahameed's avatar Saeed Mahameed Committed by David S. Miller
Browse files

net/mlx5e: Add HW cacheline start padding 



Enable HW cacheline start padding and align RX WQE size to cacheline
while considering HW start padding. Also, fix dma_unmap call to use
the correct SKB data buffer size.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent facc9699

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

+4 −1
Original line number Diff line number Diff line
@@ -309,12 +309,15 @@ static int mlx5e_create_rq(struct mlx5e_channel *c, 


	rq->wqe_sz = (priv->params.lro_en) ? priv->params.lro_wqe_sz :

					     MLX5E_SW2HW_MTU(priv->netdev->mtu);

	rq->wqe_sz = SKB_DATA_ALIGN(rq->wqe_sz + MLX5E_NET_IP_ALIGN);



	for (i = 0; i < wq_sz; i++) {

		struct mlx5e_rx_wqe *wqe = mlx5_wq_ll_get_wqe(&rq->wq, i);

		u32 byte_count = rq->wqe_sz - MLX5E_NET_IP_ALIGN;



		wqe->data.lkey       = c->mkey_be;

		wqe->data.byte_count = cpu_to_be32(rq->wqe_sz);

		wqe->data.byte_count =

			cpu_to_be32(byte_count | MLX5_HW_START_PADDING);

	}



	rq->pdev    = c->pdev;

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

+5 −5
Original line number Diff line number Diff line
@@ -45,11 +45,9 @@ static inline int mlx5e_alloc_rx_wqe(struct mlx5e_rq *rq, 
	if (unlikely(!skb))

		return -ENOMEM;



	skb_reserve(skb, MLX5E_NET_IP_ALIGN);



	dma_addr = dma_map_single(rq->pdev,

				  /* hw start padding */

				  skb->data - MLX5E_NET_IP_ALIGN,

				  skb->data,

				  /* hw end padding */

				  rq->wqe_sz,

				  DMA_FROM_DEVICE);
@@ -57,6 +55,8 @@ static inline int mlx5e_alloc_rx_wqe(struct mlx5e_rq *rq, 
	if (unlikely(dma_mapping_error(rq->pdev, dma_addr)))

		goto err_free_skb;



	skb_reserve(skb, MLX5E_NET_IP_ALIGN);



	*((dma_addr_t *)skb->cb) = dma_addr;

	wqe->data.addr = cpu_to_be64(dma_addr + MLX5E_NET_IP_ALIGN);
@@ -217,7 +217,7 @@ bool mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) 


		dma_unmap_single(rq->pdev,

				 *((dma_addr_t *)skb->cb),

				 skb_end_offset(skb),

				 rq->wqe_sz,

				 DMA_FROM_DEVICE);



		if (unlikely((cqe->op_own >> 4) != MLX5_CQE_RESP_SEND)) {

include/linux/mlx5/device.h

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,10 @@ enum { 
	MLX5_INLINE_SEG = 0x80000000,

};



enum {

	MLX5_HW_START_PADDING = MLX5_INLINE_SEG,

};



enum {

	MLX5_MIN_PKEY_TABLE_SIZE = 128,

	MLX5_MAX_LOG_PKEY_TABLE  = 5,