From nobody Thu Nov 13 06:10:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1577094668; cv=none; d=zohomail.com; s=zohoarc; b=OZxClVGOTZM+wLfgsxg7yMSHnYDISofkOzuxyRqQUo5Jedn/d9a4YF5eoJ4alhXp6oBwtAHX87goCuMS5CaPnzvsQWnbf3AC9eLRsJhoj3FXHHH1qVzTVlx9v+oMRlqVIVO3XgS2s9tW7zMctaBpq2gUOSaWExmeklxrGoDYPzE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577094668; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wLdfUInZF+sZmxPt8MTclf7N4uMG2uvZR0aqHILgj0o=; b=D0qey9G3FC9iGdiRTTtuDY057jdLnBoRQ01abfyoWXBf4Q16gVrWsM2Gp45jJ/lX+oPG+eNjXgRzQJ5+sPnT8lh/q6yNtcPF9dGjsEAjJS8i192RZBVFYeK76/itnxRNJAfwPjC1+G2Wg93HA/ilaLCxizEinHOTX0l+WoLGwbY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1577094668285631.1973018115723; Mon, 23 Dec 2019 01:51:08 -0800 (PST) Received: from localhost ([::1]:55238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijKMk-00079c-Sx for importer@patchew.org; Mon, 23 Dec 2019 04:51:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45485) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijKJ8-0003Sw-1D for qemu-devel@nongnu.org; Mon, 23 Dec 2019 04:47:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijKJ6-0000as-Ej for qemu-devel@nongnu.org; Mon, 23 Dec 2019 04:47:21 -0500 Received: from mail.ispras.ru ([83.149.199.45]:50762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ijKJ6-0000Ss-38 for qemu-devel@nongnu.org; Mon, 23 Dec 2019 04:47:20 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id A16B754006B; Mon, 23 Dec 2019 12:47:01 +0300 (MSK) Subject: [for-5.0 PATCH 03/11] migration: introduce icount field for snapshots From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Mon, 23 Dec 2019 12:47:01 +0300 Message-ID: <157709442133.12933.4291167191595240519.stgit@pasha-Precision-3630-Tower> In-Reply-To: <157709434917.12933.4351155074716553976.stgit@pasha-Precision-3630-Tower> References: <157709434917.12933.4351155074716553976.stgit@pasha-Precision-3630-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, quintela@redhat.com, ciro.santilli@gmail.com, jasowang@redhat.com, crosthwaite.peter@gmail.com, armbru@redhat.com, mreitz@redhat.com, alex.bennee@linaro.org, maria.klimushenkova@ispras.ru, mst@redhat.com, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.com, dovgaluk@ispras.ru, artem.k.pisarenko@gmail.com, dgilbert@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Pavel Dovgalyuk Saving icount as a parameters of the snapshot allows navigation between them in the execution replay scenario. This information can be used for finding a specific snapshot for proceeding the recorded execution to the specific moment of the time. E.g., 'reverse step' action (introduced in one of the following patches) needs to load the nearest snapshot which is prior to the current moment of time. Signed-off-by: Pavel Dovgalyuk Acked-by: Markus Armbruster -- v2: - made icount in SnapshotInfo optional (suggested by Eric Blake) v7: - added more comments for icount member (suggested by Markus Armbruster) v9: - updated icount comment v10: - updated icount comment again Acked-by: Kevin Wolf --- block/qapi.c | 18 ++++++++++++++---- block/qcow2-snapshot.c | 2 ++ blockdev.c | 10 ++++++++++ include/block/snapshot.h | 1 + migration/savevm.c | 5 +++++ qapi/block-core.json | 7 ++++++- qapi/block.json | 3 ++- 7 files changed, 40 insertions(+), 6 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 9a5d0c9b27..110ac253ab 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -219,6 +219,8 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs, info->date_nsec =3D sn_tab[i].date_nsec; info->vm_clock_sec =3D sn_tab[i].vm_clock_nsec / 1000000000; info->vm_clock_nsec =3D sn_tab[i].vm_clock_nsec % 1000000000; + info->icount =3D sn_tab[i].icount; + info->has_icount =3D sn_tab[i].icount !=3D -1ULL; =20 info_list =3D g_new0(SnapshotInfoList, 1); info_list->value =3D info; @@ -651,14 +653,15 @@ BlockStatsList *qmp_query_blockstats(bool has_query_n= odes, void bdrv_snapshot_dump(QEMUSnapshotInfo *sn) { char date_buf[128], clock_buf[128]; + char icount_buf[128] =3D {0}; struct tm tm; time_t ti; int64_t secs; char *sizing =3D NULL; =20 if (!sn) { - qemu_printf("%-10s%-20s%7s%20s%15s", - "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK"); + qemu_printf("%-10s%-18s%7s%20s%13s%11s", + "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK", "ICOUNT"); } else { ti =3D sn->date_sec; localtime_r(&ti, &tm); @@ -672,11 +675,16 @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn) (int)(secs % 60), (int)((sn->vm_clock_nsec / 1000000) % 1000)); sizing =3D size_to_str(sn->vm_state_size); - qemu_printf("%-10s%-20s%7s%20s%15s", + if (sn->icount !=3D -1ULL) { + snprintf(icount_buf, sizeof(icount_buf), + "%"PRId64, sn->icount); + } + qemu_printf("%-10s%-18s%7s%20s%13s%11s", sn->id_str, sn->name, sizing, date_buf, - clock_buf); + clock_buf, + icount_buf); } g_free(sizing); } @@ -838,6 +846,8 @@ void bdrv_image_info_dump(ImageInfo *info) .date_nsec =3D elem->value->date_nsec, .vm_clock_nsec =3D elem->value->vm_clock_sec * 1000000000U= LL + elem->value->vm_clock_nsec, + .icount =3D elem->value->has_icount ? + elem->value->icount : -1ULL, }; =20 pstrcpy(sn.id_str, sizeof(sn.id_str), elem->value->id); diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index b04b3e1634..2c003514ef 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -662,6 +662,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSna= pshotInfo *sn_info) sn->date_sec =3D sn_info->date_sec; sn->date_nsec =3D sn_info->date_nsec; sn->vm_clock_nsec =3D sn_info->vm_clock_nsec; + sn->icount =3D sn_info->icount; sn->extra_data_size =3D sizeof(QCowSnapshotExtraData); =20 /* Allocate the L1 table of the snapshot and copy the current one ther= e. */ @@ -995,6 +996,7 @@ int qcow2_snapshot_list(BlockDriverState *bs, QEMUSnaps= hotInfo **psn_tab) sn_info->date_sec =3D sn->date_sec; sn_info->date_nsec =3D sn->date_nsec; sn_info->vm_clock_nsec =3D sn->vm_clock_nsec; + sn_info->icount =3D sn->icount; } *psn_tab =3D sn_tab; return s->nb_snapshots; diff --git a/blockdev.c b/blockdev.c index 8e029e9c01..6383a64ddd 100644 --- a/blockdev.c +++ b/blockdev.c @@ -59,6 +59,7 @@ #include "sysemu/arch_init.h" #include "sysemu/qtest.h" #include "sysemu/runstate.h" +#include "sysemu/replay.h" #include "qemu/cutils.h" #include "qemu/help_option.h" #include "qemu/main-loop.h" @@ -1242,6 +1243,10 @@ SnapshotInfo *qmp_blockdev_snapshot_delete_internal_= sync(const char *device, info->vm_state_size =3D sn.vm_state_size; info->vm_clock_nsec =3D sn.vm_clock_nsec % 1000000000; info->vm_clock_sec =3D sn.vm_clock_nsec / 1000000000; + if (sn.icount !=3D -1ULL) { + info->icount =3D sn.icount; + info->has_icount =3D true; + } =20 return info; =20 @@ -1449,6 +1454,11 @@ static void internal_snapshot_prepare(BlkActionState= *common, sn->date_sec =3D tv.tv_sec; sn->date_nsec =3D tv.tv_usec * 1000; sn->vm_clock_nsec =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + if (replay_mode !=3D REPLAY_MODE_NONE) { + sn->icount =3D replay_get_current_icount(); + } else { + sn->icount =3D -1ULL; + } =20 ret1 =3D bdrv_snapshot_create(bs, sn); if (ret1 < 0) { diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 2bfcd57578..b0fe42993d 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -42,6 +42,7 @@ typedef struct QEMUSnapshotInfo { uint32_t date_sec; /* UTC date of the snapshot */ uint32_t date_nsec; uint64_t vm_clock_nsec; /* VM clock relative to boot */ + uint64_t icount; /* record/replay step */ } QEMUSnapshotInfo; =20 int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info, diff --git a/migration/savevm.c b/migration/savevm.c index a71b930b91..ae84bf6ab0 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2681,6 +2681,11 @@ int save_snapshot(const char *name, Error **errp) sn->date_sec =3D tv.tv_sec; sn->date_nsec =3D tv.tv_usec * 1000; sn->vm_clock_nsec =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + if (replay_mode !=3D REPLAY_MODE_NONE) { + sn->icount =3D replay_get_current_icount(); + } else { + sn->icount =3D -1ULL; + } =20 if (name) { ret =3D bdrv_snapshot_find(bs, old_sn, name); diff --git a/qapi/block-core.json b/qapi/block-core.json index 0cf68fea14..db3e435c74 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -26,13 +26,18 @@ # # @vm-clock-nsec: fractional part in nano seconds to be used with vm-clock= -sec # +# @icount: Current instruction count. Appears when execution record/replay +# is enabled. Used for "time-traveling" to match the moment +# in the recorded execution with the snapshots. (since 5.0) +# # Since: 1.3 # ## { 'struct': 'SnapshotInfo', 'data': { 'id': 'str', 'name': 'str', 'vm-state-size': 'int', 'date-sec': 'int', 'date-nsec': 'int', - 'vm-clock-sec': 'int', 'vm-clock-nsec': 'int' } } + 'vm-clock-sec': 'int', 'vm-clock-nsec': 'int', + '*icount': 'int' } } =20 ## # @ImageInfoSpecificQCow2EncryptionBase: diff --git a/qapi/block.json b/qapi/block.json index 145c268bb6..f389bb6f1a 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -176,7 +176,8 @@ # "date-sec": 1000012, # "date-nsec": 10, # "vm-clock-sec": 100, -# "vm-clock-nsec": 20 +# "vm-clock-nsec": 20, +# "icount": 220414 # } # } #