path: root/drivers/net/xen-netback/netback.c
diff options
authorDavid Vrabel <david.vrabel@citrix.com>2015-02-02 16:57:51 +0000
committerDavid S. Miller <davem@davemloft.net>2015-02-02 19:39:04 -0800
commit42b5212fee4f57907e9415b18fe19c13e65574bc (patch)
tree3fb44adcfd6de16f9e3ceddcf46d7a2c9c54532c /drivers/net/xen-netback/netback.c
parentnet/mlx4_core: Fix kernel Oops (mem corruption) when working with more than 80 VFs (diff)
xen-netback: stop the guest rx thread after a fatal error
After commit e9d8b2c2968499c1f96563e6522c56958d5a1d0d (xen-netback: disable rogue vif in kthread context), a fatal (protocol) error would leave the guest Rx thread spinning, wasting CPU time. Commit ecf08d2dbb96d5a4b4bcc53a39e8d29cc8fef02e (xen-netback: reintroduce guest Rx stall detection) made this even worse by removing a cond_resched() from this path. Since a fatal error is non-recoverable, just allow the guest Rx thread to exit. This requires taking additional refs to the task so the thread exiting early is handled safely. Signed-off-by: David Vrabel <david.vrabel@citrix.com> Reported-by: Julien Grall <julien.grall@linaro.org> Tested-by: Julien Grall <julien.grall@linaro.org> Acked-by: Wei Liu <wei.liu2@citrix.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback/netback.c')
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 908e65e9b821..c8ce701a7efb 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -2109,8 +2109,7 @@ int xenvif_kthread_guest_rx(void *data)
if (unlikely(vif->disabled && queue->id == 0)) {
- xenvif_rx_queue_purge(queue);
- continue;
+ break;
if (!skb_queue_empty(&queue->rx_queue))