From patchwork Tue Sep 17 13:48:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 275468 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB55B2C00C5 for ; Tue, 17 Sep 2013 23:54:25 +1000 (EST) Received: from localhost ([::1]:41303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvjT-0002oM-P9 for incoming@patchwork.ozlabs.org; Tue, 17 Sep 2013 09:54:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvfp-0005a2-Nu for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:50:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLvfh-0001iY-FI for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:50:37 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:37119 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvfh-0001iF-3m for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:50:29 -0400 Received: (qmail 23310 invoked by uid 89); 17 Sep 2013 13:50:28 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.97.8/17868. hbedv: 8.2.12.120/7.11.102.228. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 13.062005 secs); 17 Sep 2013 13:50:28 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 17 Sep 2013 13:50:14 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id BBB65206AA; Tue, 17 Sep 2013 15:49:14 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 44CE55FA22; Tue, 17 Sep 2013 15:49:15 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 17 Sep 2013 15:48:40 +0200 Message-Id: <1379425736-11326-5-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1379425736-11326-1-git-send-email-pl@kamp.de> References: <1379425736-11326-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv2 04/20] block: introduce bdrv_has_discard_zeroes and bdrv_has_discard_write_zeroes 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 Signed-off-by: Peter Lieven Reviewed-by: Eric Blake --- block.c | 29 +++++++++++++++++++++++++++++ include/block/block.h | 2 ++ include/block/block_int.h | 13 +++++++++++++ 3 files changed, 44 insertions(+) diff --git a/block.c b/block.c index 6f498fc..177720e 100644 --- a/block.c +++ b/block.c @@ -3045,6 +3045,35 @@ int bdrv_has_zero_init(BlockDriverState *bs) return 0; } +int bdrv_has_discard_zeroes(BlockDriverState *bs) +{ + assert(bs->drv); + + if (bs->backing_hd) { + return 0; + } + if (bs->drv->bdrv_has_discard_zeroes) { + return bs->drv->bdrv_has_discard_zeroes(bs); + } + + return 0; +} + +int bdrv_has_discard_write_zeroes(BlockDriverState *bs) +{ + assert(bs->drv); + + if (bs->backing_hd || !(bs->open_flags & BDRV_O_UNMAP)) { + return 0; + } + + if (bs->drv->bdrv_has_discard_write_zeroes) { + return bs->drv->bdrv_has_discard_write_zeroes(bs); + } + + return 0; +} + typedef struct BdrvCoGetBlockStatusData { BlockDriverState *bs; BlockDriverState *base; diff --git a/include/block/block.h b/include/block/block.h index 0328234..8aa325a 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -307,6 +307,8 @@ int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); int bdrv_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); int bdrv_has_zero_init_1(BlockDriverState *bs); int bdrv_has_zero_init(BlockDriverState *bs); +int bdrv_has_discard_zeroes(BlockDriverState *bs); +int bdrv_has_discard_write_zeroes(BlockDriverState *bs); int64_t bdrv_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum); int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, diff --git a/include/block/block_int.h b/include/block/block_int.h index 26bad36..85c3474 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -202,6 +202,19 @@ struct BlockDriver { */ int (*bdrv_has_zero_init)(BlockDriverState *bs); + /* + * Returns 1 if discarded blocks read back as zeroes, 0 otherwise. + */ + int (*bdrv_has_discard_zeroes)(BlockDriverState *bs); + + /* + * Returns 1 if the driver can optimize writing zeroes by discarding + * sectors. It is additionally required that the block device is + * opened with BDRV_O_UNMAP and the that write zeroes request carries + * the BDRV_REQ_MAY_UNMAP flag for this to work. + */ + int (*bdrv_has_discard_write_zeroes)(BlockDriverState *bs); + QLIST_ENTRY(BlockDriver) list; };