From patchwork Mon Mar 14 07:44:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 8576931 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 779B49F3D1 for ; Mon, 14 Mar 2016 07:45:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C334120460 for ; Mon, 14 Mar 2016 07:45:26 +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 1074C2045A for ; Mon, 14 Mar 2016 07:45:26 +0000 (UTC) Received: from localhost ([::1]:39474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afNBt-0001hq-Cn for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Mar 2016 03:45:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afNBS-0001Ie-0O for qemu-devel@nongnu.org; Mon, 14 Mar 2016 03:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afNBO-0003uP-Oq for qemu-devel@nongnu.org; Mon, 14 Mar 2016 03:44:57 -0400 Received: from mail.ispras.ru ([83.149.199.45]:50492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afNBO-0003uG-HV for qemu-devel@nongnu.org; Mon, 14 Mar 2016 03:44:54 -0400 Received: from [10.10.150.45] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id AB52C54007B; Mon, 14 Mar 2016 10:44:53 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Mon, 14 Mar 2016 10:44:53 +0300 Message-ID: <20160314074453.4980.68514.stgit@PASHA-ISP> In-Reply-To: <20160314074429.4980.34777.stgit@PASHA-ISP> References: <20160314074429.4980.34777.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, igor.rubinov@gmail.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, hines@cert.org, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, kwolf@redhat.com, stefanha@redhat.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v5 4/7] block: add flush callback 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 This patch adds callback for flush request. This callback is responsible for flushing whole block devices stack. bdrv_flush function does not proceed to underlying devices. It should be performed by this callback function, if needed. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Kevin Wolf --- block/io.c | 7 +++++++ include/block/block_int.h | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/block/io.c b/block/io.c index a69bfc4..242ee0c 100644 --- a/block/io.c +++ b/block/io.c @@ -2369,6 +2369,13 @@ int coroutine_fn bdrv_co_flush(BlockDriverState *bs) } tracked_request_begin(&req, bs, 0, 0, BDRV_TRACKED_FLUSH); + + /* Write back all layers by calling one driver function */ + if (bs->drv->bdrv_co_flush) { + ret = bs->drv->bdrv_co_flush(bs); + goto out; + } + /* Write back cached data to the OS even with cache=unsafe */ BLKDBG_EVENT(bs->file, BLKDBG_FLUSH_TO_OS); if (bs->drv->bdrv_co_flush_to_os) { diff --git a/include/block/block_int.h b/include/block/block_int.h index 9ef823a..8f72037 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -176,6 +176,13 @@ struct BlockDriver { int (*bdrv_inactivate)(BlockDriverState *bs); /* + * Flushes all data for all layers by calling bdrv_co_flush for underlying + * layers, if needed. This function is needed for deterministic + * synchronization of the flush finishing callback. + */ + int coroutine_fn (*bdrv_co_flush)(BlockDriverState *bs); + + /* * Flushes all data that was already written to the OS all the way down to * the disk (for example raw-posix calls fsync()). */