From 02e6c183afd2203aaf1910a0150e54cf1c8efa3e Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Fri, 26 May 2017 15:28:54 +0200

Subject: [PATCH 5/6] qemu-img: wait for convert coroutines to complete

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <1495812534-25595-2-git-send-email-kwolf@redhat.com>

Patchwork-id: 75425

O-Subject: [RHEL-7.4 qemu-kvm-rhev PATCH] qemu-img: wait for convert coroutines to complete

Bugzilla: 1451849

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

From: Anton Nefedov <anton.nefedov@virtuozzo.com>

On error path (like i/o error in one of the coroutines), it's required to

  - wait for coroutines completion before cleaning the common structures

  - reenter dependent coroutines so they ever finish

Introduced in 2d9187bc65.

Cc: qemu-stable@nongnu.org

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>

Reviewed-by: Peter Lieven <pl@kamp.de>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit b91127edd0ff96f27f1e58e47f4e9f9d6a0fed02)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 qemu-img.c | 26 +++++++++++---------------

 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

index 37c2894..53d0bf1 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -1761,13 +1761,13 @@ static void coroutine_fn convert_co_do_copy(void *opaque)

         qemu_co_mutex_lock(&s->lock);

         if (s->ret != -EINPROGRESS || s->sector_num >= s->total_sectors) {

             qemu_co_mutex_unlock(&s->lock);

-            goto out;

+            break;

         }

         n = convert_iteration_sectors(s, s->sector_num);

         if (n < 0) {

             qemu_co_mutex_unlock(&s->lock);

             s->ret = n;

-            goto out;

+            break;

         }

         /* save current sector and allocation status to local variables */

         sector_num = s->sector_num;

@@ -1792,7 +1792,6 @@ static void coroutine_fn convert_co_do_copy(void *opaque)

                 error_report("error while reading sector %" PRId64

                              ": %s", sector_num, strerror(-ret));

                 s->ret = ret;

-                goto out;

             }

         } else if (!s->min_sparse && status == BLK_ZERO) {

             status = BLK_DATA;

@@ -1801,22 +1800,20 @@ static void coroutine_fn convert_co_do_copy(void *opaque)

         if (s->wr_in_order) {

             /* keep writes in order */

-            while (s->wr_offs != sector_num) {

-                if (s->ret != -EINPROGRESS) {

-                    goto out;

-                }

+            while (s->wr_offs != sector_num && s->ret == -EINPROGRESS) {

                 s->wait_sector_num[index] = sector_num;

                 qemu_coroutine_yield();

             }

             s->wait_sector_num[index] = -1;

         }

-        ret = convert_co_write(s, sector_num, n, buf, status);

-        if (ret < 0) {

-            error_report("error while writing sector %" PRId64

-                         ": %s", sector_num, strerror(-ret));

-            s->ret = ret;

-            goto out;

+        if (s->ret == -EINPROGRESS) {

+            ret = convert_co_write(s, sector_num, n, buf, status);

+            if (ret < 0) {

+                error_report("error while writing sector %" PRId64

+                             ": %s", sector_num, strerror(-ret));

+                s->ret = ret;

+            }

         }

         if (s->wr_in_order) {

@@ -1837,7 +1834,6 @@ static void coroutine_fn convert_co_do_copy(void *opaque)

         }

     }

-out:

     qemu_vfree(buf);

     s->co[index] = NULL;

     s->running_coroutines--;

@@ -1899,7 +1895,7 @@ static int convert_do_copy(ImgConvertState *s)

         qemu_coroutine_enter(s->co[i]);

     }

-    while (s->ret == -EINPROGRESS) {

+    while (s->running_coroutines) {

         main_loop_wait(false);

     }

-- 

1.8.3.1