From nobody Thu Nov 6 06:19:20 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539865033222283.7914974682046; Thu, 18 Oct 2018 05:17:13 -0700 (PDT) Received: from localhost ([::1]:42085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD7Ec-0006Du-SW for importer@patchew.org; Thu, 18 Oct 2018 08:17:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gD7DU-0005v4-SJ for qemu-devel@nongnu.org; Thu, 18 Oct 2018 08:15:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gD7DR-0008NM-KB for qemu-devel@nongnu.org; Thu, 18 Oct 2018 08:15:52 -0400 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:37155) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gD7DR-0008Mr-Au for qemu-devel@nongnu.org; Thu, 18 Oct 2018 08:15:49 -0400 Received: by mail-lj1-x243.google.com with SMTP id 63-v6so27505300ljs.4 for ; Thu, 18 Oct 2018 05:15:49 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id m132-v6sm4411092lfg.24.2018.10.18.05.15.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Oct 2018 05:15:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zBKtik/mNJs4k8FUPhknWoYsOBOYA2YhwltksNlLWoI=; b=Zn7qY7C08wSKetVp1nF//632uA56Qokuky9Nadvr7Il5FRleDjkOPQZPEdPsXaAToA Ca34l5qjSbOasAh5ec2xeiE/nrK93KC7931qKD0tSFrIyJDG8yrQtspc9uRGUKsRnJJX f3B6nacKKOkiOnq1z+xUTtDfxb8gCOg9p4lnF204wFG4ttaY/QFL8QfacE1BDkvjFtn+ 9UPz3jNozjpQfzd1bdh1A38Oc25CD42IuAht/Ztke4j7JaQ9NY5mOPYUIlcjpB/hOHdS 1m7VVZvRLkGu6lApuwU14RlkvTYu0TwrREqrJ84IoINouLyl72fDQbkM/VYY6spAc8rk n3Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zBKtik/mNJs4k8FUPhknWoYsOBOYA2YhwltksNlLWoI=; b=gwt27qZ8e3k3JDaSfYF0OeT9P9VBM4DkfI9169ULIatayYdQBWegxpzMV9haT6TqCX z9CHCgTEEWCydPa0JuZEWnU5stzujQWINarlTjEj/dL+WRlsEnmkfBQ6DLM8acFMwXuX i/xg9ilyY9281oMenKkB8aVigDWLtPADj1WJc/Qc6yog4KSuP+TQwxF9zaaqwxN8dza5 RYHPCWgdWr7loQRg1woC3iQNP2nnogH3wk5mcfHZmt7u1xZXRk+T46sP8zWMMqanlrP6 g8MrVXeuqHrtfyGGjBDlAP2rK0zb/7jBcbT1UeTUYy63TAuuCyZVuAPu+1k22Y5T52Sv DJAA== X-Gm-Message-State: ABuFfogEyvxMGluwbAlC65v5ENDrx60q9W3hl85nMBZaGtAp544EtpCP kfxw0PruTdjHnSdXhSAiTuth2o0zMXU= X-Google-Smtp-Source: ACcGV639tsXyRtFWuel3J3C5qeg0k/TIxRIAqqwZegM/QpCgZND/GgvpYuDgQoLkwSH4oQROkEVY3A== X-Received: by 2002:a2e:7217:: with SMTP id n23-v6mr15019149ljc.71.1539864947047; Thu, 18 Oct 2018 05:15:47 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 18:15:30 +0600 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::243 Subject: [Qemu-devel] [PATCH v3 4/4] Optimize record/replay checkpointing for all clocks it applies to 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: Paolo Bonzini , Artem Pisarenko , Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Removes redundant checkpoints in replay log when there are no expired timer= s in timers list, associated with corresponding clock (i.e. no rr events as= sociated with current clock value). This also improves performance in rr mode. Signed-off-by: Artem Pisarenko --- Oops and again oops. Now it finally should be fine... v3: - fixed compiler warning caused non-debug build to fail include/qemu/timer.h | 2 +- util/qemu-timer.c | 62 +++++++++++++++++++++++++-----------------------= ---- 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index dc0fd14..bff8dac 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -65,7 +65,7 @@ typedef enum { * QEMU_TIMER_ATTR_EXTERNAL: drives external subsystem * * Timers with this attribute do not recorded in rr mode, therefore it cou= ld be - * used for the subsystems that operate outside the guest core. Applicable= only + * used for the subsystems that operate outside the guest core. Relevant o= nly * with virtual clock type. */ =20 diff --git a/util/qemu-timer.c b/util/qemu-timer.c index e2746cf..47205fe 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -490,6 +490,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) QEMUTimerCB *cb; void *opaque; bool need_replay_checkpoint =3D false; + ReplayCheckpoint replay_checkpoint_id =3D (ReplayCheckpoint)-1; =20 if (!atomic_read(&timer_list->active_timers)) { return false; @@ -500,43 +501,40 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) goto out; } =20 - switch (timer_list->clock->type) { - case QEMU_CLOCK_REALTIME: - break; - default: - case QEMU_CLOCK_VIRTUAL: - if (replay_mode !=3D REPLAY_MODE_NONE) { - /* Checkpoint for virtual clock is redundant in cases where - * it's being triggered with only non-EXTERNAL timers, because - * these timers don't change guest state directly. - * Since it has conditional dependence on specific timers, it = is - * subject to race conditions and requires special handling. - * See below. - */ + if (replay_mode !=3D REPLAY_MODE_NONE) { + /* Postpone actual checkpointing to timer list processing + * to properly check if we actually need it. + */ + switch (timer_list->clock->type) { + case QEMU_CLOCK_VIRTUAL: need_replay_checkpoint =3D true; + replay_checkpoint_id =3D CHECKPOINT_CLOCK_VIRTUAL; + break; + case QEMU_CLOCK_HOST: + need_replay_checkpoint =3D true; + replay_checkpoint_id =3D CHECKPOINT_CLOCK_HOST; + break; + case QEMU_CLOCK_VIRTUAL_RT: + need_replay_checkpoint =3D true; + replay_checkpoint_id =3D CHECKPOINT_CLOCK_VIRTUAL_RT; + break; + default: + break; } - break; - case QEMU_CLOCK_HOST: - if (!replay_checkpoint(CHECKPOINT_CLOCK_HOST)) { - goto out; - } - break; - case QEMU_CLOCK_VIRTUAL_RT: - if (!replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL_RT)) { - goto out; - } - break; } =20 /* - * Extract expired timers from active timers list and and process them. + * Extract expired timers from active timers list and and process them, + * taking into account checkpointing required in rr mode. * - * In rr mode we need "filtered" checkpointing for virtual clock. - * Checkpoint must be replayed before any non-EXTERNAL timer has been - * processed and only one time (virtual clock value stays same). But t= hese - * timers may appear in the timers list while it being processed, so t= his - * must be checked until we finally decide that "no timers left - we a= re - * done". + * Checkpoint must be replayed before any timer has been processed + * and only one time. But new timers may appear in the timers list whi= le + * it's being processed, so this must be checked until we finally deci= de + * that "no timers left - we are done" (to avoid skipping checkpoint d= ue to + * possible races). + * Also checkpoint for virtual clock is redundant in cases where it's = being + * triggered with only non-EXTERNAL timers, because these timers don't + * change guest state directly. */ current_time =3D qemu_clock_get_ns(timer_list->clock->type); qemu_mutex_lock(&timer_list->active_timers_lock); @@ -552,7 +550,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) /* once we got here, checkpoint clock only once */ need_replay_checkpoint =3D false; qemu_mutex_unlock(&timer_list->active_timers_lock); - if (!replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL)) { + if (!replay_checkpoint(replay_checkpoint_id)) { goto out; } qemu_mutex_lock(&timer_list->active_timers_lock); --=20 2.7.4