[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/15] qed: move tail of qed_aio_write_main to qed_ai
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 06/15] qed: move tail of qed_aio_write_main to qed_aio_write_{cow, alloc} |
Date: |
Mon, 17 Jul 2017 11:48:16 +0800 |
From: Paolo Bonzini <address@hidden>
This part is never called for in-place writes, move it away to avoid
the "backwards" coding style typical of callback-based code.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
block/qed.c | 70 ++++++++++++++++++++++++++++---------------------------------
1 file changed, 32 insertions(+), 38 deletions(-)
diff --git a/block/qed.c b/block/qed.c
index 86cad21..5792796 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -982,40 +982,12 @@ static int coroutine_fn qed_aio_write_main(QEDAIOCB *acb)
BDRVQEDState *s = acb_to_s(acb);
uint64_t offset = acb->cur_cluster +
qed_offset_into_cluster(s, acb->cur_pos);
- int ret;
trace_qed_aio_write_main(s, acb, 0, offset, acb->cur_qiov.size);
BLKDBG_EVENT(s->bs->file, BLKDBG_WRITE_AIO);
- ret = bdrv_co_pwritev(s->bs->file, offset, acb->cur_qiov.size,
- &acb->cur_qiov, 0);
- if (ret < 0) {
- return ret;
- }
-
- if (acb->find_cluster_ret != QED_CLUSTER_FOUND) {
- if (s->bs->backing) {
- /*
- * Flush new data clusters before updating the L2 table
- *
- * This flush is necessary when a backing file is in use. A crash
- * during an allocating write could result in empty clusters in the
- * image. If the write only touched a subregion of the cluster,
- * then backing image sectors have been lost in the untouched
- * region. The solution is to flush after writing a new data
- * cluster and before updating the L2 table.
- */
- ret = bdrv_co_flush(s->bs->file->bs);
- if (ret < 0) {
- return ret;
- }
- }
- ret = qed_aio_write_l2_update(acb, acb->cur_cluster);
- if (ret < 0) {
- return ret;
- }
- }
- return 0;
+ return bdrv_co_pwritev(s->bs->file, offset, acb->cur_qiov.size,
+ &acb->cur_qiov, 0);
}
/**
@@ -1050,7 +1022,29 @@ static int coroutine_fn qed_aio_write_cow(QEDAIOCB *acb)
return ret;
}
- return qed_aio_write_main(acb);
+ ret = qed_aio_write_main(acb);
+ if (ret < 0) {
+ return ret;
+ }
+
+ if (s->bs->backing) {
+ /*
+ * Flush new data clusters before updating the L2 table
+ *
+ * This flush is necessary when a backing file is in use. A crash
+ * during an allocating write could result in empty clusters in the
+ * image. If the write only touched a subregion of the cluster,
+ * then backing image sectors have been lost in the untouched
+ * region. The solution is to flush after writing a new data
+ * cluster and before updating the L2 table.
+ */
+ ret = bdrv_co_flush(s->bs->file->bs);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+
+ return 0;
}
/**
@@ -1103,6 +1097,7 @@ static int coroutine_fn qed_aio_write_alloc(QEDAIOCB
*acb, size_t len)
if (acb->find_cluster_ret == QED_CLUSTER_ZERO) {
return 0;
}
+ acb->cur_cluster = 1;
} else {
acb->cur_cluster = qed_alloc_clusters(s, acb->cur_nclusters);
}
@@ -1115,15 +1110,14 @@ static int coroutine_fn qed_aio_write_alloc(QEDAIOCB
*acb, size_t len)
}
}
- if (acb->flags & QED_AIOCB_ZERO) {
- ret = qed_aio_write_l2_update(acb, 1);
- } else {
+ if (!(acb->flags & QED_AIOCB_ZERO)) {
ret = qed_aio_write_cow(acb);
+ if (ret < 0) {
+ return ret;
+ }
}
- if (ret < 0) {
- return ret;
- }
- return 0;
+
+ return qed_aio_write_l2_update(acb, acb->cur_cluster);
}
/**
--
2.9.4
- [Qemu-devel] [PULL 00/15] Block and testing patches, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 01/15] qcow2: call CoQueue APIs under CoMutex, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 02/15] coroutine-lock: add qemu_co_rwlock_downgrade and qemu_co_rwlock_upgrade, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 03/15] vdi: make it thread-safe, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 04/15] vpc: make it thread-safe, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 05/15] vvfat: make it thread-safe, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 06/15] qed: move tail of qed_aio_write_main to qed_aio_write_{cow, alloc},
Fam Zheng <=
- [Qemu-devel] [PULL 08/15] qed: introduce bdrv_qed_init_state, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 07/15] block: invoke .bdrv_drain callback in coroutine context and from AioContext, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 09/15] qed: protect table cache with CoMutex, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 12/15] docker: Don't enable networking as a side-effect of DEBUG=1, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 13/15] docker.py: Drop infile parameter, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 11/15] ssh: support I/O from any AioContext, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 10/15] sheepdog: add queue_lock, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 14/15] docker.py: Improve subprocess exit code handling, Fam Zheng, 2017/07/16
- [Qemu-devel] [PULL 15/15] travis: add no-TCG build, Fam Zheng, 2017/07/16
- Re: [Qemu-devel] [PULL 00/15] Block and testing patches, Peter Maydell, 2017/07/17