Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gro_cells: reduce number of synchronize_net() calls

After cited commit, gro_cells_destroy() became damn slow
on hosts with a lot of cores.

This is because we have one additional synchronize_net() per cpu as
stated in the changelog.

gro_cells_init() is setting NAPI_STATE_NO_BUSY_POLL, and this was enough
to not have one synchronize_net() call per netif_napi_del()

We can factorize all the synchronize_net() to a single one,
right before freeing per-cpu memory.

Fixes: 5198d545dba8 ("net: remove napi_hash_del() from driver-facing API")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20201124203822.1360107-1-eric.dumazet@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Eric Dumazet and committed by
Jakub Kicinski
2543a600 12a8fe56

+6 -1
+6 -1
net/core/gro_cells.c
··· 99 99 struct gro_cell *cell = per_cpu_ptr(gcells->cells, i); 100 100 101 101 napi_disable(&cell->napi); 102 - netif_napi_del(&cell->napi); 102 + __netif_napi_del(&cell->napi); 103 103 __skb_queue_purge(&cell->napi_skbs); 104 104 } 105 + /* This barrier is needed because netpoll could access dev->napi_list 106 + * under rcu protection. 107 + */ 108 + synchronize_net(); 109 + 105 110 free_percpu(gcells->cells); 106 111 gcells->cells = NULL; 107 112 }