Commit c16b5a2c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Anthony Liguori
Browse files

fully split aio_pool from BlockDriver 



Now that we have a separate aio pool structure we can remove those
aio pool details from BlockDriver.

Every driver supporting AIO now needs to declare a static AIOPool
with the aiocb size and the cancellation method.  This cleans up the
current code considerably and will make it cleaner and more obvious
to support two different aio implementations behind a single
BlockDriver.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent ad53089b

block.c

+25 −40
Original line number Diff line number Diff line
@@ -48,23 +48,12 @@ 
#define SECTOR_BITS 9

#define SECTOR_SIZE (1 << SECTOR_BITS)



typedef struct BlockDriverAIOCBSync {

    BlockDriverAIOCB common;

    QEMUBH *bh;

    int ret;

    /* vector translation state */

    QEMUIOVector *qiov;

    uint8_t *bounce;

    int is_write;

} BlockDriverAIOCBSync;



static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque);

static BlockDriverAIOCB *bdrv_aio_writev_em(BlockDriverState *bs,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque);

static void bdrv_aio_cancel_em(BlockDriverAIOCB *acb);

static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num,

                        uint8_t *buf, int nb_sectors);

static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
@@ -138,21 +127,17 @@ void path_combine(char *dest, int dest_size, 
    }

}





void bdrv_register(BlockDriver *bdrv)

{

    if (!bdrv->bdrv_aio_readv) {

        /* add AIO emulation layer */

        bdrv->bdrv_aio_readv = bdrv_aio_readv_em;

        bdrv->bdrv_aio_writev = bdrv_aio_writev_em;

        bdrv->bdrv_aio_cancel = bdrv_aio_cancel_em;

        bdrv->aiocb_size = sizeof(BlockDriverAIOCBSync);

    } else if (!bdrv->bdrv_read) {

        /* add synchronous IO emulation layer */

        bdrv->bdrv_read = bdrv_read_em;

        bdrv->bdrv_write = bdrv_write_em;

    }

    aio_pool_init(&bdrv->aio_pool, bdrv->aiocb_size, bdrv->bdrv_aio_cancel);

    bdrv->next = first_drv;

    first_drv = bdrv;

}
@@ -1369,6 +1354,28 @@ void bdrv_aio_cancel(BlockDriverAIOCB *acb) 
/**************************************************************/

/* async block device emulation */



typedef struct BlockDriverAIOCBSync {

    BlockDriverAIOCB common;

    QEMUBH *bh;

    int ret;

    /* vector translation state */

    QEMUIOVector *qiov;

    uint8_t *bounce;

    int is_write;

} BlockDriverAIOCBSync;



static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)

{

    BlockDriverAIOCBSync *acb = (BlockDriverAIOCBSync *)blockacb;

    qemu_bh_cancel(acb->bh);

    qemu_aio_release(acb);

}



static AIOPool bdrv_em_aio_pool = {

    .aiocb_size         = sizeof(BlockDriverAIOCBSync),

    .cancel             = bdrv_aio_cancel_em,

};



static void bdrv_aio_bh_cb(void *opaque)

{

    BlockDriverAIOCBSync *acb = opaque;
@@ -1392,7 +1399,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs, 
{

    BlockDriverAIOCBSync *acb;



    acb = qemu_aio_get(bs, cb, opaque);

    acb = qemu_aio_get(&bdrv_em_aio_pool, bs, cb, opaque);

    acb->is_write = is_write;

    acb->qiov = qiov;

    acb->bounce = qemu_blockalign(bs, qiov->size);
@@ -1426,14 +1433,6 @@ static BlockDriverAIOCB *bdrv_aio_writev_em(BlockDriverState *bs, 
    return bdrv_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 1);

}





static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)

{

    BlockDriverAIOCBSync *acb = (BlockDriverAIOCBSync *)blockacb;

    qemu_bh_cancel(acb->bh);

    qemu_aio_release(acb);

}



/**************************************************************/

/* sync block device emulation */
@@ -1495,15 +1494,7 @@ void bdrv_init(void) 
    module_call_init(MODULE_INIT_BLOCK);

}



void aio_pool_init(AIOPool *pool, int aiocb_size,

                   void (*cancel)(BlockDriverAIOCB *acb))

{

    pool->aiocb_size = aiocb_size;

    pool->cancel = cancel;

    pool->free_aiocb = NULL;

}



void *qemu_aio_get_pool(AIOPool *pool, BlockDriverState *bs,

void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs,

                   BlockDriverCompletionFunc *cb, void *opaque)

{

    BlockDriverAIOCB *acb;
@@ -1521,12 +1512,6 @@ void *qemu_aio_get_pool(AIOPool *pool, BlockDriverState *bs, 
    return acb;

}



void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,

                   void *opaque)

{

    return qemu_aio_get_pool(&bs->drv->aio_pool, bs, cb, opaque);

}



void qemu_aio_release(void *p)

{

    BlockDriverAIOCB *acb = (BlockDriverAIOCB *)p;

block/curl.c

+11 −16
Original line number Diff line number Diff line
@@ -349,6 +349,16 @@ out_noclean: 
    return -EINVAL;

}



static void curl_aio_cancel(BlockDriverAIOCB *blockacb)

{

    // Do we have to implement canceling? Seems to work without...

}



static AIOPool curl_aio_pool = {

    .aiocb_size         = sizeof(CURLAIOCB),

    .cancel             = curl_aio_cancel,

};



static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque)
@@ -359,7 +369,7 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, 
    size_t end;

    CURLState *state;



    acb = qemu_aio_get(bs, cb, opaque);

    acb = qemu_aio_get(&curl_aio_pool, bs, cb, opaque);

    if (!acb)

        return NULL;
@@ -406,11 +416,6 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, 
    return &acb->common;

}



static void curl_aio_cancel(BlockDriverAIOCB *blockacb)

{

    // Do we have to implement canceling? Seems to work without...

}



static void curl_close(BlockDriverState *bs)

{

    BDRVCURLState *s = bs->opaque;
@@ -450,9 +455,7 @@ static BlockDriver bdrv_http = { 
    .bdrv_close      = curl_close,

    .bdrv_getlength  = curl_getlength,



    .aiocb_size      = sizeof(CURLAIOCB),

    .bdrv_aio_readv  = curl_aio_readv,

    .bdrv_aio_cancel = curl_aio_cancel,

};



static BlockDriver bdrv_https = {
@@ -464,9 +467,7 @@ static BlockDriver bdrv_https = { 
    .bdrv_close      = curl_close,

    .bdrv_getlength  = curl_getlength,



    .aiocb_size      = sizeof(CURLAIOCB),

    .bdrv_aio_readv  = curl_aio_readv,

    .bdrv_aio_cancel = curl_aio_cancel,

};



static BlockDriver bdrv_ftp = {
@@ -478,9 +479,7 @@ static BlockDriver bdrv_ftp = { 
    .bdrv_close      = curl_close,

    .bdrv_getlength  = curl_getlength,



    .aiocb_size      = sizeof(CURLAIOCB),

    .bdrv_aio_readv  = curl_aio_readv,

    .bdrv_aio_cancel = curl_aio_cancel,

};



static BlockDriver bdrv_ftps = {
@@ -492,9 +491,7 @@ static BlockDriver bdrv_ftps = { 
    .bdrv_close      = curl_close,

    .bdrv_getlength  = curl_getlength,



    .aiocb_size      = sizeof(CURLAIOCB),

    .bdrv_aio_readv  = curl_aio_readv,

    .bdrv_aio_cancel = curl_aio_cancel,

};



static BlockDriver bdrv_tftp = {
@@ -506,9 +503,7 @@ static BlockDriver bdrv_tftp = { 
    .bdrv_close      = curl_close,

    .bdrv_getlength  = curl_getlength,



    .aiocb_size      = sizeof(CURLAIOCB),

    .bdrv_aio_readv  = curl_aio_readv,

    .bdrv_aio_cancel = curl_aio_cancel,

};



static void curl_block_init(void)

block/qcow.c

+13 −11
Original line number Diff line number Diff line
@@ -503,6 +503,18 @@ typedef struct QCowAIOCB { 
    BlockDriverAIOCB *hd_aiocb;

} QCowAIOCB;



static void qcow_aio_cancel(BlockDriverAIOCB *blockacb)

{

    QCowAIOCB *acb = (QCowAIOCB *)blockacb;

    if (acb->hd_aiocb)

        bdrv_aio_cancel(acb->hd_aiocb);

    qemu_aio_release(acb);

}



static AIOPool qcow_aio_pool = {

    .aiocb_size         = sizeof(QCowAIOCB),

    .cancel             = qcow_aio_cancel,

};



static QCowAIOCB *qcow_aio_setup(BlockDriverState *bs,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
@@ -510,7 +522,7 @@ static QCowAIOCB *qcow_aio_setup(BlockDriverState *bs, 
{

    QCowAIOCB *acb;



    acb = qemu_aio_get(bs, cb, opaque);

    acb = qemu_aio_get(&qcow_aio_pool, bs, cb, opaque);

    if (!acb)

        return NULL;

    acb->hd_aiocb = NULL;
@@ -720,14 +732,6 @@ static BlockDriverAIOCB *qcow_aio_writev(BlockDriverState *bs, 
    return &acb->common;

}



static void qcow_aio_cancel(BlockDriverAIOCB *blockacb)

{

    QCowAIOCB *acb = (QCowAIOCB *)blockacb;

    if (acb->hd_aiocb)

        bdrv_aio_cancel(acb->hd_aiocb);

    qemu_aio_release(acb);

}



static void qcow_close(BlockDriverState *bs)

{

    BDRVQcowState *s = bs->opaque;
@@ -924,8 +928,6 @@ static BlockDriver bdrv_qcow = { 
    .bdrv_make_empty	= qcow_make_empty,

    .bdrv_aio_readv	= qcow_aio_readv,

    .bdrv_aio_writev	= qcow_aio_writev,

    .bdrv_aio_cancel	= qcow_aio_cancel,

    .aiocb_size		= sizeof(QCowAIOCB),

    .bdrv_write_compressed = qcow_write_compressed,

    .bdrv_get_info	= qcow_get_info,

block/qcow2.c

+14 −11
Original line number Diff line number Diff line
@@ -1246,6 +1246,19 @@ typedef struct QCowAIOCB { 
    QCowL2Meta l2meta;

} QCowAIOCB;



static void qcow_aio_cancel(BlockDriverAIOCB *blockacb)

{

    QCowAIOCB *acb = (QCowAIOCB *)blockacb;

    if (acb->hd_aiocb)

        bdrv_aio_cancel(acb->hd_aiocb);

    qemu_aio_release(acb);

}



static AIOPool qcow_aio_pool = {

    .aiocb_size         = sizeof(QCowAIOCB),

    .cancel             = qcow_aio_cancel,

};



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

static void qcow_aio_read_bh(void *opaque)

{
@@ -1375,7 +1388,7 @@ static QCowAIOCB *qcow_aio_setup(BlockDriverState *bs, 
{

    QCowAIOCB *acb;



    acb = qemu_aio_get(bs, cb, opaque);

    acb = qemu_aio_get(&qcow_aio_pool, bs, cb, opaque);

    if (!acb)

        return NULL;

    acb->hd_aiocb = NULL;
@@ -1498,14 +1511,6 @@ static BlockDriverAIOCB *qcow_aio_writev(BlockDriverState *bs, 
    return &acb->common;

}



static void qcow_aio_cancel(BlockDriverAIOCB *blockacb)

{

    QCowAIOCB *acb = (QCowAIOCB *)blockacb;

    if (acb->hd_aiocb)

        bdrv_aio_cancel(acb->hd_aiocb);

    qemu_aio_release(acb);

}



static void qcow_close(BlockDriverState *bs)

{

    BDRVQcowState *s = bs->opaque;
@@ -2998,8 +3003,6 @@ static BlockDriver bdrv_qcow2 = { 


    .bdrv_aio_readv	= qcow_aio_readv,

    .bdrv_aio_writev	= qcow_aio_writev,

    .bdrv_aio_cancel	= qcow_aio_cancel,

    .aiocb_size		= sizeof(QCowAIOCB),

    .bdrv_write_compressed = qcow_write_compressed,



    .bdrv_snapshot_create = qcow_snapshot_create,

block/raw-posix.c

+41 −40
Original line number Diff line number Diff line
@@ -599,6 +599,45 @@ static int posix_aio_init(void) 
    return 0;

}



static void raw_aio_remove(RawAIOCB *acb)

{

    RawAIOCB **pacb;



    /* remove the callback from the queue */

    pacb = &posix_aio_state->first_aio;

    for(;;) {

        if (*pacb == NULL) {

            fprintf(stderr, "raw_aio_remove: aio request not found!\n");

            break;

        } else if (*pacb == acb) {

            *pacb = acb->next;

            qemu_aio_release(acb);

            break;

        }

        pacb = &(*pacb)->next;

    }

}



static void raw_aio_cancel(BlockDriverAIOCB *blockacb)

{

    int ret;

    RawAIOCB *acb = (RawAIOCB *)blockacb;



    ret = qemu_paio_cancel(acb->aiocb.aio_fildes, &acb->aiocb);

    if (ret == QEMU_PAIO_NOTCANCELED) {

        /* fail safe: if the aio could not be canceled, we wait for

           it */

        while (qemu_paio_error(&acb->aiocb) == EINPROGRESS);

    }



    raw_aio_remove(acb);

}



static AIOPool raw_aio_pool = {

    .aiocb_size         = sizeof(RawAIOCB),

    .cancel             = raw_aio_cancel,

};



static RawAIOCB *raw_aio_setup(BlockDriverState *bs, int64_t sector_num,

        QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque)
@@ -609,7 +648,7 @@ static RawAIOCB *raw_aio_setup(BlockDriverState *bs, int64_t sector_num, 
    if (fd_open(bs) < 0)

        return NULL;



    acb = qemu_aio_get(bs, cb, opaque);

    acb = qemu_aio_get(&raw_aio_pool, bs, cb, opaque);

    if (!acb)

        return NULL;

    acb->aiocb.aio_fildes = s->fd;
@@ -633,25 +672,6 @@ static RawAIOCB *raw_aio_setup(BlockDriverState *bs, int64_t sector_num, 
    return acb;

}



static void raw_aio_remove(RawAIOCB *acb)

{

    RawAIOCB **pacb;



    /* remove the callback from the queue */

    pacb = &posix_aio_state->first_aio;

    for(;;) {

        if (*pacb == NULL) {

            fprintf(stderr, "raw_aio_remove: aio request not found!\n");

            break;

        } else if (*pacb == acb) {

            *pacb = acb->next;

            qemu_aio_release(acb);

            break;

        }

        pacb = &(*pacb)->next;

    }

}



static BlockDriverAIOCB *raw_aio_readv(BlockDriverState *bs,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque)
@@ -683,21 +703,6 @@ static BlockDriverAIOCB *raw_aio_writev(BlockDriverState *bs, 
    }

    return &acb->common;

}



static void raw_aio_cancel(BlockDriverAIOCB *blockacb)

{

    int ret;

    RawAIOCB *acb = (RawAIOCB *)blockacb;



    ret = qemu_paio_cancel(acb->aiocb.aio_fildes, &acb->aiocb);

    if (ret == QEMU_PAIO_NOTCANCELED) {

        /* fail safe: if the aio could not be canceled, we wait for

           it */

        while (qemu_paio_error(&acb->aiocb) == EINPROGRESS);

    }



    raw_aio_remove(acb);

}

#else /* CONFIG_AIO */

static int posix_aio_init(void)

{
@@ -871,8 +876,6 @@ static BlockDriver bdrv_raw = { 
#ifdef CONFIG_AIO

    .bdrv_aio_readv = raw_aio_readv,

    .bdrv_aio_writev = raw_aio_writev,

    .bdrv_aio_cancel = raw_aio_cancel,

    .aiocb_size = sizeof(RawAIOCB),

#endif



    .bdrv_truncate = raw_truncate,
@@ -1205,7 +1208,7 @@ static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs, 
    if (fd_open(bs) < 0)

        return NULL;



    acb = qemu_aio_get(bs, cb, opaque);

    acb = qemu_aio_get(&raw_aio_pool, bs, cb, opaque);

    if (!acb)

        return NULL;

    acb->aiocb.aio_fildes = s->fd;
@@ -1417,8 +1420,6 @@ static BlockDriver bdrv_host_device = { 
#ifdef CONFIG_AIO

    .bdrv_aio_readv	= raw_aio_readv,

    .bdrv_aio_writev	= raw_aio_writev,

    .bdrv_aio_cancel	= raw_aio_cancel,

    .aiocb_size		= sizeof(RawAIOCB),

#endif



    .bdrv_read          = raw_read,