From patchwork Mon Oct 26 06:24:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 535707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A06AE141352 for ; Mon, 26 Oct 2015 17:28:54 +1100 (AEDT) Received: from localhost ([::1]:50810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqbH2-0005KL-7v for incoming@patchwork.ozlabs.org; Mon, 26 Oct 2015 02:28:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqbDr-0007PP-KD for qemu-devel@nongnu.org; Mon, 26 Oct 2015 02:25:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqbDq-00059t-Ll for qemu-devel@nongnu.org; Mon, 26 Oct 2015 02:25:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44498) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqbDm-00058b-HY; Mon, 26 Oct 2015 02:25:30 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3835AC0AEE25; Mon, 26 Oct 2015 06:25:30 +0000 (UTC) Received: from fam-t430.redhat.com (vpn1-5-100.pek2.redhat.com [10.72.5.100]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9Q6OsvK028842; Mon, 26 Oct 2015 02:25:21 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 26 Oct 2015 14:24:47 +0800 Message-Id: <1445840693-3177-4-git-send-email-famz@redhat.com> In-Reply-To: <1445840693-3177-1-git-send-email-famz@redhat.com> References: <1445840693-3177-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Peter Lieven , Ronnie Sahlberg , Paolo Bonzini Subject: [Qemu-devel] [PATCH 3/9] block: Track discard 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 Both bdrv_discard and bdrv_aio_discard will call into bdrv_co_discard, so add tracked_request_begin/end calls around the loop. Signed-off-by: Fam Zheng --- block/io.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/block/io.c b/block/io.c index 223c4e9..abb3aaa 100644 --- a/block/io.c +++ b/block/io.c @@ -2415,7 +2415,8 @@ static void coroutine_fn bdrv_discard_co_entry(void *opaque) int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) { - int max_discard, ret; + BdrvTrackedRequest req; + int max_discard, ret = 0; if (!bs->drv) { return -ENOMEDIUM; @@ -2437,6 +2438,8 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, return 0; } + tracked_request_begin(&req, bs, sector_num, nb_sectors, + BDRV_TRACKED_DISCARD); bdrv_set_dirty(bs, sector_num, nb_sectors); max_discard = MIN_NON_ZERO(bs->bl.max_discard, BDRV_REQUEST_MAX_SECTORS); @@ -2470,20 +2473,23 @@ int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, acb = bs->drv->bdrv_aio_discard(bs, sector_num, nb_sectors, bdrv_co_io_em_complete, &co); if (acb == NULL) { - return -EIO; + ret = -EIO; + goto out; } else { qemu_coroutine_yield(); ret = co.ret; } } if (ret && ret != -ENOTSUP) { - return ret; + goto out; } sector_num += num; nb_sectors -= num; } - return 0; +out: + tracked_request_end(&req); + return ret; } int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors)