Re: [Qemu-devel] [PATCH 6/8] quorum: Avoid bdrv_aio_writev() for rewrites

[Alberto Garcia]

On Mon 21 Nov 2016 06:31:26 PM CET, Kevin Wolf  wrote:
> Replacing it with bdrv_co_pwritev() prepares us for byte granularity
> requests and gets us rid of the last bdrv_aio_*() user in quorum.
>
> Signed-off-by: Kevin Wolf 

Reviewed-by: Alberto Garcia 

Berto

Re: [Qemu-devel] [PATCH 6/8] quorum: Avoid bdrv_aio_writev() for rewrites

[Eric Blake]

On 11/21/2016 11:31 AM, Kevin Wolf wrote:
> Replacing it with bdrv_co_pwritev() prepares us for byte granularity
> requests and gets us rid of the last bdrv_aio_*() user in quorum.
> 
> Signed-off-by: Kevin Wolf 
> ---
>  block/quorum.c | 46 +++---
>  1 file changed, 31 insertions(+), 15 deletions(-)
> 

Reviewed-by: Eric Blake 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature

[Qemu-devel] [PATCH 6/8] quorum: Avoid bdrv_aio_writev() for rewrites

[Kevin Wolf]

Replacing it with bdrv_co_pwritev() prepares us for byte granularity
requests and gets us rid of the last bdrv_aio_*() user in quorum.

Signed-off-by: Kevin Wolf 
---
 block/quorum.c | 46 +++---
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/block/quorum.c b/block/quorum.c
index 8513414..8e674a8 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -223,15 +223,6 @@ static bool quorum_has_too_much_io_failed(QuorumAIOCB *acb)
 return false;
 }
 
-static void quorum_rewrite_aio_cb(void *opaque, int ret)
-{
-QuorumAIOCB *acb = opaque;
-
-/* one less rewrite to do */
-acb->rewrite_count--;
-qemu_coroutine_enter_if_inactive(acb->co);
-}
-
 static int read_fifo_child(QuorumAIOCB *acb);
 
 static void quorum_copy_qiov(QEMUIOVector *dest, QEMUIOVector *source)
@@ -298,7 +289,27 @@ static void quorum_report_bad_versions(BDRVQuorumState *s,
 }
 }
 
-static bool quorum_rewrite_bad_versions(BDRVQuorumState *s, QuorumAIOCB *acb,
+static void quorum_rewrite_entry(void *opaque)
+{
+QuorumCo *co = opaque;
+QuorumAIOCB *acb = co->acb;
+BDRVQuorumState *s = acb->bs->opaque;
+
+/* Ignore any errors, it's just a correction attempt for already
+ * corrupted data. */
+bdrv_co_pwritev(s->children[co->idx],
+acb->sector_num * BDRV_SECTOR_SIZE,
+acb->nb_sectors * BDRV_SECTOR_SIZE,
+acb->qiov, 0);
+
+/* Wake up the caller after the last rewrite */
+acb->rewrite_count--;
+if (!acb->rewrite_count) {
+qemu_coroutine_enter_if_inactive(acb->co);
+}
+}
+
+static bool quorum_rewrite_bad_versions(QuorumAIOCB *acb,
 QuorumVoteValue *value)
 {
 QuorumVoteVersion *version;
@@ -317,7 +328,7 @@ static bool quorum_rewrite_bad_versions(BDRVQuorumState *s, 
QuorumAIOCB *acb,
 }
 }
 
-/* quorum_rewrite_aio_cb will count down this to zero */
+/* quorum_rewrite_entry will count down this to zero */
 acb->rewrite_count = count;
 
 /* now fire the correcting rewrites */
@@ -326,9 +337,14 @@ static bool quorum_rewrite_bad_versions(BDRVQuorumState 
*s, QuorumAIOCB *acb,
 continue;
 }
 QLIST_FOREACH(item, >items, next) {
-bdrv_aio_writev(s->children[item->index], acb->sector_num,
-acb->qiov, acb->nb_sectors, quorum_rewrite_aio_cb,
-acb);
+Coroutine *co;
+QuorumCo data = {
+.acb = acb,
+.idx = item->index,
+};
+
+co = qemu_coroutine_create(quorum_rewrite_entry, );
+qemu_coroutine_enter(co);
 }
 }
 
@@ -582,7 +598,7 @@ static bool quorum_vote(QuorumAIOCB *acb)
 
 /* corruption correction is enabled */
 if (s->rewrite_corrupted) {
-rewrite = quorum_rewrite_bad_versions(s, acb, >value);
+rewrite = quorum_rewrite_bad_versions(acb, >value);
 }
 
 free_exit:
-- 
1.8.3.1