[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/8] block: Add bdrv_aio_cancel_async
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v3 2/8] block: Add bdrv_aio_cancel_async |
Date: |
Wed, 27 Aug 2014 10:49:10 +0800 |
This is the async version of bdrv_aio_cancel, which doesn't block the
caller. It guarantees that the cb is called either before returning or
some time later.
Signed-off-by: Fam Zheng <address@hidden>
---
block.c | 26 ++++++++++++++++++++++++++
include/block/aio.h | 1 +
include/block/block.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/block.c b/block.c
index f8e342f..f4c77ec 100644
--- a/block.c
+++ b/block.c
@@ -4612,6 +4612,32 @@ void bdrv_aio_cancel(BlockDriverAIOCB *acb)
acb->aiocb_info->cancel(acb);
}
+static void bdrv_aio_cancel_cb_nop(void *opaque, int ret)
+{
+ /* nop */
+}
+
+/* Async version of aio cancel. The caller is not blocked if the acb implements
+ * cancel_async, otherwise fall back to bdrv_aio_cancel. In both cases, acb->cb
+ * is guarenteed to be called, before or after function returns. */
+void bdrv_aio_cancel_async(BlockDriverAIOCB *acb)
+{
+ if (acb->aiocb_info->cancel_async) {
+ acb->aiocb_info->cancel_async(acb);
+ } else {
+ /* Mask the cb and cancel, we'll call it manually once the synchronous
+ * cancel is done. */
+ BlockDriverCompletionFunc *cb = acb->cb;
+ void *opaque = acb->opaque;
+ acb->cb = bdrv_aio_cancel_cb_nop;
+ acb->opaque = NULL;
+ qemu_aio_ref(acb);
+ acb->aiocb_info->cancel(acb);
+ cb(opaque, -ECANCELED);
+ qemu_aio_release(acb);
+ }
+}
+
/**************************************************************/
/* async block device emulation */
diff --git a/include/block/aio.h b/include/block/aio.h
index 8c216f6..c434466 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -27,6 +27,7 @@ typedef void BlockDriverCompletionFunc(void *opaque, int ret);
typedef struct AIOCBInfo {
void (*cancel)(BlockDriverAIOCB *acb);
+ void (*cancel_async)(BlockDriverAIOCB *acb);
size_t aiocb_size;
} AIOCBInfo;
diff --git a/include/block/block.h b/include/block/block.h
index 8f4ad16..35a2448 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -336,6 +336,7 @@ BlockDriverAIOCB *bdrv_aio_discard(BlockDriverState *bs,
int64_t sector_num, int nb_sectors,
BlockDriverCompletionFunc *cb, void
*opaque);
void bdrv_aio_cancel(BlockDriverAIOCB *acb);
+void bdrv_aio_cancel_async(BlockDriverAIOCB *acb);
typedef struct BlockRequest {
/* Fields to be filled by multiwrite caller */
--
2.1.0
- [Qemu-devel] [PATCH v3 0/8] block: Asynchronous request cancellation, Fam Zheng, 2014/08/26
- [Qemu-devel] [PATCH v3 1/8] block: Add refcnt in BlockDriverAIOCB, Fam Zheng, 2014/08/26
- [Qemu-devel] [PATCH v3 2/8] block: Add bdrv_aio_cancel_async,
Fam Zheng <=
- [Qemu-devel] [PATCH v3 3/8] tests: Add testing code for bdrv_aio_cancel_async, Fam Zheng, 2014/08/26
- [Qemu-devel] [PATCH v3 5/8] thread-pool: Implement .cancel_async, Fam Zheng, 2014/08/26
- [Qemu-devel] [PATCH v3 4/8] linux-aio: Implement .cancel_async, Fam Zheng, 2014/08/26
- [Qemu-devel] [PATCH v3 6/8] dma: Implement .cancel_async, Fam Zheng, 2014/08/26
- [Qemu-devel] [PATCH v3 7/8] block: Implement bdrv_em_co_aiocb_info.cancel_async, Fam Zheng, 2014/08/26
- [Qemu-devel] [PATCH v3 8/8] iscsi: Implement .cancel_async in acb info, Fam Zheng, 2014/08/26