From patchwork Wed Jan 28 18:38:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 433910 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 7F455140161 for ; Thu, 29 Jan 2015 05:40:25 +1100 (AEDT) Received: from localhost ([::1]:55382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGXXL-0001Cj-Es for incoming@patchwork.ozlabs.org; Wed, 28 Jan 2015 13:40:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGXWl-00004z-0C for qemu-devel@nongnu.org; Wed, 28 Jan 2015 13:39:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGXWj-0008R9-9C for qemu-devel@nongnu.org; Wed, 28 Jan 2015 13:39:46 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:47809 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGXWi-0008L8-UY for qemu-devel@nongnu.org; Wed, 28 Jan 2015 13:39:45 -0500 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t0SIcvLF017996; Wed, 28 Jan 2015 21:39:13 +0300 (MSK) From: "Denis V. Lunev" To: Date: Wed, 28 Jan 2015 21:38:58 +0300 Message-Id: <1422470338-20465-8-git-send-email-den@openvz.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422470338-20465-1-git-send-email-den@openvz.org> References: <1422470338-20465-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Kevin Wolf , Fam Zheng , Peter Lieven , qemu-devel@nongnu.org, Max Reitz , Stefan Hajnoczi , "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 7/7] block/raw-posix: set max_write_zeroes to INT_MAX for regular files 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 fallocate() works fine and could handle properly with arbitrary size requests. There is no sense to reduce the amount of space to fallocate. The bigger is the size, the better is the performance as the amount of journal updates is reduced. The patch changes behavior for both generic filesystem and XFS codepaths, which are different in handle_aiocb_write_zeroes. The implementation of falocate and xfsctl(XFS_IOC_ZERO_RANGE) for XFS are exactly the same thus the change is fine for both ways. Signed-off-by: Denis V. Lunev CC: Max Reitz CC: Kevin Wolf CC: Stefan Hajnoczi CC: Peter Lieven CC: Fam Zheng Reviewed-by: Max Reitz --- block/raw-posix.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/block/raw-posix.c b/block/raw-posix.c index 3db911a..ec38fee 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -293,6 +293,20 @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) } } +static void raw_probe_max_write_zeroes(BlockDriverState *bs) +{ + BDRVRawState *s = bs->opaque; + struct stat st; + + if (fstat(s->fd, &st) < 0) { + return; /* no problem, keep default value */ + } + if (!S_ISREG(st.st_mode) || !s->discard_zeroes) { + return; + } + bs->bl.max_write_zeroes = INT_MAX; +} + static void raw_parse_flags(int bdrv_flags, int *open_flags) { assert(open_flags != NULL); @@ -600,6 +614,7 @@ static int raw_reopen_prepare(BDRVReopenState *state, /* Fail already reopen_prepare() if we can't get a working O_DIRECT * alignment with the new fd. */ if (raw_s->fd != -1) { + raw_probe_max_write_zeroes(state->bs); raw_probe_alignment(state->bs, raw_s->fd, &local_err); if (local_err) { qemu_close(raw_s->fd); @@ -653,6 +668,8 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) raw_probe_alignment(bs, s->fd, errp); bs->bl.opt_mem_alignment = s->buf_align; + + raw_probe_max_write_zeroes(bs); } static ssize_t handle_aiocb_ioctl(RawPosixAIOData *aiocb)