Message ID | 1411547278-25915-6-git-send-email-famz@redhat.com |
---|---|
State | New |
Headers | show |
Il 24/09/2014 10:27, Fam Zheng ha scritto: > Let the aio cb do the clean up and notification job after scsi_req_cancel, in > preparation for asynchronous cancellation. What about renaming it to scsi_req_cancel_complete? Paolo > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > hw/scsi/scsi-bus.c | 14 ++++++++++---- > hw/scsi/scsi-disk.c | 8 ++++++++ > hw/scsi/scsi-generic.c | 1 + > include/hw/scsi/scsi.h | 1 + > 4 files changed, 20 insertions(+), 4 deletions(-) > > diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c > index 764f6cf..fca4a9e 100644 > --- a/hw/scsi/scsi-bus.c > +++ b/hw/scsi/scsi-bus.c > @@ -1718,6 +1718,16 @@ void scsi_req_complete(SCSIRequest *req, int status) > scsi_req_unref(req); > } > > +/* Called by the devices when the request is canceled. */ > +void scsi_req_canceled(SCSIRequest *req) > +{ > + assert(req->io_canceled); > + if (req->bus->info->cancel) { > + req->bus->info->cancel(req); > + } > + scsi_req_unref(req); > +} > + > void scsi_req_cancel(SCSIRequest *req) > { > trace_scsi_req_cancel(req->dev->id, req->lun, req->tag); > @@ -1730,10 +1740,6 @@ void scsi_req_cancel(SCSIRequest *req) > if (req->aiocb) { > bdrv_aio_cancel(req->aiocb); > } > - if (req->bus->info->cancel) { > - req->bus->info->cancel(req); > - } > - scsi_req_unref(req); > } > > static int scsi_ua_precedence(SCSISense sense) > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index ef13e66..c029d8c 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -168,6 +168,7 @@ static void scsi_aio_complete(void *opaque, int ret) > r->req.aiocb = NULL; > block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > @@ -214,6 +215,7 @@ static void scsi_write_do_fua(SCSIDiskReq *r) > SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); > > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > @@ -240,6 +242,7 @@ static void scsi_dma_complete_noio(void *opaque, int ret) > block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); > } > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > @@ -280,6 +283,7 @@ static void scsi_read_complete(void * opaque, int ret) > r->req.aiocb = NULL; > block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > @@ -312,6 +316,7 @@ static void scsi_do_read(void *opaque, int ret) > block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); > } > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > @@ -432,6 +437,7 @@ static void scsi_write_complete(void * opaque, int ret) > block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); > } > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > @@ -1524,6 +1530,7 @@ static void scsi_unmap_complete(void *opaque, int ret) > > r->req.aiocb = NULL; > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > @@ -1623,6 +1630,7 @@ static void scsi_write_same_complete(void *opaque, int ret) > r->req.aiocb = NULL; > block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > > diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c > index 7e85047..50c98b0 100644 > --- a/hw/scsi/scsi-generic.c > +++ b/hw/scsi/scsi-generic.c > @@ -94,6 +94,7 @@ static void scsi_command_complete(void *opaque, int ret) > > r->req.aiocb = NULL; > if (r->req.io_canceled) { > + scsi_req_canceled(&r->req); > goto done; > } > if (r->io_header.driver_status & SG_ERR_DRIVER_SENSE) { > diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h > index 1118107..0fa2a8a 100644 > --- a/include/hw/scsi/scsi.h > +++ b/include/hw/scsi/scsi.h > @@ -265,6 +265,7 @@ void scsi_req_complete(SCSIRequest *req, int status); > uint8_t *scsi_req_get_buf(SCSIRequest *req); > int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len); > void scsi_req_abort(SCSIRequest *req, int status); > +void scsi_req_canceled(SCSIRequest *req); > void scsi_req_cancel(SCSIRequest *req); > void scsi_req_retry(SCSIRequest *req); > void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense); >
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 764f6cf..fca4a9e 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -1718,6 +1718,16 @@ void scsi_req_complete(SCSIRequest *req, int status) scsi_req_unref(req); } +/* Called by the devices when the request is canceled. */ +void scsi_req_canceled(SCSIRequest *req) +{ + assert(req->io_canceled); + if (req->bus->info->cancel) { + req->bus->info->cancel(req); + } + scsi_req_unref(req); +} + void scsi_req_cancel(SCSIRequest *req) { trace_scsi_req_cancel(req->dev->id, req->lun, req->tag); @@ -1730,10 +1740,6 @@ void scsi_req_cancel(SCSIRequest *req) if (req->aiocb) { bdrv_aio_cancel(req->aiocb); } - if (req->bus->info->cancel) { - req->bus->info->cancel(req); - } - scsi_req_unref(req); } static int scsi_ua_precedence(SCSISense sense) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index ef13e66..c029d8c 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -168,6 +168,7 @@ static void scsi_aio_complete(void *opaque, int ret) r->req.aiocb = NULL; block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } @@ -214,6 +215,7 @@ static void scsi_write_do_fua(SCSIDiskReq *r) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } @@ -240,6 +242,7 @@ static void scsi_dma_complete_noio(void *opaque, int ret) block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); } if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } @@ -280,6 +283,7 @@ static void scsi_read_complete(void * opaque, int ret) r->req.aiocb = NULL; block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } @@ -312,6 +316,7 @@ static void scsi_do_read(void *opaque, int ret) block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); } if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } @@ -432,6 +437,7 @@ static void scsi_write_complete(void * opaque, int ret) block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); } if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } @@ -1524,6 +1530,7 @@ static void scsi_unmap_complete(void *opaque, int ret) r->req.aiocb = NULL; if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } @@ -1623,6 +1630,7 @@ static void scsi_write_same_complete(void *opaque, int ret) r->req.aiocb = NULL; block_acct_done(bdrv_get_stats(s->qdev.conf.bs), &r->acct); if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 7e85047..50c98b0 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -94,6 +94,7 @@ static void scsi_command_complete(void *opaque, int ret) r->req.aiocb = NULL; if (r->req.io_canceled) { + scsi_req_canceled(&r->req); goto done; } if (r->io_header.driver_status & SG_ERR_DRIVER_SENSE) { diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 1118107..0fa2a8a 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -265,6 +265,7 @@ void scsi_req_complete(SCSIRequest *req, int status); uint8_t *scsi_req_get_buf(SCSIRequest *req); int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len); void scsi_req_abort(SCSIRequest *req, int status); +void scsi_req_canceled(SCSIRequest *req); void scsi_req_cancel(SCSIRequest *req); void scsi_req_retry(SCSIRequest *req); void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense);
Let the aio cb do the clean up and notification job after scsi_req_cancel, in preparation for asynchronous cancellation. Signed-off-by: Fam Zheng <famz@redhat.com> --- hw/scsi/scsi-bus.c | 14 ++++++++++---- hw/scsi/scsi-disk.c | 8 ++++++++ hw/scsi/scsi-generic.c | 1 + include/hw/scsi/scsi.h | 1 + 4 files changed, 20 insertions(+), 4 deletions(-)