diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-11-14 16:28:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-15 22:27:27 -0500 |
| commit | e88a2766143a27bfe6704b4493b214de4094cf29 (patch) | |
| tree | bb89a8330ce7936f26ef120d829e23b9a9de2527 /include | |
| parent | 73e2d5e34b6cdd1080038daf3d6d6d744a9eefe6 (diff) | |
| download | linux-stable-e88a2766143a27bfe6704b4493b214de4094cf29.tar.gz linux-stable-e88a2766143a27bfe6704b4493b214de4094cf29.tar.bz2 linux-stable-e88a2766143a27bfe6704b4493b214de4094cf29.zip | |
gro_cells: mark napi struct as not busy poll candidates
Rolf Neugebauer reported very long delays at netns dismantle.
Eric W. Biederman was kind enough to look at this problem
and noticed synchronize_net() occurring from netif_napi_del() that was
added in linux-4.5
Busy polling makes no sense for tunnels NAPI.
If busy poll is used for sessions over tunnels, the poller will need to
poll the physical device queue anyway.
netif_tx_napi_add() could be used here, but function name is misleading,
and renaming it is not stable material, so set NAPI_STATE_NO_BUSY_POLL
bit directly.
This will avoid inserting gro_cells napi structures in napi_hash[]
and avoid the problematic synchronize_net() (per possible cpu) that
Rolf reported.
Fixes: 93d05d4a320c ("net: provide generic busy polling to all NAPI drivers")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
Reported-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Tested-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/gro_cells.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h index d15214d673b2..2a1abbf8da74 100644 --- a/include/net/gro_cells.h +++ b/include/net/gro_cells.h @@ -68,6 +68,9 @@ static inline int gro_cells_init(struct gro_cells *gcells, struct net_device *de struct gro_cell *cell = per_cpu_ptr(gcells->cells, i); __skb_queue_head_init(&cell->napi_skbs); + + set_bit(NAPI_STATE_NO_BUSY_POLL, &cell->napi.state); + netif_napi_add(dev, &cell->napi, gro_cell_poll, 64); napi_enable(&cell->napi); } |