{"id":806823,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806823/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1503965694-10794-23-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:13:57","name":"[22/79] qemu-img: wait for convert coroutines to complete","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ba0ff81b6c692794e5514e4fd5bb79d6cfb40c56","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-23-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806823/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh8c21r9Wz9s65\n\tfor ;\n\tTue, 29 Aug 2017 10:27:46 +1000 (AEST)","from localhost ([::1]:41940 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmUNc-000346-3P\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:27:44 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47628)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCF-0000yq-L7\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:01 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCC-0005DU-M7\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:59 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51083)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCC-0005Ca-BQ\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:56 -0400","from pps.filterd (m0098393.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0Eesg078680\n\tfor ; Mon, 28 Aug 2017 20:15:55 -0400","from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cmnx0yuma-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:15:55 -0400","from localhost\n\tby e15.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 20:15:53 -0400","from b01cxnp23034.gho.pok.ibm.com (9.57.198.29)\n\tby e15.ny.us.ibm.com (146.89.104.202) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 20:15:51 -0400","from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com\n\t[9.57.199.110])\n\tby b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP\n\tid v7T0FphI25362440; Tue, 29 Aug 2017 00:15:51 GMT","from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id C3349AE043;\n\tMon, 28 Aug 2017 20:16:14 -0400 (EDT)","from localhost (unknown [9.80.85.217])\n\tby b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id 8BBB3AE057;\n\tMon, 28 Aug 2017 20:16:14 -0400 (EDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:13:57 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0036-0000-0000-000002603F49","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909027; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:15:52","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0037-0000-0000-000041964A31","Message-Id":"<1503965694-10794-23-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.156.1","Subject":"[Qemu-devel] [PATCH 22/79] qemu-img: wait for convert coroutines to\n\tcomplete","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Wolf ,\n\tAnton Nefedov , qemu-stable@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Anton Nefedov \n\nOn error path (like i/o error in one of the coroutines), it's required to\n - wait for coroutines completion before cleaning the common structures\n - reenter dependent coroutines so they ever finish\n\nIntroduced in 2d9187bc65.\n\nCc: qemu-stable@nongnu.org\nSigned-off-by: Anton Nefedov \nReviewed-by: Peter Lieven \nSigned-off-by: Kevin Wolf \n(cherry picked from commit b91127edd0ff96f27f1e58e47f4e9f9d6a0fed02)\nSigned-off-by: Michael Roth \n---\n qemu-img.c | 26 +++++++++++---------------\n 1 file changed, 11 insertions(+), 15 deletions(-)","diff":"diff --git a/qemu-img.c b/qemu-img.c\nindex 2e61561..26ded22 100644\n--- a/qemu-img.c\n+++ b/qemu-img.c\n@@ -1761,13 +1761,13 @@ static void coroutine_fn convert_co_do_copy(void *opaque)\n qemu_co_mutex_lock(&s->lock);\n if (s->ret != -EINPROGRESS || s->sector_num >= s->total_sectors) {\n qemu_co_mutex_unlock(&s->lock);\n- goto out;\n+ break;\n }\n n = convert_iteration_sectors(s, s->sector_num);\n if (n < 0) {\n qemu_co_mutex_unlock(&s->lock);\n s->ret = n;\n- goto out;\n+ break;\n }\n /* save current sector and allocation status to local variables */\n sector_num = s->sector_num;\n@@ -1792,7 +1792,6 @@ static void coroutine_fn convert_co_do_copy(void *opaque)\n error_report(\"error while reading sector %\" PRId64\n \": %s\", sector_num, strerror(-ret));\n s->ret = ret;\n- goto out;\n }\n } else if (!s->min_sparse && status == BLK_ZERO) {\n status = BLK_DATA;\n@@ -1801,22 +1800,20 @@ static void coroutine_fn convert_co_do_copy(void *opaque)\n \n if (s->wr_in_order) {\n /* keep writes in order */\n- while (s->wr_offs != sector_num) {\n- if (s->ret != -EINPROGRESS) {\n- goto out;\n- }\n+ while (s->wr_offs != sector_num && s->ret == -EINPROGRESS) {\n s->wait_sector_num[index] = sector_num;\n qemu_coroutine_yield();\n }\n s->wait_sector_num[index] = -1;\n }\n \n- ret = convert_co_write(s, sector_num, n, buf, status);\n- if (ret < 0) {\n- error_report(\"error while writing sector %\" PRId64\n- \": %s\", sector_num, strerror(-ret));\n- s->ret = ret;\n- goto out;\n+ if (s->ret == -EINPROGRESS) {\n+ ret = convert_co_write(s, sector_num, n, buf, status);\n+ if (ret < 0) {\n+ error_report(\"error while writing sector %\" PRId64\n+ \": %s\", sector_num, strerror(-ret));\n+ s->ret = ret;\n+ }\n }\n \n if (s->wr_in_order) {\n@@ -1837,7 +1834,6 @@ static void coroutine_fn convert_co_do_copy(void *opaque)\n }\n }\n \n-out:\n qemu_vfree(buf);\n s->co[index] = NULL;\n s->running_coroutines--;\n@@ -1899,7 +1895,7 @@ static int convert_do_copy(ImgConvertState *s)\n qemu_coroutine_enter(s->co[i]);\n }\n \n- while (s->ret == -EINPROGRESS) {\n+ while (s->running_coroutines) {\n main_loop_wait(false);\n }\n \n","prefixes":["22/79"]}