Skip to content

Commit

Permalink
scsi-disk: identify AIO callbacks more clearly
Browse files Browse the repository at this point in the history 
Functions that are not callbacks should assert that aiocb is NULL and
have a non-opaque argument (usually a pointer to SCSIDiskReq).

AIO callbacks should assert that aiocb is not NULL and take care of
calling block_acct done.  They also have an opaque argument.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
@bonzini
bonzini committed Aug 14, 2015
1 parent d223c10 commit 5fd2b56
Showing 1 changed file with 61 additions and 30 deletions.
91 changes: 61 additions & 30 deletions hw/scsi/scsi-disk.c
View file
Expand Up @@ -217,6 +217,8 @@ static void scsi_write_do_fua(SCSIDiskReq *r)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);

assert(r->req.aiocb == NULL);

if (r->req.io_canceled) {
scsi_req_cancel_complete(&r->req);
goto done;
Expand All @@ -235,15 +237,10 @@ static void scsi_write_do_fua(SCSIDiskReq *r)
scsi_req_unref(&r->req);
}

static void scsi_dma_complete_noio(void *opaque, int ret)
static void scsi_dma_complete_noio(SCSIDiskReq *r, int ret)
{
SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
assert(r->req.aiocb == NULL);

if (r->req.aiocb != NULL) {
r->req.aiocb = NULL;
block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
}
if (r->req.io_canceled) {
scsi_req_cancel_complete(&r->req);
goto done;
Expand Down Expand Up @@ -271,9 +268,13 @@ static void scsi_dma_complete_noio(void *opaque, int ret)
static void scsi_dma_complete(void *opaque, int ret)
{
SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);

assert(r->req.aiocb != NULL);
scsi_dma_complete_noio(opaque, ret);
r->req.aiocb = NULL;

block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
scsi_dma_complete_noio(r, ret);
}

static void scsi_read_complete(void * opaque, int ret)
Expand Down Expand Up @@ -308,16 +309,13 @@ static void scsi_read_complete(void * opaque, int ret)
}

/* Actually issue a read to the block device. */
static void scsi_do_read(void *opaque, int ret)
static void scsi_do_read(SCSIDiskReq *r, int ret)
{
SCSIDiskReq *r = opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
uint32_t n;

if (r->req.aiocb != NULL) {
r->req.aiocb = NULL;
block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
}
assert (r->req.aiocb == NULL);

if (r->req.io_canceled) {
scsi_req_cancel_complete(&r->req);
goto done;
Expand Down Expand Up @@ -349,6 +347,18 @@ static void scsi_do_read(void *opaque, int ret)
scsi_req_unref(&r->req);
}

static void scsi_do_read_cb(void *opaque, int ret)
{
SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);

assert (r->req.aiocb != NULL);
r->req.aiocb = NULL;

block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
scsi_do_read(opaque, ret);
}

/* Read more data from scsi device into buffer. */
static void scsi_read_data(SCSIRequest *req)
{
Expand Down Expand Up @@ -384,7 +394,7 @@ static void scsi_read_data(SCSIRequest *req)
if (first && scsi_is_cmd_fua(&r->req.cmd)) {
block_acct_start(blk_get_stats(s->qdev.conf.blk), &r->acct, 0,
BLOCK_ACCT_FLUSH);
r->req.aiocb = blk_aio_flush(s->qdev.conf.blk, scsi_do_read, r);
r->req.aiocb = blk_aio_flush(s->qdev.conf.blk, scsi_do_read_cb, r);
} else {
scsi_do_read(r, 0);
}
Expand Down Expand Up @@ -430,16 +440,12 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error)
return action != BLOCK_ERROR_ACTION_IGNORE;
}

static void scsi_write_complete(void * opaque, int ret)
static void scsi_write_complete_noio(SCSIDiskReq *r, int ret)
{
SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
uint32_t n;

if (r->req.aiocb != NULL) {
r->req.aiocb = NULL;
block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
}
assert (r->req.aiocb == NULL);

if (r->req.io_canceled) {
scsi_req_cancel_complete(&r->req);
goto done;
Expand Down Expand Up @@ -467,6 +473,18 @@ static void scsi_write_complete(void * opaque, int ret)
scsi_req_unref(&r->req);
}

static void scsi_write_complete(void * opaque, int ret)
{
SCSIDiskReq *r = (SCSIDiskReq *)opaque;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);

assert (r->req.aiocb != NULL);
r->req.aiocb = NULL;

block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
scsi_write_complete_noio(r, ret);
}

static void scsi_write_data(SCSIRequest *req)
{
SCSIDiskReq *r = DO_UPCAST(SCSIDiskReq, req, req);
Expand All @@ -480,18 +498,18 @@ static void scsi_write_data(SCSIRequest *req)
scsi_req_ref(&r->req);
if (r->req.cmd.mode != SCSI_XFER_TO_DEV) {
DPRINTF("Data transfer direction invalid\n");
scsi_write_complete(r, -EINVAL);
scsi_write_complete_noio(r, -EINVAL);
return;
}

if (!r->req.sg && !r->qiov.size) {
/* Called for the first time. Ask the driver to send us more data. */
r->started = true;
scsi_write_complete(r, 0);
scsi_write_complete_noio(r, 0);
return;
}
if (s->tray_open) {
scsi_write_complete(r, -ENOMEDIUM);
scsi_write_complete_noio(r, -ENOMEDIUM);
return;
}

Expand All @@ -500,7 +518,7 @@ static void scsi_write_data(SCSIRequest *req)
if (r->req.sg) {
scsi_dma_complete_noio(r, 0);
} else {
scsi_write_complete(r, 0);
scsi_write_complete_noio(r, 0);
}
return;
}
Expand Down Expand Up @@ -1557,15 +1575,17 @@ typedef struct UnmapCBData {
int count;
} UnmapCBData;

static void scsi_unmap_complete(void *opaque, int ret)
static void scsi_unmap_complete(void *opaque, int ret);

static void scsi_unmap_complete_noio(UnmapCBData *data, int ret)
{
UnmapCBData *data = opaque;
SCSIDiskReq *r = data->r;
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
uint64_t sector_num;
uint32_t nb_sectors;

r->req.aiocb = NULL;
assert(r->req.aiocb == NULL);

if (r->req.io_canceled) {
scsi_req_cancel_complete(&r->req);
goto done;
Expand Down Expand Up @@ -1601,6 +1621,17 @@ static void scsi_unmap_complete(void *opaque, int ret)
g_free(data);
}

static void scsi_unmap_complete(void *opaque, int ret)
{
UnmapCBData *data = opaque;
SCSIDiskReq *r = data->r;

assert(r->req.aiocb != NULL);
r->req.aiocb = NULL;

scsi_unmap_complete_noio(data, ret);
}

static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
{
SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
Expand Down Expand Up @@ -1638,7 +1669,7 @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)

/* The matching unref is in scsi_unmap_complete, before data is freed. */
scsi_req_ref(&r->req);
scsi_unmap_complete(data, 0);
scsi_unmap_complete_noio(data, 0);
return;

invalid_param_len:
Expand Down

0 comments on commit 5fd2b56

Please sign in to comment.