From patchwork Thu Apr 7 16:33:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8774851 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8AD519FC82 for ; Thu, 7 Apr 2016 16:35:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E23FF201EC for ; Thu, 7 Apr 2016 16:35:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 41E9F20155 for ; Thu, 7 Apr 2016 16:35:29 +0000 (UTC) Received: from localhost ([::1]:51311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoCu0-0004F2-KJ for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Apr 2016 12:35:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoCsL-0001JV-Uk for qemu-devel@nongnu.org; Thu, 07 Apr 2016 12:33:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoCsK-0005kG-V1 for qemu-devel@nongnu.org; Thu, 07 Apr 2016 12:33:45 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoCsK-0005k4-Ny; Thu, 07 Apr 2016 12:33:44 -0400 Received: by mail-wm0-x243.google.com with SMTP id l6so5684398wml.3; Thu, 07 Apr 2016 09:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZkUQYQR/MsHu/P2qgBSTWedBfvCKx1Jse+pDuoU70sI=; b=sE/pChWEZvFcQMTwJlYGoRkwT1Qot1sy76xXzou0vHyMQhAE9aArxmW37tWoyCm7SM JyHAfbRCUg8jG9B+6RH3HtBF+hnq/CQ7Vwe+lwNGTxNu6HdT7nnZqx6KVOELQRsnF3Rs 2/Xnsxy2F4QxWOHKNAJXbEF2uqQi2V4QAvvB6qc5lsgoitdmD37N4sSgxYDLlzM+mKpZ Ii/3u948rDn9LAQytfhfuLSSy6O4+iuHRiw2D78R/ziDz4yg/3iGAcmP69k+fOOXCmN9 n37YErCERh8w4TXygeMXakUodMi6wtXAGkhmpxEVuhdndxHttfrVNvIYuZJ1dYagjOqm 1NDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ZkUQYQR/MsHu/P2qgBSTWedBfvCKx1Jse+pDuoU70sI=; b=ir9m3aGCWYsxJnbDaST3IDFCeG/njBgDsbi0zUev4EJry+i34baBTqjnk6APg3SIQR Bg6/y63sDy46mAajKi0JOlbBLNsM5jKSglzCdGcWCgbZwdXzjazOrSdztgAsafnEP9F6 OSORTT94SDR+s/csEiBLmVcPkX5LIvAhx7UNLvu46I8srZPewIIWEeApXJo6jV4Yj7Wz 2aDFTowncUx1nHyFw70OWuODCXgzwREYAy5TkPGUw0F42tYrxmDsyFWPQMzwBrX4jJH5 66iPgB6CKJ2UCvK+Ec3rP0Woh6nGeET5TKRU0kWlgmAUGlxV76TcKdP73u4BZVrjggGN CGUA== X-Gm-Message-State: AD7BkJImAUcHVgmw9Vbr4BZaJA8lZhKS266C/SiLFzH8D7td72qI6P3FAjeWoFqoGv0Qvg== X-Received: by 10.194.158.226 with SMTP id wx2mr4442332wjb.91.1460046824083; Thu, 07 Apr 2016 09:33:44 -0700 (PDT) Received: from 640k.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id hh8sm9218862wjc.42.2016.04.07.09.33.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Apr 2016 09:33:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Apr 2016 18:33:32 +0200 Message-Id: <1460046816-102846-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1460046816-102846-1-git-send-email-pbonzini@redhat.com> References: <1460046816-102846-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Cc: kwolf@redhat.com, berto@igalia.com, famz@redhat.com, qemu-block@nongnu.org, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v4 4/8] block: extract bdrv_drain_poll/bdrv_co_yield_to_drain from bdrv_drain/bdrv_co_drain X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Do not call bdrv_drain_recurse twice in bdrv_co_drain. A small tweak to the logic in Fam's patch, which is harmless since no one implements bdrv_drain anyway. But better get it right. Signed-off-by: Paolo Bonzini --- v4: new block/io.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/block/io.c b/block/io.c index 9201b89..15bc956 100644 --- a/block/io.c +++ b/block/io.c @@ -243,18 +243,30 @@ typedef struct { bool done; } BdrvCoDrainData; +static void bdrv_drain_poll(BlockDriverState *bs) +{ + bool busy = true; + + while (busy) { + /* Keep iterating */ + bdrv_flush_io_queue(bs); + busy = bdrv_requests_pending(bs); + busy |= aio_poll(bdrv_get_aio_context(bs), busy); + } +} + static void bdrv_co_drain_bh_cb(void *opaque) { BdrvCoDrainData *data = opaque; Coroutine *co = data->co; qemu_bh_delete(data->bh); - bdrv_drain(data->bs); + bdrv_drain_poll(data->bs); data->done = true; qemu_coroutine_enter(co, NULL); } -void coroutine_fn bdrv_co_drain(BlockDriverState *bs) +static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs) { BdrvCoDrainData data; @@ -288,20 +300,19 @@ void coroutine_fn bdrv_co_drain(BlockDriverState *bs) * not depend on events in other AioContexts. In that case, use * bdrv_drain_all() instead. */ -void bdrv_drain(BlockDriverState *bs) +void coroutine_fn bdrv_co_drain(BlockDriverState *bs) { - bool busy = true; + bdrv_drain_recurse(bs); + bdrv_co_yield_to_drain(bs); +} +void bdrv_drain(BlockDriverState *bs) +{ bdrv_drain_recurse(bs); if (qemu_in_coroutine()) { - bdrv_co_drain(bs); - return; - } - while (busy) { - /* Keep iterating */ - bdrv_flush_io_queue(bs); - busy = bdrv_requests_pending(bs); - busy |= aio_poll(bdrv_get_aio_context(bs), busy); + bdrv_co_yield_to_drain(bs); + } else { + bdrv_drain_poll(bs); } }