| Message ID | 20250213010635.1354034-3-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8fdeafd66edaf420ea0063a1f13442fe3470fe70 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | eth: mlx4: use the page pool for Rx buffers | expand |
On 13/02/2025 3:06, Jakub Kicinski wrote: > mlx4 doesn't support ndo_xdp_xmit / XDP_REDIRECT and wasn't > using page pool until now, so it could run XDP completions > in netpoll (NAPI budget == 0) just fine. Page pool has calling > context requirements, make sure we don't try to call it from > what is potentially HW IRQ context. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > v2: > - clarify the commit msg > v1: https://lore.kernel.org/20250205031213.358973-3-kuba@kernel.org > --- > drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c > index 1ddb11cb25f9..6e077d202827 100644 > --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c > +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c > @@ -450,6 +450,8 @@ int mlx4_en_process_tx_cq(struct net_device *dev, > > if (unlikely(!priv->port_up)) > return 0; > + if (unlikely(!napi_budget) && cq->type == TX_XDP) > + return 0; > > netdev_txq_bql_complete_prefetchw(ring->tx_queue); > Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 1ddb11cb25f9..6e077d202827 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -450,6 +450,8 @@ int mlx4_en_process_tx_cq(struct net_device *dev, if (unlikely(!priv->port_up)) return 0; + if (unlikely(!napi_budget) && cq->type == TX_XDP) + return 0; netdev_txq_bql_complete_prefetchw(ring->tx_queue);
mlx4 doesn't support ndo_xdp_xmit / XDP_REDIRECT and wasn't using page pool until now, so it could run XDP completions in netpoll (NAPI budget == 0) just fine. Page pool has calling context requirements, make sure we don't try to call it from what is potentially HW IRQ context. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- v2: - clarify the commit msg v1: https://lore.kernel.org/20250205031213.358973-3-kuba@kernel.org --- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 ++ 1 file changed, 2 insertions(+)