]> Pileus Git - ~andy/linux/commit
virtio_net: fix race in RX VQ processing
authorMichael S. Tsirkin <mst@redhat.com>
Tue, 9 Jul 2013 05:13:04 +0000 (08:13 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jul 2013 19:45:37 +0000 (12:45 -0700)
commitcbdadbbf0c790f79350a8f36029208944c5487d0
tree6d63721222da5d652d2e4e65991a15007a83a520
parentcc229884d3f77ec3b1240e467e0236c3e0647c0c
virtio_net: fix race in RX VQ processing

virtio net called virtqueue_enable_cq on RX path after napi_complete, so
with NAPI_STATE_SCHED clear - outside the implicit napi lock.
This violates the requirement to synchronize virtqueue_enable_cq wrt
virtqueue_add_buf.  In particular, used event can move backwards,
causing us to lose interrupts.
In a debug build, this can trigger panic within START_USE.

Jason Wang reports that he can trigger the races artificially,
by adding udelay() in virtqueue_enable_cb() after virtio_mb().

However, we must call napi_complete to clear NAPI_STATE_SCHED before
polling the virtqueue for used buffers, otherwise napi_schedule_prep in
a callback will fail, causing us to lose RX events.

To fix, call virtqueue_enable_cb_prepare with NAPI_STATE_SCHED
set (under napi lock), later call virtqueue_poll with
NAPI_STATE_SCHED clear (outside the lock).

Reported-by: Jason Wang <jasowang@redhat.com>
Tested-by: Jason Wang <jasowang@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c