From patchwork Mon Mar 12 06:29:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 146040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BCAE9B6FA7 for ; Mon, 12 Mar 2012 17:29:31 +1100 (EST) Received: from localhost ([::1]:42086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6yl7-0006aF-Fm for incoming@patchwork.ozlabs.org; Mon, 12 Mar 2012 02:29:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6yl0-0006a6-Oy for qemu-devel@nongnu.org; Mon, 12 Mar 2012 02:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S6yky-0006do-W5 for qemu-devel@nongnu.org; Mon, 12 Mar 2012 02:29:22 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:40163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S6yky-0006da-Pm for qemu-devel@nongnu.org; Mon, 12 Mar 2012 02:29:20 -0400 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 12 Mar 2012 00:29:16 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 12 Mar 2012 00:29:11 -0600 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 6FB3A1FF0038 for ; Mon, 12 Mar 2012 00:29:10 -0600 (MDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2C6TAbH246620 for ; Mon, 12 Mar 2012 00:29:10 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2C6T9gn028736 for ; Mon, 12 Mar 2012 00:29:10 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q2C6T6OO028642; Mon, 12 Mar 2012 00:29:07 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Mon, 12 Mar 2012 14:29:05 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2012 14:29:04 +0800 Message-Id: <1331533744-15802-1-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12031206-1780-0000-0000-000003E4B2D4 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000256; HX=3.00000185; KW=3.00000007; PH=3.00000001; SC=3.00000001; SDB=6.00121291; UDB=6.00029252; UTC=2012-03-12 06:29:15 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.152 Cc: kwolf@redhat.com, pbonzini@redhat.com, Zhi Yong Wu , zwu.kernel@gmail.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 1/2] block: add the support to drain throttled requests 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- block.c | 21 +++++++++++++++++++++ block_int.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 52ffe14..0825168 100644 --- a/block.c +++ b/block.c @@ -853,6 +853,21 @@ void bdrv_close_all(void) } } +/** + * Complete all pending requests for a block device + */ +void bdrv_drain(BlockDriverState *bs) +{ + do { + qemu_co_queue_restart_all(&bs->throttled_reqs); + } while (!qemu_co_queue_empty(&bs->throttled_reqs)); + + qemu_aio_flush(); + + assert(QLIST_EMPTY(&bs->tracked_requests)); + assert(qemu_co_queue_empty(&bs->throttled_reqs)); +} + /* * Wait for pending requests to complete across all BlockDriverStates * @@ -863,6 +878,12 @@ void bdrv_drain_all(void) { BlockDriverState *bs; + QTAILQ_FOREACH(bs, &bdrv_states, list) { + do { + qemu_co_queue_restart_all(&bs->throttled_reqs); + } while (!qemu_co_queue_empty(&bs->throttled_reqs)); + } + qemu_aio_flush(); /* If requests are still pending there is a bug somewhere */ diff --git a/block_int.h b/block_int.h index b460c36..c624399 100644 --- a/block_int.h +++ b/block_int.h @@ -318,6 +318,7 @@ void qemu_aio_release(void *p); void bdrv_set_io_limits(BlockDriverState *bs, BlockIOLimit *io_limits); +void bdrv_drain(BlockDriverState *bs); #ifdef _WIN32 int is_windows_drive(const char *filename);