virtio-blk: Fix double completion for werror=stop
authorFam Zheng <famz@redhat.com>
Tue, 17 Nov 2015 10:20:11 +0000 (18:20 +0800)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 17 Nov 2015 10:35:57 +0000 (18:35 +0800)
commit10f5a72f70862d299ddbdf226d6dc71fa4ae34dd
tree09d34e62e4172e9c5cd0ba291b784ce556548a50
parent40119effc5c36dbd0ca19ca85a5897d5b3d37d6d
virtio-blk: Fix double completion for werror=stop

When a request R is absorbed by request M, it is appended to the
"mr_next" queue led by M, and is completed together with the completion
of M, in virtio_blk_rw_complete.

During DMA restart in virtio_blk_dma_restart_bh, requests in s->rq are
parsed and submitted again, possibly with a stale req->mr_next. It could
be a problem if the request merging in virtio_blk_handle_request hasn't
refreshed every mr_next pointer, in which case, virtio_blk_rw_complete
could walk through unexpected requests following the stale pointers.

Fix this by unsetting the pointer in virtio_blk_rw_complete. It is safe
because this req is either completed and freed right away, or it will be
restarted and parsed from scratch out of the vq later.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
hw/block/virtio-blk.c