Skip to content

Commit 9f489d3

Browse files
Mao Wenangregkh
authored andcommitted
virtio_ring: Avoid loop when vq is broken in virtqueue_poll
[ Upstream commit 481a0d7 ] The loop may exist if vq->broken is true, virtqueue_get_buf_ctx_packed or virtqueue_get_buf_ctx_split will return NULL, so virtnet_poll will reschedule napi to receive packet, it will lead cpu usage(si) to 100%. call trace as below: virtnet_poll virtnet_receive virtqueue_get_buf_ctx virtqueue_get_buf_ctx_packed virtqueue_get_buf_ctx_split virtqueue_napi_complete virtqueue_poll //return true virtqueue_napi_schedule //it will reschedule napi to fix this, return false if vq is broken in virtqueue_poll. Signed-off-by: Mao Wenan <wenan.mao@linux.alibaba.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Link: https://lore.kernel.org/r/1596354249-96204-1-git-send-email-wenan.mao@linux.alibaba.com Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4f419fd commit 9f489d3

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/virtio/virtio_ring.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,9 @@ bool virtqueue_poll(struct virtqueue *_vq, unsigned last_used_idx)
828828
{
829829
struct vring_virtqueue *vq = to_vvq(_vq);
830830

831+
if (unlikely(vq->broken))
832+
return false;
833+
831834
virtio_mb(vq->weak_barriers);
832835
return (u16)last_used_idx != virtio16_to_cpu(_vq->vdev, vq->vring.used->idx);
833836
}

0 commit comments

Comments
 (0)