summaryrefslogtreecommitdiff
path: root/net/rose/sysctl_net_rose.c
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2019-06-06 15:45:03 +0200
committerDavid S. Miller <davem@davemloft.net>2019-06-06 11:31:35 -0700
commit720f1de4021f09898b8c8443f3b3e995991b6e3a (patch)
tree90d7d8037e87d7c5e7625914925ad2113618f58b /net/rose/sysctl_net_rose.c
parentd37acd5aa99c57505b64913e0e2624ec3daed8c5 (diff)
pktgen: do not sleep with the thread lock held.
Currently, the process issuing a "start" command on the pktgen procfs interface, acquires the pktgen thread lock and never release it, until all pktgen threads are completed. The above can blocks indefinitely any other pktgen command and any (even unrelated) netdevice removal - as the pktgen netdev notifier acquires the same lock. The issue is demonstrated by the following script, reported by Matteo: ip -b - <<'EOF' link add type dummy link add type veth link set dummy0 up EOF modprobe pktgen echo reset >/proc/net/pktgen/pgctrl { echo rem_device_all echo add_device dummy0 } >/proc/net/pktgen/kpktgend_0 echo count 0 >/proc/net/pktgen/dummy0 echo start >/proc/net/pktgen/pgctrl & sleep 1 rmmod veth Fix the above releasing the thread lock around the sleep call. Additionally we must prevent racing with forcefull rmmod - as the thread lock no more protects from them. Instead, acquire a self-reference before waiting for any thread. As a side effect, running rmmod pktgen while some thread is running now fails with "module in use" error, before this patch such command hanged indefinitely. Note: the issue predates the commit reported in the fixes tag, but this fix can't be applied before the mentioned commit. v1 -> v2: - no need to check for thread existence after flipping the lock, pktgen threads are freed only at net exit time - Fixes: 6146e6a43b35 ("[PKTGEN]: Removes thread_{un,}lock() macros.") Reported-and-tested-by: Matteo Croce <mcroce@redhat.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose/sysctl_net_rose.c')
0 files changed, 0 insertions, 0 deletions