From nobody Tue Nov 4 22:05:03 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530716507596644.9565005366258; Wed, 4 Jul 2018 08:01:47 -0700 (PDT) Received: from localhost ([::1]:47640 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fajHk-0002u8-PU for importer@patchew.org; Wed, 04 Jul 2018 11:01:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fajG6-0001ul-1I for qemu-devel@nongnu.org; Wed, 04 Jul 2018 10:59:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fajG5-00076j-0T for qemu-devel@nongnu.org; Wed, 04 Jul 2018 10:59:54 -0400 Received: from mx1.mpynet.fi ([82.197.21.84]:33683) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fajG1-000747-Ag; Wed, 04 Jul 2018 10:59:49 -0400 From: Ari Sundholm To: Date: Wed, 4 Jul 2018 17:59:36 +0300 Message-ID: <1530716376-2235-4-git-send-email-ari@tuxera.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530716376-2235-1-git-send-email-ari@tuxera.com> References: <1530716376-2235-1-git-send-email-ari@tuxera.com> MIME-Version: 1.0 X-ClientProxiedBy: tuxera-exch.ad.tuxera.com (10.20.48.11) To tuxera-exch.ad.tuxera.com (10.20.48.11) Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 82.197.21.84 Subject: [Qemu-devel] [PATCH v2 3/3] block/blklogwrites: Add an option for the update interval of the log superblock X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "open list:blklogwrites" , Markus Armbruster , Max Reitz , Ari Sundholm Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This is a way to ensure that the log superblock is periodically updated. Before, this was only done on flush requests, which may not be enough if the VM exits abnormally, omitting the final flush. The default interval is 4096 write requests. Signed-off-by: Ari Sundholm --- block/blklogwrites.c | 20 ++++++++++++++++++-- qapi/block-core.json | 6 +++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/block/blklogwrites.c b/block/blklogwrites.c index 56154e7..63bf6b3 100644 --- a/block/blklogwrites.c +++ b/block/blklogwrites.c @@ -55,6 +55,7 @@ typedef struct { uint32_t sectorbits; uint64_t cur_log_sector; uint64_t nr_entries; + uint64_t update_interval; } BDRVBlkLogWritesState; =20 static QemuOptsList runtime_opts =3D { @@ -71,6 +72,11 @@ static QemuOptsList runtime_opts =3D { .type =3D QEMU_OPT_SIZE, .help =3D "Log sector size", }, + { + .name =3D "log-super-update-interval", + .type =3D QEMU_OPT_NUMBER, + .help =3D "Log superblock update interval (# of write requests= )", + }, { /* end of list */ } }, }; @@ -234,6 +240,14 @@ static int blk_log_writes_open(BlockDriverState *bs, Q= Dict *options, int flags, =20 s->sectorsize =3D log_sector_size; s->sectorbits =3D blk_log_writes_log2(log_sector_size); + s->update_interval =3D qemu_opt_get_number(opts, "log-super-update-int= erval", + 4096); + if (!s->update_interval) { + ret =3D -EINVAL; + error_setg(errp, "Invalid log superblock update interval %"PRIu64, + s->update_interval); + goto fail_log; + } =20 ret =3D 0; fail_log: @@ -360,8 +374,10 @@ static void coroutine_fn blk_log_writes_co_do_log(BlkL= ogWritesLogReq *lr) lr->zero_size, 0); } =20 - /* Update super block on flush */ - if (lr->log_ret =3D=3D 0 && lr->entry.flags & LOG_FLUSH_FLAG) { + /* Update super block on flush or every update interval */ + if (lr->log_ret =3D=3D 0 && ((lr->entry.flags & LOG_FLUSH_FLAG) + || (s->nr_entries % s->update_interval =3D=3D 0))) + { struct log_write_super super =3D { .magic =3D cpu_to_le64(WRITE_LOG_MAGIC), .version =3D cpu_to_le64(WRITE_LOG_VERSION), diff --git a/qapi/block-core.json b/qapi/block-core.json index d1753a2..38b3125 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3057,13 +3057,17 @@ # @log-sector-size: sector size used in logging writes to @file, determines # granularity of offsets and sizes of writes (default: 5= 12) # +# @log-super-update-interval: interval of write requests after which the l= og +# super block is updated to disk (default: 409= 6) +# # Since: 3.0 ## { 'struct': 'BlockdevOptionsBlklogwrites', 'data': { 'file': 'BlockdevRef', 'log': 'BlockdevRef', '*log-sector-size': 'uint32', - '*log-append': 'bool' } } + '*log-append': 'bool', + '*log-super-update-interval': 'uint64' } } =20 ## # @BlockdevOptionsBlkverify: --=20 2.7.4