Commit fed17f30 authored by David S. Miller's avatar David S. Miller

[NET]: Stop polling when napi_disable() is pending.

This finally adds the code in net_rx_action() to break out of the
->poll()'ing loop when a napi_disable() is found to be pending.

Now, even if a device is being flooded with packets it can be cleanly
brought down.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1d08d12
...@@ -2207,8 +2207,12 @@ static void net_rx_action(struct softirq_action *h) ...@@ -2207,8 +2207,12 @@ static void net_rx_action(struct softirq_action *h)
* still "owns" the NAPI instance and therefore can * still "owns" the NAPI instance and therefore can
* move the instance around on the list at-will. * move the instance around on the list at-will.
*/ */
if (unlikely(work == weight)) if (unlikely(work == weight)) {
if (unlikely(napi_disable_pending(n)))
__napi_complete(n);
else
list_move_tail(&n->poll_list, list); list_move_tail(&n->poll_list, list);
}
netpoll_poll_unlock(have); netpoll_poll_unlock(have);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment