net: make sure net_rx_action() calls skb_defer_free_flush()
Subsystems (2)
PATCH 1/1 net: make sure net_rx_action() calls skb_defer_free_flush()
From: Eric Dumazet <[email protected]>
I missed a stray return; in net_rx_action(), which very well is taken whenever trigger_rx_softirq() has been called on a cpu that is no longer receiving network packets, or receiving too few of them.
--- net/core/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/dev.c +2 -1
@@ -6617,7 +6617,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)if (list_empty (&list)) {if (!sd_has_rps_ipi_waiting (sd) &&list_empty (&repoll)) -return ; + goto end;break ; }
@@ -6644,6 +6644,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)__raise_softirq_irqoff (NET_RX_SOFTIRQ );net_rps_action_and_irq_enable (sd); +end:skb_defer_free_flush (sd); }
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
Quoted 10 lines · Eric Dumazet
From: Eric Dumazet <[email protected]>
I missed a stray return; in
net_rx_action(), which very well is taken whenevertrigger_rx_softirq()has been called on a cpu that is no longer receiving network packets, or receiving too few of them.Fixes 68822bdf76f1 ("net: generalize skb freeing deferral to per-cpu lists")Signed-off-by Eric Dumazet <[email protected]>Reported-by Ido Schimmel <[email protected]>
Thanks!
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Wed, 27 Apr 2022 13:41:47 -0700 you wrote:
From: Eric Dumazet <[email protected]>
I missed a stray return; in
net_rx_action(), which very well is taken whenevertrigger_rx_softirq()has been called on a cpu that is no longer receiving network packets, or receiving too few of them.[...]
Here is the summary with links:
- [net-next] net: make sure net_rx_action() calls skb_defer_free_flush()
https://git.kernel.org/netdev/net-next/c/f3412b3879b4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html