Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eth: mlx4: create a page pool for Rx 

Create a pool per rx queue. Subsequent patches will make use of it.

Move fcs_del to a hole to make space for the pointer.

Per common "wisdom" base the page pool size on the ring size.
Note that the page pool cache size is in full pages, so just
round up the effective buffer size to pages.

Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20250213010635.1354034-2-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-02-12 17:06:32 -08:00
parent 4991b88c25
commit 8533b14b3d
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/mellanox/mlx4/en_rx.c
View File

@ -48,6 +48,7 @@
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
#include <net/ip6_checksum.h> #include <net/ip6_checksum.h>
#endif #endif
#include <net/page_pool/helpers.h>
#include "mlx4_en.h" #include "mlx4_en.h"
@ -268,6 +269,7 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
u32 size, u16 stride, int node, int queue_index) u32 size, u16 stride, int node, int queue_index)
{ {
struct mlx4_en_dev *mdev = priv->mdev; struct mlx4_en_dev *mdev = priv->mdev;
struct page_pool_params pp = {};
struct mlx4_en_rx_ring *ring; struct mlx4_en_rx_ring *ring;
int err = -ENOMEM; int err = -ENOMEM;
int tmp; int tmp;
@ -286,9 +288,26 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
ring->log_stride = ffs(ring->stride) - 1; ring->log_stride = ffs(ring->stride) - 1;
ring->buf_size = ring->size * ring->stride + TXBB_SIZE; ring->buf_size = ring->size * ring->stride + TXBB_SIZE;
if (xdp_rxq_info_reg(&ring->xdp_rxq, priv->dev, queue_index, 0) < 0) pp.flags = PP_FLAG_DMA_MAP;
pp.pool_size = size * DIV_ROUND_UP(priv->rx_skb_size, PAGE_SIZE);
pp.nid = node;
pp.napi = &priv->rx_cq[queue_index]->napi;
pp.netdev = priv->dev;
pp.dev = &mdev->dev->persist->pdev->dev;
pp.dma_dir = priv->dma_dir;
ring->pp = page_pool_create(&pp);
if (!ring->pp)
goto err_ring; goto err_ring;
if (xdp_rxq_info_reg(&ring->xdp_rxq, priv->dev, queue_index, 0) < 0)
goto err_pp;
err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq, MEM_TYPE_PAGE_POOL,
ring->pp);
if (err)
goto err_xdp_info;
tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS * tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
sizeof(struct mlx4_en_rx_alloc)); sizeof(struct mlx4_en_rx_alloc));
ring->rx_info = kvzalloc_node(tmp, GFP_KERNEL, node); ring->rx_info = kvzalloc_node(tmp, GFP_KERNEL, node);
@ -319,6 +338,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
ring->rx_info = NULL; ring->rx_info = NULL;
err_xdp_info: err_xdp_info:
xdp_rxq_info_unreg(&ring->xdp_rxq); xdp_rxq_info_unreg(&ring->xdp_rxq);
err_pp:
page_pool_destroy(ring->pp);
err_ring: err_ring:
kfree(ring); kfree(ring);
*pring = NULL; *pring = NULL;
@ -445,6 +466,7 @@ void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
xdp_rxq_info_unreg(&ring->xdp_rxq); xdp_rxq_info_unreg(&ring->xdp_rxq);
mlx4_free_hwq_res(mdev->dev, &ring->wqres, size * stride + TXBB_SIZE); mlx4_free_hwq_res(mdev->dev, &ring->wqres, size * stride + TXBB_SIZE);
kvfree(ring->rx_info); kvfree(ring->rx_info);
page_pool_destroy(ring->pp);
ring->rx_info = NULL; ring->rx_info = NULL;
kfree(ring); kfree(ring);
*pring = NULL; *pring = NULL;

3
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
View File

@ -335,10 +335,11 @@ struct mlx4_en_rx_ring {
u16 stride; u16 stride;
u16 log_stride; u16 log_stride;
u16 cqn; /* index of port CQ associated with this ring */ u16 cqn; /* index of port CQ associated with this ring */
u8 fcs_del;
u32 prod; u32 prod;
u32 cons; u32 cons;
u32 buf_size; u32 buf_size;
u8 fcs_del; struct page_pool *pp;
void *buf; void *buf;
void *rx_info; void *rx_info;
struct bpf_prog __rcu *xdp_prog; struct bpf_prog __rcu *xdp_prog;