* [PATCH net-next] mlx4: handle non-napi callers to napi_poll
@ 2020-10-08 18:45 Jonathan Lemon
2020-10-11 18:35 ` Jakub Kicinski
0 siblings, 1 reply; 4+ messages in thread
From: Jonathan Lemon @ 2020-10-08 18:45 UTC (permalink / raw)
To: netdev, saeedm, tariqt; +Cc: kernel-team
From: Jonathan Lemon <bsd@fb.com>
netcons calls napi_poll with a budget of 0 to transmit packets.
Handle this by:
- skipping RX processing
- do not try to recycle TX packets to the RX cache
Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
---
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 +++
drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 99d7737e8ad6..502d1b97855c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -943,6 +943,9 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)
bool clean_complete = true;
int done;
+ if (!budget)
+ return 0;
+
if (priv->tx_ring_num[TX_XDP]) {
xdp_tx_cq = priv->tx_cq[TX_XDP][cq->ring];
if (xdp_tx_cq->xdp_busy) {
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 45869b29368f..3ddb7268e415 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -350,7 +350,7 @@ u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv,
.dma = tx_info->map0_dma,
};
- if (!mlx4_en_rx_recycle(ring->recycle_ring, &frame)) {
+ if (!napi_mode || !mlx4_en_rx_recycle(ring->recycle_ring, &frame)) {
dma_unmap_page(priv->ddev, tx_info->map0_dma,
PAGE_SIZE, priv->dma_dir);
put_page(tx_info->page);
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] mlx4: handle non-napi callers to napi_poll
2020-10-08 18:45 [PATCH net-next] mlx4: handle non-napi callers to napi_poll Jonathan Lemon
@ 2020-10-11 18:35 ` Jakub Kicinski
2020-10-12 6:40 ` Tariq Toukan
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Kicinski @ 2020-10-11 18:35 UTC (permalink / raw)
To: Jonathan Lemon; +Cc: netdev, saeedm, tariqt, kernel-team
On Thu, 8 Oct 2020 11:45:26 -0700 Jonathan Lemon wrote:
> From: Jonathan Lemon <bsd@fb.com>
>
> netcons calls napi_poll with a budget of 0 to transmit packets.
> Handle this by:
> - skipping RX processing
> - do not try to recycle TX packets to the RX cache
>
> Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Tariq, Saeed - how does this look to you?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] mlx4: handle non-napi callers to napi_poll
2020-10-11 18:35 ` Jakub Kicinski
@ 2020-10-12 6:40 ` Tariq Toukan
2020-10-12 21:07 ` Jakub Kicinski
0 siblings, 1 reply; 4+ messages in thread
From: Tariq Toukan @ 2020-10-12 6:40 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Jonathan Lemon, Linux Kernel Network Developers, saeedm, tariqt,
kernel-team
On Mon, 12 Oct 2020 at 05:47, Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Thu, 8 Oct 2020 11:45:26 -0700 Jonathan Lemon wrote:
> > From: Jonathan Lemon <bsd@fb.com>
> >
> > netcons calls napi_poll with a budget of 0 to transmit packets.
> > Handle this by:
> > - skipping RX processing
> > - do not try to recycle TX packets to the RX cache
> >
> > Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
>
> Tariq, Saeed - how does this look to you?
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Thanks,
Tariq
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next] mlx4: handle non-napi callers to napi_poll
2020-10-12 6:40 ` Tariq Toukan
@ 2020-10-12 21:07 ` Jakub Kicinski
0 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2020-10-12 21:07 UTC (permalink / raw)
To: Tariq Toukan
Cc: Jonathan Lemon, Linux Kernel Network Developers, saeedm, tariqt,
kernel-team
On Mon, 12 Oct 2020 09:40:51 +0300 Tariq Toukan wrote:
> On Mon, 12 Oct 2020 at 05:47, Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > On Thu, 8 Oct 2020 11:45:26 -0700 Jonathan Lemon wrote:
> > > From: Jonathan Lemon <bsd@fb.com>
> > >
> > > netcons calls napi_poll with a budget of 0 to transmit packets.
> > > Handle this by:
> > > - skipping RX processing
> > > - do not try to recycle TX packets to the RX cache
> > >
> > > Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
> >
> > Tariq, Saeed - how does this look to you?
>
> Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-12 21:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-08 18:45 [PATCH net-next] mlx4: handle non-napi callers to napi_poll Jonathan Lemon
2020-10-11 18:35 ` Jakub Kicinski
2020-10-12 6:40 ` Tariq Toukan
2020-10-12 21:07 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).