From patchwork Wed Feb 17 15:08:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 8340131 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EBA45C0553 for ; Wed, 17 Feb 2016 15:08:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50C17202AE for ; Wed, 17 Feb 2016 15:08:35 +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 37E9B203AB for ; Wed, 17 Feb 2016 15:08:34 +0000 (UTC) Received: from localhost ([::1]:58435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW3iT-0005cN-Ht for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Feb 2016 10:08:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW3iL-0005c1-VY for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:08:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW3iH-00039B-VR for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:08:25 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:41981 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW3iH-00037C-JG for qemu-devel@nongnu.org; Wed, 17 Feb 2016 10:08:21 -0500 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HF8Bjd018751; Wed, 17 Feb 2016 18:08:12 +0300 (MSK) From: "Denis V. Lunev" To: Date: Wed, 17 Feb 2016 18:08:11 +0300 Message-Id: <1455721691-14802-1-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.5.0 X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: "Denis V. Lunev" , qemu-devel@nongnu.org, Paolo Bonzini Subject: [Qemu-devel] [PATCH 1/1] nbd: fix block-mirror NBD target 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable 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 There is VM with 8 GB QCOW2 storage. Real size of the image file is 2 GB. 'drive-mirror' redirected to NBD target creates 8 GB image at destination. The situation is even worse as zeroes are sent through the channel. The patch simply adds .bdrv_co_write_zeroes callback to NBD block driver which works though NBD_TRIM to avoid transfer of zeroes. Signed-off-by: Denis V. Lunev CC: Paolo Bonzini --- block/nbd-client.c | 10 ++++++++++ block/nbd-client.h | 2 ++ block/nbd.c | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/block/nbd-client.c b/block/nbd-client.c index 568c56c..ef0c5e8 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -344,7 +344,17 @@ int nbd_client_co_discard(BlockDriverState *bs, int64_t sector_num, } nbd_coroutine_end(client, &request); return -reply.error; +} + +int nbd_client_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, BdrvRequestFlags flags) +{ + NbdClientSession *client = nbd_get_client_session(bs); + if (!(client->nbdflags & NBD_FLAG_SEND_TRIM)) { + return -ENOTSUP; + } + return nbd_client_co_discard(bs, sector_num, nb_sectors); } void nbd_client_detach_aio_context(BlockDriverState *bs) diff --git a/block/nbd-client.h b/block/nbd-client.h index e841340..aaef18d 100644 --- a/block/nbd-client.h +++ b/block/nbd-client.h @@ -40,6 +40,8 @@ void nbd_client_close(BlockDriverState *bs); int nbd_client_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors); +int nbd_client_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, BdrvRequestFlags flags); int nbd_client_co_flush(BlockDriverState *bs); int nbd_client_co_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); diff --git a/block/nbd.c b/block/nbd.c index 1a90bc7..8b05480 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -318,6 +318,13 @@ static int nbd_co_discard(BlockDriverState *bs, int64_t sector_num, return nbd_client_co_discard(bs, sector_num, nb_sectors); } +static coroutine_fn int nbd_co_write_zeroes(BlockDriverState *bs, + int64_t sector_num, int nb_sectors, BdrvRequestFlags flags) +{ + return nbd_client_co_write_zeroes(bs, sector_num, nb_sectors, flags); +} + + static void nbd_close(BlockDriverState *bs) { nbd_client_close(bs); @@ -415,6 +422,7 @@ static BlockDriver bdrv_nbd_tcp = { .bdrv_close = nbd_close, .bdrv_co_flush_to_os = nbd_co_flush, .bdrv_co_discard = nbd_co_discard, + .bdrv_co_write_zeroes = nbd_co_write_zeroes, .bdrv_refresh_limits = nbd_refresh_limits, .bdrv_getlength = nbd_getlength, .bdrv_detach_aio_context = nbd_detach_aio_context, @@ -433,6 +441,7 @@ static BlockDriver bdrv_nbd_unix = { .bdrv_close = nbd_close, .bdrv_co_flush_to_os = nbd_co_flush, .bdrv_co_discard = nbd_co_discard, + .bdrv_co_write_zeroes = nbd_co_write_zeroes, .bdrv_refresh_limits = nbd_refresh_limits, .bdrv_getlength = nbd_getlength, .bdrv_detach_aio_context = nbd_detach_aio_context,