fully split aio_pool from BlockDriver
PATCH 1/1 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.
block.c +25 -40
@@ -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_s } } -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; }
@@ -1420,6 +1405,28 @@ void bdrv_aio_cancel(BlockDriverAIOCB *a/**************************************************************/ /* 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;
@@ -1443,7 +1450,7 @@ static BlockDriverAIOCB *bdrv_aio_rw_vec {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);
@@ -1477,14 +1484,6 @@ static BlockDriverAIOCB *bdrv_aio_writevreturn 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 */
@@ -1546,16 +1545,8 @@ 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, -BlockDriverCompletionFunc *cb,void *opaque) +void *qemu_aio_get (AIOPool *pool,BlockDriverState *bs, +BlockDriverCompletionFunc *cb,void *opaque) {BlockDriverAIOCB *acb;
@@ -1572,12 +1563,6 @@ void *qemu_aio_get_pool(AIOPool *pool, Breturn 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
@@ -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(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(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
@@ -538,6 +538,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,
@@ -545,7 +557,7 @@ static QCowAIOCB *qcow_aio_setup(BlockDr {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 ;
@@ -755,14 +767,6 @@ static BlockDriverAIOCB *qcow_aio_writevreturn &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;
@@ -959,8 +963,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
@@ -1286,6 +1286,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) {
@@ -1415,7 +1428,7 @@ static QCowAIOCB *qcow_aio_setup(BlockDr {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 ;
@@ -1538,14 +1551,6 @@ static BlockDriverAIOCB *qcow_aio_writevreturn &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;
@@ -2980,8 +2985,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 -46
147 lines not on this page · raw message
block_int.h +2 -11
@@ -67,8 +67,6 @@ struct BlockDriver {BlockDriverAIOCB *(*bdrv_aio_writev)(BlockDriverState *bs,int64_t sector_num,QEMUIOVector *qiov,int nb_sectors,BlockDriverCompletionFunc *cb,void *opaque); -void (*bdrv_aio_cancel)(BlockDriverAIOCB *acb); -int aiocb_size;const char *protocol_name;int (*bdrv_truncate)(BlockDriverState *bs,int64_t offset);
@@ -102,8 +100,6 @@ struct BlockDriver { unsigned long int req, void *buf, BlockDriverCompletionFunc *cb, void *opaque); -AIOPool aio_pool; -/* List of options for creating images, terminated by name == NULL */ QEMUOptionParameter *create_options;
@@ -173,13 +169,8 @@ struct BlockDriverAIOCB {void get_tmp_filename (char *filename,int size); -void aio_pool_init (AIOPool *pool,int aiocb_size, -void (*cancel)(BlockDriverAIOCB *acb)); - -void *qemu_aio_get (BlockDriverState *bs,BlockDriverCompletionFunc *cb, -void *opaque); -void *qemu_aio_get_pool (AIOPool *pool,BlockDriverState *bs, -BlockDriverCompletionFunc *cb,void *opaque); +void *qemu_aio_get (AIOPool *pool,BlockDriverState *bs, +BlockDriverCompletionFunc *cb,void *opaque);void qemu_aio_release (void *p);void *qemu_blockalign (BlockDriverState *bs,size_t size);
dma-helpers.c +15 -17
@@ -10,8 +10,6 @@#include "dma.h" #include "block_int.h" -static AIOPool dma_aio_pool; -void qemu_sglist_init (QEMUSGList *qsg,int alloc_hint) { qsg->sg =qemu_malloc (alloc_hint *sizeof (ScatterGatherEntry));
@@ -132,12 +130,26 @@ static void dma_bdrv_cb(void *opaque, in } } +static void dma_aio_cancel (BlockDriverAIOCB *acb) +{ +DMAAIOCB *dbs =container_of (acb,DMAAIOCB , common); + +if (dbs->acb) { +bdrv_aio_cancel (dbs->acb); + } +} + +static AIOPool dma_aio_pool = { + .aiocb_size =sizeof (DMAAIOCB ), + .cancel = dma_aio_cancel, +}; +static BlockDriverAIOCB *dma_bdrv_io (BlockDriverState *bs,QEMUSGList *sg,uint64_t sector_num,BlockDriverCompletionFunc *cb,void *opaque,int is_write) { -DMAAIOCB *dbs =qemu_aio_get_pool (&dma_aio_pool, bs, cb, opaque); +DMAAIOCB *dbs =qemu_aio_get (&dma_aio_pool, bs, cb, opaque); dbs->acb =NULL ; dbs->bs = bs;
@@ -170,17 +182,3 @@ BlockDriverAIOCB *dma_bdrv_write(BlockDr {return dma_bdrv_io (bs, sg, sector, cb, opaque,1 ); } - -static void dma_aio_cancel (BlockDriverAIOCB *acb) -{ -DMAAIOCB *dbs =container_of (acb,DMAAIOCB , common); - -if (dbs->acb) { -bdrv_aio_cancel (dbs->acb); - } -} - -void dma_helper_init (void ) -{ -aio_pool_init (&dma_aio_pool,sizeof (DMAAIOCB ), dma_aio_cancel); -}
dma.h +0 -2
@@ -38,6 +38,4 @@ BlockDriverAIOCB *dma_bdrv_read(BlockDriBlockDriverAIOCB *dma_bdrv_write (BlockDriverState *bs,QEMUSGList *sg,uint64_t sector,BlockDriverCompletionFunc *cb,void *opaque); -void dma_helper_init (void ); -#endif
vl.c +0 -1
@@ -5754,7 +5754,6 @@ int main(int argc, char **argv, char **ecpu_exec_init_all (tb_size *1024 *1024 );bdrv_init (); -dma_helper_init ();/* we always create the cdrom drive, even if no disk is there */
Quoted 9 lines · Christoph Hellwig
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.
Looks good.
block/curl.c out_noclean: · line 356
Quoted 7 lines
block/curl.c +5
-0+static void curl_aio_cancel (BlockDriverAIOCB *blockacb) +{ +// Do we have to implement canceling? Seems to work without... +} +
We do, but I'd rather not think exactly what to do here. I'd like aio cancellation to be asynchronous so things like controller resets don't stall the vcpu.
Signature · 1 line
error compiling committee.c: too many arguments to function
PATCH 1/1 qcow: add qcow_aio_setup helper
In reply to Christoph Hellwig[this one is required for [PATCH] fully split aio_pool from BlockDriver,
sorry for not sending it out earlier]
Add a qcow_aio_setup helper to qcow to shared common code between the aio_readv and aio_writev methods. Based on the function with the same name in qcow2.
block/qcow.c +29 -23
@@ -538,6 +538,32 @@ typedef struct QCowAIOCB {BlockDriverAIOCB *hd_aiocb; } QCowAIOCB; + +static QCowAIOCB *qcow_aio_setup (BlockDriverState *bs, +int64_t sector_num,QEMUIOVector *qiov,int nb_sectors, +BlockDriverCompletionFunc *cb,void *opaque,int is_write) +{ +QCowAIOCB *acb; + + acb =qemu_aio_get (bs, cb, opaque); +if (!acb) +return NULL ; + acb->hd_aiocb =NULL ; + acb->sector_num = sector_num; + acb->qiov = qiov; +if (qiov->niov >1 ) { + acb->buf = acb->orig_buf =qemu_blockalign (bs, qiov->size); +if (is_write) +qemu_iovec_to_buffer (qiov, acb->buf); + }else { + acb->buf = (uint8_t *)qiov->iov->iov_base; + } + acb->nb_sectors = nb_sectors; + acb->n =0 ; + acb->cluster_offset =0 ; +return acb; +} +static void qcow_aio_read_cb (void *opaque,int ret) {QCowAIOCB *acb = opaque;
@@ -635,19 +661,9 @@ static BlockDriverAIOCB *qcow_aio_readv( {QCowAIOCB *acb; - acb =qemu_aio_get (bs, cb, opaque); + acb =qcow_aio_setup (bs, sector_num, qiov, nb_sectors, cb, opaque,0 );if (!acb)return NULL ; - acb->hd_aiocb =NULL ; - acb->sector_num = sector_num; - acb->qiov = qiov; -if (qiov->niov >1 ) - acb->buf = acb->orig_buf =qemu_blockalign (bs, qiov->size); -else - acb->buf = (uint8_t *)qiov->iov->iov_base; - acb->nb_sectors = nb_sectors; - acb->n =0 ; - acb->cluster_offset =0 ;qcow_aio_read_cb (acb,0 );return &acb->common;
@@ -730,20 +746,10 @@ static BlockDriverAIOCB *qcow_aio_writev s->cluster_cache_offset =-1 ;/* disable compressed cache */ - acb =qemu_aio_get (bs, cb, opaque); + acb =qcow_aio_setup (bs, sector_num, qiov, nb_sectors, cb, opaque,0 );if (!acb)return NULL ; - acb->hd_aiocb =NULL ; - acb->sector_num = sector_num; - acb->qiov = qiov; -if (qiov->niov >1 ) { - acb->buf = acb->orig_buf =qemu_blockalign (bs, qiov->size); -qemu_iovec_to_buffer (qiov, acb->buf); - }else { - acb->buf = (uint8_t *)qiov->iov->iov_base; - } - acb->nb_sectors = nb_sectors; - acb->n =0 ; +qcow_aio_write_cb (acb,0 );return &acb->common;