]> git.baikalelectronics.ru Git - kernel.git/commit
net: fix hangup on napi_disable for threaded napi
authorPaolo Abeni <pabeni@redhat.com>
Fri, 9 Apr 2021 15:24:17 +0000 (17:24 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 9 Apr 2021 19:50:31 +0000 (12:50 -0700)
commit32abaa2545cdbaa5af0d3d494d08ff7d191ac76a
treef74e446319f81d7d42410f8b06b5a56235903c53
parentcf4f151796d52c8a89e1013c31117f81bf11183d
net: fix hangup on napi_disable for threaded napi

napi_disable() is subject to an hangup, when the threaded
mode is enabled and the napi is under heavy traffic.

If the relevant napi has been scheduled and the napi_disable()
kicks in before the next napi_threaded_wait() completes - so
that the latter quits due to the napi_disable_pending() condition,
the existing code leaves the NAPI_STATE_SCHED bit set and the
napi_disable() loop waiting for such bit will hang.

This patch addresses the issue by dropping the NAPI_STATE_DISABLE
bit test in napi_thread_wait(). The later napi_threaded_poll()
iteration will take care of clearing the NAPI_STATE_SCHED.

This also addresses a related problem reported by Jakub:
before this patch a napi_disable()/napi_enable() pair killed
the napi thread, effectively disabling the threaded mode.
On the patched kernel napi_disable() simply stops scheduling
the relevant thread.

v1 -> v2:
  - let the main napi_thread_poll() loop clear the SCHED bit

Reported-by: Jakub Kicinski <kuba@kernel.org>
Fixes: 19a9abdd15a9 ("net: implement threaded-able napi poll loop support")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/883923fa22745a9589e8610962b7dc59df09fb1f.1617981844.git.pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/dev.c