Patchwork [RFC,V3,8/9] quorum: Add quorum_aio_readv.

login
register
mail settings
Submitter Benoit Canet
Date Aug. 14, 2012, 2:14 p.m.
Message ID <1344953651-16622-9-git-send-email-benoit@irqsave.net>
Download mbox | patch
Permalink /patch/177298/
State New
Headers show

Comments

Benoit Canet - Aug. 14, 2012, 2:14 p.m.
Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 block/quorum.c |   35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)
Stefan Hajnoczi - Aug. 15, 2012, 10:53 a.m.
On Tue, Aug 14, 2012 at 04:14:10PM +0200, BenoƮt Canet wrote:
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---
>  block/quorum.c |   35 ++++++++++++++++++++++++++++++++++-
>  1 file changed, 34 insertions(+), 1 deletion(-)
> 
> diff --git a/block/quorum.c b/block/quorum.c
> index 86962b4..8b449fb 100644
> --- a/block/quorum.c
> +++ b/block/quorum.c
> @@ -190,10 +190,16 @@ static void quorum_aio_bh(void *opaque)
>  {
>      QuorumAIOCB *acb = opaque;
>      BDRVQuorumState *s = acb->bqs;
> -    int ret;
> +    int i, ret;
> 
>      ret = s->n <= acb->success_count ? 0 : -EIO;
> 
> +    for (i = 0; i < s->m; i++) {
> +        qemu_vfree(acb->aios[i].buf);
> +        acb->aios[i].buf = NULL;
> +        acb->aios[i].ret = 0;
> +    }
> +
>      qemu_bh_delete(acb->bh);
>      acb->common.cb(acb->common.opaque, ret);
>      if (acb->finished) {
> @@ -258,6 +264,32 @@ static void quorum_aio_cb(void *opaque, int ret)
>      qemu_bh_schedule(acb->bh);
>  }
> 
> +static BlockDriverAIOCB *quorum_aio_readv(BlockDriverState *bs,
> +                                         int64_t sector_num,
> +                                         QEMUIOVector *qiov,
> +                                         int nb_sectors,
> +                                         BlockDriverCompletionFunc *cb,
> +                                         void *opaque)
> +{
> +    BDRVQuorumState *s = bs->opaque;
> +    QuorumAIOCB *acb = quorum_aio_get(s, bs, qiov, sector_num,
> +                                      nb_sectors, cb, opaque);
> +    int i;
> +
> +    for (i = 0; i < s->m; i++) {
> +        acb->aios[i].buf = qemu_blockalign(bs->file, qiov->size);
> +        qemu_iovec_init(&acb->qiovs[i], qiov->niov);
> +        qemu_iovec_clone(&acb->qiovs[i], qiov, acb->aios[i].buf);
> +    }

Need to call qemu_iovec_destroy() to free &acb->qiovs[i] iovecs.

Stefan

Patch

diff --git a/block/quorum.c b/block/quorum.c
index 86962b4..8b449fb 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -190,10 +190,16 @@  static void quorum_aio_bh(void *opaque)
 {
     QuorumAIOCB *acb = opaque;
     BDRVQuorumState *s = acb->bqs;
-    int ret;
+    int i, ret;
 
     ret = s->n <= acb->success_count ? 0 : -EIO;
 
+    for (i = 0; i < s->m; i++) {
+        qemu_vfree(acb->aios[i].buf);
+        acb->aios[i].buf = NULL;
+        acb->aios[i].ret = 0;
+    }
+
     qemu_bh_delete(acb->bh);
     acb->common.cb(acb->common.opaque, ret);
     if (acb->finished) {
@@ -258,6 +264,32 @@  static void quorum_aio_cb(void *opaque, int ret)
     qemu_bh_schedule(acb->bh);
 }
 
+static BlockDriverAIOCB *quorum_aio_readv(BlockDriverState *bs,
+                                         int64_t sector_num,
+                                         QEMUIOVector *qiov,
+                                         int nb_sectors,
+                                         BlockDriverCompletionFunc *cb,
+                                         void *opaque)
+{
+    BDRVQuorumState *s = bs->opaque;
+    QuorumAIOCB *acb = quorum_aio_get(s, bs, qiov, sector_num,
+                                      nb_sectors, cb, opaque);
+    int i;
+
+    for (i = 0; i < s->m; i++) {
+        acb->aios[i].buf = qemu_blockalign(bs->file, qiov->size);
+        qemu_iovec_init(&acb->qiovs[i], qiov->niov);
+        qemu_iovec_clone(&acb->qiovs[i], qiov, acb->aios[i].buf);
+    }
+
+    for (i = 0; i < s->m; i++) {
+        bdrv_aio_readv(s->bs[i], sector_num, qiov, nb_sectors,
+                       quorum_aio_cb, &acb->aios[i]);
+    }
+
+    return &acb->common;
+}
+
 static BlockDriverAIOCB *quorum_aio_writev(BlockDriverState *bs,
                                           int64_t sector_num,
                                           QEMUIOVector *qiov,
@@ -306,6 +338,7 @@  static BlockDriver bdrv_quorum = {
     .bdrv_close         = quorum_close,
     .bdrv_co_flush_to_disk = quorum_co_flush,
 
+    .bdrv_aio_readv     = quorum_aio_readv,
     .bdrv_aio_writev    = quorum_aio_writev,
 };