From: Paolo Bonzini <pbonzini@redhat.com>
To: Fam Zheng <famz@redhat.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v3 5/7] scsi: Introduce scsi_req_cancel_complete
Date: Thu, 25 Sep 2014 10:51:51 +0200 [thread overview]
Message-ID: <5423D7A7.6050105@redhat.com> (raw)
In-Reply-To: <1411611649-11171-6-git-send-email-famz@redhat.com>
Il 25/09/2014 04:20, Fam Zheng ha scritto:
> 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(-)
>
> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
> index 764f6cf..c91db63 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_cancel_complete(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..7a7938a 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_cancel_complete(&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_cancel_complete(&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_cancel_complete(&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_cancel_complete(&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_cancel_complete(&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_cancel_complete(&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_cancel_complete(&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_cancel_complete(&r->req);
> goto done;
> }
>
> diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
> index 7e85047..01bca08 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_cancel_complete(&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..a75a7c8 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_cancel_complete(SCSIRequest *req);
> void scsi_req_cancel(SCSIRequest *req);
> void scsi_req_retry(SCSIRequest *req);
> void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense);
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
next prev parent reply other threads:[~2014-09-25 8:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 2:20 [Qemu-devel] [PATCH v3 0/7] virtio-scsi: Asynchronous cancellation Fam Zheng
2014-09-25 2:20 ` [Qemu-devel] [PATCH v3 1/7] scsi: Drop scsi_req_abort Fam Zheng
2014-09-25 2:20 ` [Qemu-devel] [PATCH v3 2/7] scsi-generic: Handle canceled request in scsi_command_complete Fam Zheng
2014-09-25 2:20 ` [Qemu-devel] [PATCH v3 3/7] scsi-bus: Unify request unref in scsi_req_cancel Fam Zheng
2014-09-25 2:20 ` [Qemu-devel] [PATCH v3 4/7] scsi: Drop SCSIReqOps.cancel_io Fam Zheng
2014-09-25 2:20 ` [Qemu-devel] [PATCH v3 5/7] scsi: Introduce scsi_req_cancel_complete Fam Zheng
2014-09-25 8:51 ` Paolo Bonzini [this message]
2014-09-25 2:20 ` [Qemu-devel] [PATCH v3 6/7] scsi: Introduce scsi_req_cancel_async Fam Zheng
2014-09-25 8:51 ` Paolo Bonzini
2014-09-28 1:44 ` Fam Zheng
2014-09-25 2:20 ` [Qemu-devel] [PATCH v3 7/7] virtio-scsi: Handle TMF request cancellation asynchronously Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5423D7A7.6050105@redhat.com \
--to=pbonzini@redhat.com \
--cc=famz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).