diff options
| author |   Eric Dumazet <edumazet@google.com> | 2022-04-27 13:41:47 -0700 |
|---|---|---|
| committer |   Paolo Abeni <pabeni@redhat.com> | 2022-04-28 11:37:29 +0200 |
| commit | f3412b3879b4f7c4313b186b03940d4791345534 (patch) | |
| tree | 63cd35510efb34d771c475ad2d367e999d5ef2e7 /net/core/dev.c | |
| parent | Merge branch 'add-reset-deassertion-for-aspeed-mdio' (diff) | |
| download | linux-dev-f3412b3879b4f7c4313b186b03940d4791345534.tar.xz linux-dev-f3412b3879b4f7c4313b186b03940d4791345534.zip | |
net: make sure net_rx_action() calls skb_defer_free_flush()
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.
Fixes: 68822bdf76f1 ("net: generalize skb freeing deferral to per-cpu lists")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Ido Schimmel <idosch@nvidia.com>
Tested-by: Ido Schimmel <idosch@nvidia.com>
Link: https://lore.kernel.org/r/20220427204147.1310161-1-eric.dumazet@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 611bd7197064..e09cd202fc57 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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); } |