From: Jakub Kicinski <kuba@kernel.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com,
hawk@kernel.org, ilias.apalodimas@linaro.org, dsahern@gmail.com,
dtatulea@nvidia.com, willemb@google.com, almasrymina@google.com,
shakeelb@google.com, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net-next v4 05/13] eth: link netdev to page_pools in drivers
Date: Sun, 26 Nov 2023 15:07:32 -0800 [thread overview]
Message-ID: <20231126230740.2148636-6-kuba@kernel.org> (raw)
In-Reply-To: <20231126230740.2148636-1-kuba@kernel.org>
Link page pool instances to netdev for the drivers which
already link to NAPI. Unless the driver is doing something
very weird per-NAPI should imply per-netdev.
Add netsec as well, Ilias indicates that it fits the mold.
Reviewed-by: Eric Dumazet <edumazet@google.com>
Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
v3: fix netsec build
v2: add netsec
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 +
drivers/net/ethernet/microsoft/mana/mana_en.c | 1 +
drivers/net/ethernet/socionext/netsec.c | 2 ++
4 files changed, 5 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index d8cf7b30bd03..e35e7e02538c 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3331,6 +3331,7 @@ static int bnxt_alloc_rx_page_pool(struct bnxt *bp,
pp.pool_size += bp->rx_ring_size;
pp.nid = dev_to_node(&bp->pdev->dev);
pp.napi = &rxr->bnapi->napi;
+ pp.netdev = bp->dev;
pp.dev = &bp->pdev->dev;
pp.dma_dir = bp->rx_dir;
pp.max_len = PAGE_SIZE;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 3aecdf099a2f..af5e0d3c8ee1 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -902,6 +902,7 @@ static int mlx5e_alloc_rq(struct mlx5e_params *params,
pp_params.nid = node;
pp_params.dev = rq->pdev;
pp_params.napi = rq->cq.napi;
+ pp_params.netdev = rq->netdev;
pp_params.dma_dir = rq->buff.map_dir;
pp_params.max_len = PAGE_SIZE;
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index fc3d2903a80f..d1adec01299c 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -2137,6 +2137,7 @@ static int mana_create_page_pool(struct mana_rxq *rxq, struct gdma_context *gc)
pprm.pool_size = RX_BUFFERS_PER_QUEUE;
pprm.nid = gc->numa_node;
pprm.napi = &rxq->rx_cq.napi;
+ pprm.netdev = rxq->ndev;
rxq->page_pool = page_pool_create(&pprm);
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c
index 0891e9e49ecb..5ab8b81b84e6 100644
--- a/drivers/net/ethernet/socionext/netsec.c
+++ b/drivers/net/ethernet/socionext/netsec.c
@@ -1302,6 +1302,8 @@ static int netsec_setup_rx_dring(struct netsec_priv *priv)
.dma_dir = xdp_prog ? DMA_BIDIRECTIONAL : DMA_FROM_DEVICE,
.offset = NETSEC_RXBUF_HEADROOM,
.max_len = NETSEC_RX_BUF_SIZE,
+ .napi = &priv->napi,
+ .netdev = priv->ndev,
};
int i, err;
--
2.42.0
next prev parent reply other threads:[~2023-11-26 23:08 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-26 23:07 [PATCH net-next v4 00/13] net: page_pool: add netlink-based introspection Jakub Kicinski
2023-11-26 23:07 ` [PATCH net-next v4 01/13] net: page_pool: factor out uninit Jakub Kicinski
2023-11-27 6:56 ` Shakeel Butt
2023-11-26 23:07 ` [PATCH net-next v4 02/13] net: page_pool: id the page pools Jakub Kicinski
2023-11-27 7:07 ` Shakeel Butt
2023-11-28 14:47 ` Paolo Abeni
2023-11-26 23:07 ` [PATCH net-next v4 03/13] net: page_pool: record pools per netdev Jakub Kicinski
2023-11-26 23:07 ` [PATCH net-next v4 04/13] net: page_pool: stash the NAPI ID for easier access Jakub Kicinski
2023-11-26 23:07 ` Jakub Kicinski [this message]
2023-11-26 23:07 ` [PATCH net-next v4 06/13] net: page_pool: add nlspec for basic access to page pools Jakub Kicinski
2023-11-26 23:07 ` [PATCH net-next v4 07/13] net: page_pool: implement GET in the netlink API Jakub Kicinski
2023-11-26 23:07 ` [PATCH net-next v4 08/13] net: page_pool: add netlink notifications for state changes Jakub Kicinski
2023-11-26 23:07 ` [PATCH net-next v4 09/13] net: page_pool: report amount of memory held by page pools Jakub Kicinski
2023-11-26 23:07 ` [PATCH net-next v4 10/13] net: page_pool: report when page pool was destroyed Jakub Kicinski
2023-11-26 23:07 ` [PATCH net-next v4 11/13] net: page_pool: expose page pool stats via netlink Jakub Kicinski
2023-11-28 15:01 ` Ilias Apalodimas
2023-11-26 23:07 ` [PATCH net-next v4 12/13] net: page_pool: mute the periodic warning for visible page pools Jakub Kicinski
2023-11-28 15:00 ` Ilias Apalodimas
2023-11-26 23:07 ` [PATCH net-next v4 13/13] tools: ynl: add sample for getting page-pool information Jakub Kicinski
2023-11-28 15:10 ` [PATCH net-next v4 00/13] net: page_pool: add netlink-based introspection patchwork-bot+netdevbpf
2023-11-29 20:10 ` Daniel Golle
2023-11-29 21:12 ` Eric Dumazet
2023-11-30 0:03 ` Jakub Kicinski
2023-11-30 2:09 ` Daniel Golle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231126230740.2148636-6-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=almasrymina@google.com \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=dtatulea@nvidia.com \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=ilias.apalodimas@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shakeelb@google.com \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.