| Message ID | 20180104142502.15175-1-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | scsi-disk: release AioContext in unaligned WRITE SAME case | expand |
On 04/01/2018 15:25, Stefan Hajnoczi wrote: > scsi_write_same_complete() can retry the write if the request was > unaligned. Make sure to release the AioContext when that code path is > taken! > > This patch fixes a hang when QEMU terminates after an unaligned WRITE > SAME request has been processed with dataplane. The hang occurs because > iothread_stop_all() cannot acquire the AioContext lock that was leaked > by the IOThread in scsi_write_same_complete(). > > Fixes: b9e413dd37 > ("block: explicitly acquire aiocontext in aio callbacks that need it"). > Cc: Paolo Bonzini <pbonzini@redhat.com> > Reported-by: Cong Li <coli@redhat.com> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > hw/scsi/scsi-disk.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index e58833a087..49d2559d93 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -1755,6 +1755,7 @@ static void scsi_write_same_complete(void *opaque, int ret) > data->sector << BDRV_SECTOR_BITS, > &data->qiov, 0, > scsi_write_same_complete, data); > + aio_context_release(blk_get_aio_context(s->qdev.conf.blk)); > return; > } > > Queued,t hanks! Paolo
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e58833a087..49d2559d93 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -1755,6 +1755,7 @@ static void scsi_write_same_complete(void *opaque, int ret) data->sector << BDRV_SECTOR_BITS, &data->qiov, 0, scsi_write_same_complete, data); + aio_context_release(blk_get_aio_context(s->qdev.conf.blk)); return; }
scsi_write_same_complete() can retry the write if the request was unaligned. Make sure to release the AioContext when that code path is taken! This patch fixes a hang when QEMU terminates after an unaligned WRITE SAME request has been processed with dataplane. The hang occurs because iothread_stop_all() cannot acquire the AioContext lock that was leaked by the IOThread in scsi_write_same_complete(). Fixes: b9e413dd37 ("block: explicitly acquire aiocontext in aio callbacks that need it"). Cc: Paolo Bonzini <pbonzini@redhat.com> Reported-by: Cong Li <coli@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- hw/scsi/scsi-disk.c | 1 + 1 file changed, 1 insertion(+)