From patchwork Thu Oct 24 10:06:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 285857 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 492412C00E0 for ; Thu, 24 Oct 2013 21:09:07 +1100 (EST) Received: from localhost ([::1]:53597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZHqi-0001TJ-AB for incoming@patchwork.ozlabs.org; Thu, 24 Oct 2013 06:09:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZHpz-0001Mt-NJ for qemu-devel@nongnu.org; Thu, 24 Oct 2013 06:08:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZHpt-0005hw-Qh for qemu-devel@nongnu.org; Thu, 24 Oct 2013 06:08:19 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:47265 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZHpt-0005hh-FZ for qemu-devel@nongnu.org; Thu, 24 Oct 2013 06:08:13 -0400 Received: (qmail 30657 invoked by uid 89); 24 Oct 2013 10:08:12 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/18001. hbedv: 8.2.12.132/7.11.109.62. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 10.396173 secs); 24 Oct 2013 10:08:12 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 24 Oct 2013 10:08:01 -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 B62E2206AA; Thu, 24 Oct 2013 12:07:11 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 3C889613A5; Thu, 24 Oct 2013 12:07:17 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Thu, 24 Oct 2013 12:06:52 +0200 Message-Id: <1382609227-23989-4-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1382609227-23989-1-git-send-email-pl@kamp.de> References: <1382609227-23989-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, stefanha@redhat.com, Peter Lieven , ronniesahlberg@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv7 03/17] block: introduce BDRV_REQ_MAY_UNMAP request flag 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 Reviewed-by: Eric Blake Signed-off-by: Peter Lieven --- block-migration.c | 3 ++- block.c | 4 ++++ block/backup.c | 2 +- include/block/block.h | 7 +++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/block-migration.c b/block-migration.c index 713a8e3..fc4ef93 100644 --- a/block-migration.c +++ b/block-migration.c @@ -780,7 +780,8 @@ static int block_load(QEMUFile *f, void *opaque, int version_id) } if (flags & BLK_MIG_FLAG_ZERO_BLOCK) { - ret = bdrv_write_zeroes(bs, addr, nr_sectors, 0); + ret = bdrv_write_zeroes(bs, addr, nr_sectors, + BDRV_REQ_MAY_UNMAP); } else { buf = g_malloc(BLOCK_SIZE); qemu_get_buffer(f, buf, BLOCK_SIZE); diff --git a/block.c b/block.c index 3259429..0d97ce6 100644 --- a/block.c +++ b/block.c @@ -2810,6 +2810,10 @@ int coroutine_fn bdrv_co_write_zeroes(BlockDriverState *bs, { trace_bdrv_co_write_zeroes(bs, sector_num, nb_sectors); + if (!(bs->open_flags & BDRV_O_UNMAP)) { + flags &= ~BDRV_REQ_MAY_UNMAP; + } + return bdrv_co_do_writev(bs, sector_num, nb_sectors, NULL, BDRV_REQ_ZERO_WRITE | flags); } diff --git a/block/backup.c b/block/backup.c index 830a179..0198514 100644 --- a/block/backup.c +++ b/block/backup.c @@ -139,7 +139,7 @@ static int coroutine_fn backup_do_cow(BlockDriverState *bs, if (buffer_is_zero(iov.iov_base, iov.iov_len)) { ret = bdrv_co_write_zeroes(job->target, start * BACKUP_SECTORS_PER_CLUSTER, - n, 0); + n, BDRV_REQ_MAY_UNMAP); } else { ret = bdrv_co_writev(job->target, start * BACKUP_SECTORS_PER_CLUSTER, n, diff --git a/include/block/block.h b/include/block/block.h index 8ba9f0c..1f30a56 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -65,6 +65,13 @@ typedef struct BlockDevOps { typedef enum { BDRV_REQ_COPY_ON_READ = 0x1, BDRV_REQ_ZERO_WRITE = 0x2, + /* The BDRV_REQ_MAY_UNMAP flag is used to indicate that the block driver + * is allowed to optimize a write zeroes request by unmapping (discarding) + * blocks if it is guaranteed that the result will read back as + * zeroes. The flag is only passed to the driver if the block device is + * opened with BDRV_O_UNMAP. + */ + BDRV_REQ_MAY_UNMAP = 0x4, } BdrvRequestFlags; #define BDRV_O_RDWR 0x0002