{"id":813568,"url":"http://patchwork.ozlabs.org/api/patches/813568/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-15-mreitz@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170913181910.29688-15-mreitz@redhat.com>","list_archive_url":null,"date":"2017-09-13T18:19:06","name":"[14/18] block/mirror: Distinguish active from passive ops","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b8f7f0083cf1a0e845441812bc602f86ff7cf3dd","submitter":{"id":36836,"url":"http://patchwork.ozlabs.org/api/people/36836/?format=json","name":"Max Reitz","email":"mreitz@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-15-mreitz@redhat.com/mbox/","series":[{"id":2960,"url":"http://patchwork.ozlabs.org/api/series/2960/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2960","date":"2017-09-13T18:18:52","name":"block/mirror: Add active-sync mirroring","version":1,"mbox":"http://patchwork.ozlabs.org/series/2960/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813568/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813568/checks/","tags":{},"related":[],"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=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mreitz@redhat.com"],"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 3xsqw31tS2z9s3T\n\tfor ;\n\tThu, 14 Sep 2017 04:30:10 +1000 (AEST)","from localhost ([::1]:44042 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsCQK-0008Iw-UN\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 14:30:08 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37635)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsCIC-0000zr-Ey\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:21:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsCIB-0006PQ-J4\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:21:44 -0400","from mx1.redhat.com ([209.132.183.28]:42848)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dsCI7-0006HL-Um; Wed, 13 Sep 2017 14:21:40 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0E5EBC058EAF;\n\tWed, 13 Sep 2017 18:21:39 +0000 (UTC)","from localhost (ovpn-204-23.brq.redhat.com [10.40.204.23])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 8915C18787;\n\tWed, 13 Sep 2017 18:21:28 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0E5EBC058EAF","From":"Max Reitz ","To":"qemu-block@nongnu.org","Date":"Wed, 13 Sep 2017 20:19:06 +0200","Message-Id":"<20170913181910.29688-15-mreitz@redhat.com>","In-Reply-To":"<20170913181910.29688-1-mreitz@redhat.com>","References":"<20170913181910.29688-1-mreitz@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tWed, 13 Sep 2017 18:21:39 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 14/18] block/mirror: Distinguish active from\n\tpassive ops","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 , Fam Zheng ,\n\tqemu-devel@nongnu.org, Max Reitz ,\n\tStefan Hajnoczi , John Snow ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Currently, the mirror block job only knows passive operations. But once\nwe introduce active writes, we need to distinguish between the two; for\nexample, mirror_wait_for_free_in_flight_slot() should wait for a passive\noperation because active writes will not use the same in-flight slots.\n\nSigned-off-by: Max Reitz \n---\n block/mirror.c | 12 +++++++++---\n 1 file changed, 9 insertions(+), 3 deletions(-)","diff":"diff --git a/block/mirror.c b/block/mirror.c\nindex 612fab660e..8fea619a68 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -96,6 +96,7 @@ struct MirrorOp {\n /* Set by mirror_co_read() before yielding for the first time */\n uint64_t bytes_copied;\n \n+ bool is_active_write;\n CoQueue waiting_requests;\n \n QTAILQ_ENTRY(MirrorOp) next;\n@@ -286,9 +287,14 @@ static inline void mirror_wait_for_free_in_flight_slot(MirrorBlockJob *s)\n {\n MirrorOp *op;\n \n- op = QTAILQ_FIRST(&s->ops_in_flight);\n- assert(op);\n- qemu_co_queue_wait(&op->waiting_requests, NULL);\n+ QTAILQ_FOREACH(op, &s->ops_in_flight, next) {\n+ if (!op->is_active_write) {\n+ /* Only non-active operations use up in-flight slots */\n+ qemu_co_queue_wait(&op->waiting_requests, NULL);\n+ return;\n+ }\n+ }\n+ abort();\n }\n \n /* Submit async read while handling COW.\n","prefixes":["14/18"]}