From nobody Thu Nov 6 06:13:31 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539764859373478.2640500908236; Wed, 17 Oct 2018 01:27:39 -0700 (PDT) Received: from localhost ([::1]:34492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gChB0-0007xy-61 for importer@patchew.org; Wed, 17 Oct 2018 04:27:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCh9G-00073S-US for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCh9D-0008Gm-Nx for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:46 -0400 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]:33692) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCh9D-0008GD-F6 for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:43 -0400 Received: by mail-lj1-x242.google.com with SMTP id z21-v6so23507341ljz.0 for ; Wed, 17 Oct 2018 01:25:43 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id h77-v6sm3897735ljf.59.2018.10.17.01.25.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Oct 2018 01:25:40 -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 :in-reply-to:references; bh=6s46CLkP3WBKP3BFUmSls4Dh8c0Fi5LlejOEvPYz+to=; b=uyr5Jxb+uKfJQvdGTsb0rFQaIbz5cqu1Ar3SSZmJscDPqyMaRcEvU5WDIqLPdJEWuU HG/g6z4Uhn5kE6GW9aOq4WmsxmQVgfculssv5WoRhEveJ7pX8t+DdkwvczYMrPIKGf1K jE7u9MQ/P5Ut/GFxyurHEnbhbG/6LTk1Mkbe1yUA8uylVNNpI8mhmo4czcETA56AiFEh iQB8fgfzIMapJ6A94UqPYR3WUOhP6KaDQwFKjH+Y+kU8IBJ/tg7wcX7XWudVwv3gHVoB DqIYNpr2WcFDs3kfZiaNRA6EyTLc+EQhRcQm904s8j/ODzFS8DnL4rbM/7L+fliLhu8V 9iYQ== 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:in-reply-to:references; bh=6s46CLkP3WBKP3BFUmSls4Dh8c0Fi5LlejOEvPYz+to=; b=m1ILMOtLItU6jTBOd05O6emQjZVGNmrj237wR1Y+tCXzCSgv/1/rHkKDYxRSzMlGcB AyJmQYdl+X02SaW4h+4S+s8tnF7plcD8JNXXDwtfuDNMBrZ0jteMKDxm7wUdk7Q2inWt 6GPbztySABsp5OjTrF7eyK51eozAYEk70BZw935ldXkwh45H3daGoZzhMa1ujYrqtzBq VXyZg8a2CeooJgMAWkR6O6LANbLQTuLNM0Ys83wedtKq1cGX8IZuLMntESL13Dn96/Zc 19dWwcL1KFnUaOGrrKcvomyFk4chYp6zo3YP41IGEUU4JWQD1fWp79OQ2EWFyeT3iyir 7T0A== X-Gm-Message-State: ABuFfojn0VHq6c2nEcY5oUXAGSrpwVE5SWq01JeZmwW7ZyPZ91eTJJ4s CYNxJBvqcTR9HbzNQ/1Z74GbzCrjoio= X-Google-Smtp-Source: ACcGV60k2D9L8aThxVm680gcI/Yyuf43Em9PJVR1eFv4yTokoB6BIror9u8ZjZqOw4Ld62Ggiof6VA== X-Received: by 2002:a2e:7217:: with SMTP id n23-v6mr11842029ljc.71.1539764741576; Wed, 17 Oct 2018 01:25:41 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 14:24:18 +0600 Message-Id: <18b1e7c8f155fe26976f91be06bde98eef6f8751.1539764043.git.artem.k.pisarenko@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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::242 Subject: [Qemu-devel] [PATCH v2 1/4] Revert some patches from recent [PATCH v6] "Fixing record/replay and adding reverse debugging" 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: Jan Kiszka , Gerd Hoffmann , Pavel Dovgalyuk , Samuel Thibault , Paolo Bonzini , Artem Pisarenko 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" That patch series introduced new virtual clock type for use in external sub= systems. It breaks desired behavior in non-record/replay usage scenarios. This reverts commit 87f4fe7653baf55b5c2f2753fe6003f473c07342. This reverts commit 775a412bf83f6bc0c5c02091ee06cf649b34c593. This reverts commit 9888091404a702d7ec79d51b088d994b9fc121bd. Signed-off-by: Artem Pisarenko --- include/qemu/timer.h | 9 --------- slirp/ip6_icmp.c | 7 +++---- ui/input.c | 8 ++++---- util/qemu-timer.c | 2 -- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index a005ed2..39ea907 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -42,14 +42,6 @@ * In icount mode, this clock counts nanoseconds while the virtual * machine is running. It is used to increase @QEMU_CLOCK_VIRTUAL * while the CPUs are sleeping and thus not executing instructions. - * - * @QEMU_CLOCK_VIRTUAL_EXT: virtual clock for external subsystems - * - * The virtual clock only runs during the emulation. It stops - * when the virtual machine is stopped. The timers for this clock - * do not recorded in rr mode, therefore this clock could be used - * for the subsystems that operate outside the guest core. - * */ =20 typedef enum { @@ -57,7 +49,6 @@ typedef enum { QEMU_CLOCK_VIRTUAL =3D 1, QEMU_CLOCK_HOST =3D 2, QEMU_CLOCK_VIRTUAL_RT =3D 3, - QEMU_CLOCK_VIRTUAL_EXT =3D 4, QEMU_CLOCK_MAX } QEMUClockType; =20 diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index 3f41187..ee333d0 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -17,7 +17,7 @@ static void ra_timer_handler(void *opaque) { Slirp *slirp =3D opaque; timer_mod(slirp->ra_timer, - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EXT) + NDP_Interval); + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + NDP_Interval); ndp_send_ra(slirp); } =20 @@ -27,10 +27,9 @@ void icmp6_init(Slirp *slirp) return; } =20 - slirp->ra_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL_EXT, - ra_timer_handler, slirp); + slirp->ra_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, ra_timer_handler,= slirp); timer_mod(slirp->ra_timer, - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EXT) + NDP_Interval); + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + NDP_Interval); } =20 void icmp6_cleanup(Slirp *slirp) diff --git a/ui/input.c b/ui/input.c index dd7f6d7..51b1019 100644 --- a/ui/input.c +++ b/ui/input.c @@ -271,7 +271,7 @@ static void qemu_input_queue_process(void *opaque) item =3D QTAILQ_FIRST(queue); switch (item->type) { case QEMU_INPUT_QUEUE_DELAY: - timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EX= T) + timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + item->delay_ms); return; case QEMU_INPUT_QUEUE_EVENT: @@ -301,7 +301,7 @@ static void qemu_input_queue_delay(struct QemuInputEven= tQueueHead *queue, queue_count++; =20 if (start_timer) { - timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_EXT) + timer_mod(item->timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + item->delay_ms); } } @@ -448,8 +448,8 @@ void qemu_input_event_send_key_delay(uint32_t delay_ms) } =20 if (!kbd_timer) { - kbd_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL_EXT, - qemu_input_queue_process, &kbd_queue); + kbd_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, qemu_input_queue_pr= ocess, + &kbd_queue); } if (queue_count < queue_limit) { qemu_input_queue_delay(&kbd_queue, kbd_timer, diff --git a/util/qemu-timer.c b/util/qemu-timer.c index eb60d8f..86bfe84 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -496,7 +496,6 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) =20 switch (timer_list->clock->type) { case QEMU_CLOCK_REALTIME: - case QEMU_CLOCK_VIRTUAL_EXT: break; default: case QEMU_CLOCK_VIRTUAL: @@ -598,7 +597,6 @@ int64_t qemu_clock_get_ns(QEMUClockType type) return get_clock(); default: case QEMU_CLOCK_VIRTUAL: - case QEMU_CLOCK_VIRTUAL_EXT: if (use_icount) { return cpu_get_icount(); } else { --=20 2.7.4 From nobody Thu Nov 6 06:13:31 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539764860072947.5622091576437; Wed, 17 Oct 2018 01:27:40 -0700 (PDT) Received: from localhost ([::1]:34493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gChB4-00080r-F0 for importer@patchew.org; Wed, 17 Oct 2018 04:27:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCh9H-00073t-Mw for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCh9F-0008Hn-UM for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:47 -0400 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:34642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCh9F-0008HE-FA; Wed, 17 Oct 2018 04:25:45 -0400 Received: by mail-lj1-x243.google.com with SMTP id j17-v6so23509847lja.1; Wed, 17 Oct 2018 01:25:45 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id h77-v6sm3897735ljf.59.2018.10.17.01.25.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Oct 2018 01:25:42 -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 :in-reply-to:references; bh=vZHCJVv1KF2WwajVEAqSXw7b0gTXnWkpg+f2UbWMyh0=; b=VKY4nL2AOCk6Fd6dzxrI4y8bhZ9YpE6B6M71l8nBmnKH40eyJNNn1DiuFHX71TIOWN tnjgIlNMxzYJac9qMoA7PTlaJVpLcG1k96gdilhIDOvu22RK2R7IXtxE22a2BZ9eQhCh URqUIos7ldxQtc3Q5ElW1Ilf1tLYFhspjuHljHg0kQarFN/e0vESyut9ukN99lFQLsh8 kFAELzYaXobjBq/ScREhak/MDH7vcnjJENa5KlnOyPfzA2AHla55qTjAUoSAmSjiuh0L qoGeDWyR/u8udbNKf3pyz0s7t34xitQUUB+Xl3z0sr82PSx+erpQINKPSDYO6qTgENKo OxMQ== 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:in-reply-to:references; bh=vZHCJVv1KF2WwajVEAqSXw7b0gTXnWkpg+f2UbWMyh0=; b=QSOr6w6/LcbDBcN4Zwxkp/12maXdCHVyF6Uc1K7v/xbs0JJy6WiY/XazESU8KSZEFE KoWvlgNt7bji0lN2ncd0py76QYIhw02a3GK22SE6No/ullUsrzaE5zZ178u5Mj/Wy6yh +BMJ6g+rm5WNuL/bAMPwuCeyDekeN/8SV17ubr3iuzN/nkW7LSkUDV1EroCTt9xSN1Zj /RsY59vbwY5zVKjJUiFM1arBhMz0gZlp5hqc/4RgA0485bU5mQCuiyUgvdoCQn45G/1j PwZ/IEg3Bs0WfwICeDHaYdD3pAO7Lqjcl61WpmJRgO7ufJyn4V92UbY+EAfXidaGDCWw IBwA== X-Gm-Message-State: ABuFfojAPt7K/gafXfwPSxpf+6Lteifj5NPM7fQZAju5lyZZpdxzLKEe HzIO5F785ARcomlkfp9AT3+zyfHmX9U= X-Google-Smtp-Source: ACcGV61cL7RjNFGJ/jQJd6hGId71Zb9fSW2bHyGdQuOvQpnKfGvTW7/XGLi0Pa9Z2bbXM87kktusMg== X-Received: by 2002:a2e:638d:: with SMTP id s13-v6mr15659002lje.117.1539764743437; Wed, 17 Oct 2018 01:25:43 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 14:24:19 +0600 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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 v2 2/4] Introduce attributes to qemu timer subsystem 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 , Fam Zheng , Pavel Dovgalyuk , "open list:Block I/O path" , Max Reitz , Stefan Hajnoczi , Paolo Bonzini , Artem Pisarenko 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" Attributes are simple flags, associated with individual timers for their wh= ole lifetime. They intended to be used to mark individual timers for special handling by = various qemu features operating at qemu core level. New/init functions family in timer interface updated and refactored (new 'a= ttribute' argument added, timer_list replaced with timer_list_group+type co= mbinations, comments improved to avoid info duplication). Also existing aio interface extended with attribute-enabled variants of fun= ctions, which create/initialize timers. Signed-off-by: Artem Pisarenko --- Notes: v2: - timer creation/initialize functions reworked and and their unnecessar= y variants removed (as Paolo Bonzini suggested) - also their comments improved to avoid info duplication include/block/aio.h | 57 ++++++++++++++++++--- include/qemu/timer.h | 128 ++++++++++++++++++++++++++----------------= ---- tests/ptimer-test-stubs.c | 13 +++-- util/qemu-timer.c | 18 +++++-- 4 files changed, 146 insertions(+), 70 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index f08630c..fce9d48 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -388,6 +388,31 @@ struct LinuxAioState *aio_setup_linux_aio(AioContext *= ctx, Error **errp); struct LinuxAioState *aio_get_linux_aio(AioContext *ctx); =20 /** + * aio_timer_new_with_attrs: + * @ctx: the aio context + * @type: the clock type + * @scale: the scale + * @attributes: 0, or one to multiple OR'ed QEMU_TIMER_ATTR(id) values to = assign + * @cb: the callback to call on timer expiry + * @opaque: the opaque pointer to pass to the callback + * + * Allocate a new timer (with attributes) attached to the context @ctx. + * The function is responsible for memory allocation. + * + * The preferred interface is aio_timer_init or aio_timer_init_with_attrs. + * Use that unless you really need dynamic memory allocation. + * + * Returns: a pointer to the new timer + */ +static inline QEMUTimer *aio_timer_new_with_attrs(AioContext *ctx, + QEMUClockType type, + int scale, int attribute= s, + QEMUTimerCB *cb, void *o= paque) +{ + return timer_new_full(&ctx->tlg, type, scale, attributes, cb, opaque); +} + +/** * aio_timer_new: * @ctx: the aio context * @type: the clock type @@ -396,10 +421,7 @@ struct LinuxAioState *aio_get_linux_aio(AioContext *ct= x); * @opaque: the opaque pointer to pass to the callback * * Allocate a new timer attached to the context @ctx. - * The function is responsible for memory allocation. - * - * The preferred interface is aio_timer_init. Use that - * unless you really need dynamic memory allocation. + * See aio_timer_new_with_attrs for details. * * Returns: a pointer to the new timer */ @@ -407,7 +429,28 @@ static inline QEMUTimer *aio_timer_new(AioContext *ctx= , QEMUClockType type, int scale, QEMUTimerCB *cb, void *opaque) { - return timer_new_tl(ctx->tlg.tl[type], scale, cb, opaque); + return timer_new_full(&ctx->tlg, type, scale, 0, cb, opaque); +} + +/** + * aio_timer_init_with_attrs: + * @ctx: the aio context + * @ts: the timer + * @type: the clock type + * @scale: the scale + * @attributes: 0, or one to multiple OR'ed QEMU_TIMER_ATTR(id) values to = assign + * @cb: the callback to call on timer expiry + * @opaque: the opaque pointer to pass to the callback + * + * Initialise a new timer (with attributes) attached to the context @ctx. + * The caller is responsible for memory allocation. + */ +static inline void aio_timer_init_with_attrs(AioContext *ctx, + QEMUTimer *ts, QEMUClockType = type, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) +{ + timer_init_full(ts, &ctx->tlg, type, scale, attributes, cb, opaque); } =20 /** @@ -420,14 +463,14 @@ static inline QEMUTimer *aio_timer_new(AioContext *ct= x, QEMUClockType type, * @opaque: the opaque pointer to pass to the callback * * Initialise a new timer attached to the context @ctx. - * The caller is responsible for memory allocation. + * See aio_timer_init_with_attrs for details. */ static inline void aio_timer_init(AioContext *ctx, QEMUTimer *ts, QEMUClockType type, int scale, QEMUTimerCB *cb, void *opaque) { - timer_init_tl(ts, ctx->tlg.tl[type], scale, cb, opaque); + timer_init_full(ts, &ctx->tlg, type, scale, 0, cb, opaque); } =20 /** diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 39ea907..e225ad4 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -52,6 +52,28 @@ typedef enum { QEMU_CLOCK_MAX } QEMUClockType; =20 +/** + * QEMU Timer attributes: + * + * An individual timer may be assigned with one or multiple attributes when + * initialized. + * Attribute is a static flag, meaning that timer has corresponding proper= ty. + * Attributes are defined in QEMUTimerAttrBit enum and encoded to bit set, + * which used to initialize timer, stored to 'attributes' member and can be + * retrieved externally with timer_get_attributes() call. + * Values of QEMUTimerAttrBit aren't used directly, + * instead each attribute in bit set accessed with QEMU_TIMER_ATTR_ ma= cro, + * where is a unique part of attribute identifier. + * + * No attributes defined currently. + */ + +typedef enum { + QEMU_TIMER_ATTRBIT__NONE +} QEMUTimerAttrBit; + +#define QEMU_TIMER_ATTR__NONE (1 << QEMU_TIMER_ATTRBIT__NONE) + typedef struct QEMUTimerList QEMUTimerList; =20 struct QEMUTimerListGroup { @@ -67,6 +89,7 @@ struct QEMUTimer { QEMUTimerCB *cb; void *opaque; QEMUTimer *next; + int attributes; int scale; }; =20 @@ -418,22 +441,27 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup= *tlg); */ =20 /** - * timer_init_tl: + * timer_init_full: * @ts: the timer to be initialised - * @timer_list: the timer list to attach the timer to + * @timer_list_group: (optional) the timer list group to attach the timer = to + * @type: the clock type to use * @scale: the scale value for the timer + * @attributes: 0, or one to multiple OR'ed QEMU_TIMER_ATTR(id) values to = assign * @cb: the callback to be called when the timer expires * @opaque: the opaque pointer to be passed to the callback * - * Initialise a new timer and associate it with @timer_list. + * Initialise a timer with the given scale and attributes, + * and associate it with timer list for given clock @type in @timer_list_g= roup + * (or default timer list group, if NULL). * The caller is responsible for allocating the memory. * * You need not call an explicit deinit call. Simply make * sure it is not on a list with timer_del. */ -void timer_init_tl(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque); +void timer_init_full(QEMUTimer *ts, + QEMUTimerListGroup *timer_list_group, QEMUClockType t= ype, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque); =20 /** * timer_init: @@ -445,14 +473,12 @@ void timer_init_tl(QEMUTimer *ts, * * Initialize a timer with the given scale on the default timer list * associated with the clock. - * - * You need not call an explicit deinit call. Simply make - * sure it is not on a list with timer_del. + * See timer_init_full for details. */ static inline void timer_init(QEMUTimer *ts, QEMUClockType type, int scale, QEMUTimerCB *cb, void *opaque) { - timer_init_tl(ts, main_loop_tlg.tl[type], scale, cb, opaque); + timer_init_full(ts, &main_loop_tlg, type, scale, 0, cb, opaque); } =20 /** @@ -464,9 +490,7 @@ static inline void timer_init(QEMUTimer *ts, QEMUClockT= ype type, int scale, * * Initialize a timer with nanosecond scale on the default timer list * associated with the clock. - * - * You need not call an explicit deinit call. Simply make - * sure it is not on a list with timer_del. + * See timer_init_full for details. */ static inline void timer_init_ns(QEMUTimer *ts, QEMUClockType type, QEMUTimerCB *cb, void *opaque) @@ -483,9 +507,7 @@ static inline void timer_init_ns(QEMUTimer *ts, QEMUClo= ckType type, * * Initialize a timer with microsecond scale on the default timer list * associated with the clock. - * - * You need not call an explicit deinit call. Simply make - * sure it is not on a list with timer_del. + * See timer_init_full for details. */ static inline void timer_init_us(QEMUTimer *ts, QEMUClockType type, QEMUTimerCB *cb, void *opaque) @@ -502,9 +524,7 @@ static inline void timer_init_us(QEMUTimer *ts, QEMUClo= ckType type, * * Initialize a timer with millisecond scale on the default timer list * associated with the clock. - * - * You need not call an explicit deinit call. Simply make - * sure it is not on a list with timer_del. + * See timer_init_full for details. */ static inline void timer_init_ms(QEMUTimer *ts, QEMUClockType type, QEMUTimerCB *cb, void *opaque) @@ -513,27 +533,37 @@ static inline void timer_init_ms(QEMUTimer *ts, QEMUC= lockType type, } =20 /** - * timer_new_tl: - * @timer_list: the timer list to attach the timer to + * timer_new_full: + * @timer_list_group: (optional) the timer list group to attach the timer = to + * @type: the clock type to use * @scale: the scale value for the timer + * @attributes: 0, or one to multiple OR'ed QEMU_TIMER_ATTR(id) values to = assign * @cb: the callback to be called when the timer expires * @opaque: the opaque pointer to be passed to the callback * - * Create a new timer and associate it with @timer_list. + * Create a new timer with the given scale and attributes, + * and associate it with timer list for given clock @type in @timer_list_g= roup + * (or default timer list group, if NULL). * The memory is allocated by the function. * * This is not the preferred interface unless you know you - * are going to call timer_free. Use timer_init instead. + * are going to call timer_free. Use timer_init or timer_init_full instead. + * + * The default timer list has one special feature: in icount mode, + * %QEMU_CLOCK_VIRTUAL timers are run in the vCPU thread. This is + * not true of other timer lists, which are typically associated + * with an AioContext---each of them runs its timer callbacks in its own + * AioContext thread. * * Returns: a pointer to the timer */ -static inline QEMUTimer *timer_new_tl(QEMUTimerList *timer_list, - int scale, - QEMUTimerCB *cb, - void *opaque) +static inline QEMUTimer *timer_new_full(QEMUTimerListGroup *timer_list_gro= up, + QEMUClockType type, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) { QEMUTimer *ts =3D g_malloc0(sizeof(QEMUTimer)); - timer_init_tl(ts, timer_list, scale, cb, opaque); + timer_init_full(ts, timer_list_group, type, scale, attributes, cb, opa= que); return ts; } =20 @@ -544,21 +574,16 @@ static inline QEMUTimer *timer_new_tl(QEMUTimerList *= timer_list, * @cb: the callback to be called when the timer expires * @opaque: the opaque pointer to be passed to the callback * - * Create a new timer and associate it with the default - * timer list for the clock type @type. - * - * The default timer list has one special feature: in icount mode, - * %QEMU_CLOCK_VIRTUAL timers are run in the vCPU thread. This is - * not true of other timer lists, which are typically associated - * with an AioContext---each of them runs its timer callbacks in its own - * AioContext thread. + * Create a new timer with the given scale, + * and associate it with the default timer list for the clock type @type. + * See timer_new_full for details. * * Returns: a pointer to the timer */ static inline QEMUTimer *timer_new(QEMUClockType type, int scale, QEMUTimerCB *cb, void *opaque) { - return timer_new_tl(main_loop_tlg.tl[type], scale, cb, opaque); + return timer_new_full(&main_loop_tlg, type, scale, 0, cb, opaque); } =20 /** @@ -569,12 +594,7 @@ static inline QEMUTimer *timer_new(QEMUClockType type,= int scale, * * Create a new timer with nanosecond scale on the default timer list * associated with the clock. - * - * The default timer list has one special feature: in icount mode, - * %QEMU_CLOCK_VIRTUAL timers are run in the vCPU thread. This is - * not true of other timer lists, which are typically associated - * with an AioContext---each of them runs its timer callbacks in its own - * AioContext thread. + * See timer_new_full for details. * * Returns: a pointer to the newly created timer */ @@ -590,14 +610,9 @@ static inline QEMUTimer *timer_new_ns(QEMUClockType ty= pe, QEMUTimerCB *cb, * @cb: the callback to call when the timer expires * @opaque: the opaque pointer to pass to the callback * - * The default timer list has one special feature: in icount mode, - * %QEMU_CLOCK_VIRTUAL timers are run in the vCPU thread. This is - * not true of other timer lists, which are typically associated - * with an AioContext---each of them runs its timer callbacks in its own - * AioContext thread. - * * Create a new timer with microsecond scale on the default timer list * associated with the clock. + * See timer_new_full for details. * * Returns: a pointer to the newly created timer */ @@ -613,14 +628,9 @@ static inline QEMUTimer *timer_new_us(QEMUClockType ty= pe, QEMUTimerCB *cb, * @cb: the callback to call when the timer expires * @opaque: the opaque pointer to pass to the callback * - * The default timer list has one special feature: in icount mode, - * %QEMU_CLOCK_VIRTUAL timers are run in the vCPU thread. This is - * not true of other timer lists, which are typically associated - * with an AioContext---each of them runs its timer callbacks in its own - * AioContext thread. - * * Create a new timer with millisecond scale on the default timer list * associated with the clock. + * See timer_new_full for details. * * Returns: a pointer to the newly created timer */ @@ -631,6 +641,14 @@ static inline QEMUTimer *timer_new_ms(QEMUClockType ty= pe, QEMUTimerCB *cb, } =20 /** + * timer_get_attributes: + * @ts: the timer + * + * Return 0, or one to multiple OR'ed QEMU_TIMER_ATTR(id) values + */ +int timer_get_attributes(QEMUTimer *ts); + +/** * timer_deinit: * @ts: the timer to be de-initialised * diff --git a/tests/ptimer-test-stubs.c b/tests/ptimer-test-stubs.c index ca5cc3b..54b3fd2 100644 --- a/tests/ptimer-test-stubs.c +++ b/tests/ptimer-test-stubs.c @@ -34,14 +34,19 @@ int64_t ptimer_test_time_ns; int use_icount =3D 1; bool qtest_allowed; =20 -void timer_init_tl(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque) +void timer_init_full(QEMUTimer *ts, + QEMUTimerListGroup *timer_list_group, QEMUClockType t= ype, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) { - ts->timer_list =3D timer_list; + if (!timer_list_group) { + timer_list_group =3D &main_loop_tlg; + } + ts->timer_list =3D timer_list_group->tl[type]; ts->cb =3D cb; ts->opaque =3D opaque; ts->scale =3D scale; + ts->attributes =3D attributes; ts->expire_time =3D -1; } =20 diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 86bfe84..2046b68 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -339,17 +339,27 @@ int qemu_poll_ns(GPollFD *fds, guint nfds, int64_t ti= meout) } =20 =20 -void timer_init_tl(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque) +void timer_init_full(QEMUTimer *ts, + QEMUTimerListGroup *timer_list_group, QEMUClockType t= ype, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) { - ts->timer_list =3D timer_list; + if (!timer_list_group) { + timer_list_group =3D &main_loop_tlg; + } + ts->timer_list =3D timer_list_group->tl[type]; ts->cb =3D cb; ts->opaque =3D opaque; ts->scale =3D scale; + ts->attributes =3D attributes; ts->expire_time =3D -1; } =20 +int timer_get_attributes(QEMUTimer *ts) +{ + return ts->attributes; +} + void timer_deinit(QEMUTimer *ts) { assert(ts->expire_time =3D=3D -1); --=20 2.7.4 From nobody Thu Nov 6 06:13:31 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539765024874592.1265794260382; Wed, 17 Oct 2018 01:30:24 -0700 (PDT) Received: from localhost ([::1]:34508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gChDj-0002Kx-NP for importer@patchew.org; Wed, 17 Oct 2018 04:30:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCh9I-00074M-FI for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCh9H-0008If-EI for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:48 -0400 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:36383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCh9G-0008Hs-Vo for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:47 -0400 Received: by mail-lj1-x241.google.com with SMTP id p89-v6so23508342ljb.3 for ; Wed, 17 Oct 2018 01:25:46 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id h77-v6sm3897735ljf.59.2018.10.17.01.25.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Oct 2018 01:25:44 -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 :in-reply-to:references; bh=zyg44Uif53G31ksnw3X/NJ0wz9CjUxs2wFTXEedoS04=; b=fMCZMSaIehZExd7FAQKu6wqW5/6BuuvXgQTRGuVMFXeJ4WOWCLfDo4tQynyB9vKwbV SJAm9158F3fxtmgRwm1ZJiGlW0XpEQ0rMuICmT4PWv2eUkhf5MLRLHlkNEUJgwKlmP5z u1Re5PALZu99aktkNWQenETvmEGreItOXWJdxafqIc36iWyVoD1uLEnpUsE5WXDrii0X LAXwZqE8V8C/+PEb6XcCHtVBDksSbB1mWtI+eHAatjgsz4lCgE81MPv94l+P/iKSh3gR vnyiHc5DK/43RbZV3vJqV7iyUIn36+463kbc60AI22XbrF17LFjf9DQ9unxbMgnWKRB0 +Xlw== 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:in-reply-to:references; bh=zyg44Uif53G31ksnw3X/NJ0wz9CjUxs2wFTXEedoS04=; b=AXjf8wUpbN+BpT79kUKuaOwfH0GfyAFLGwGB9I4q/2sT6/2E14i3jdGmsgm1D2/8kX B8pMxWN1Bepysk3LDgl2pRlw95RoF1GfTPuoZwSZfo+q6gna2vRxQvzbi5gnhP9StlDH txoliK3bHFGIf+dVZjFlcd4BYnoedeX5neLzqbGT/QXpMAVS9k2WEhLTTS7udUhtEPOv vviexN5W7PYyzwzy8BgcRbgXsZ9BUytWCImEK05ZQ3Y8VkjYwH2/skoWFNMs3aKiwpSY qYlwZNDh9TPvap0/G4cpALLD/rdw3tkswcfo29Mjw5iOCHenPFmrprtZ7qlufCId93tN KA6g== X-Gm-Message-State: ABuFfoh62lgwbroW7c/y/q9eK4YEdh+nHyOClQcG16swqZDIFoBrT3x9 26H1Hrg6hssCi5N9iSqvkiIPoptZaCY= X-Google-Smtp-Source: ACcGV63eMul7xIrcnNRj/mt0f0Ql/Q5yDh+Qjcmi4pa2hTh/IoVWXZwWhL7yiyStT4gr5AQE6kE/zw== X-Received: by 2002:a2e:9e88:: with SMTP id f8-v6mr15979065ljk.142.1539764745155; Wed, 17 Oct 2018 01:25:45 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 14:24:20 +0600 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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::241 Subject: [Qemu-devel] [PATCH v2 3/4] Restores record/replay behavior related to special virtual clock processing for timers used in external subsystems. 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: Jan Kiszka , Gerd Hoffmann , Pavel Dovgalyuk , Samuel Thibault , Paolo Bonzini , Artem Pisarenko 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" Adds EXTERNAL attribute definition to qemu timers subsystem and assigns it = to virtual clock timers, used in slirp (ICMP IPv6) and ui (key queue). Virtual clock processing in rr mode reimplemented using this attribute. Fixes: 87f4fe7653baf55b5c2f2753fe6003f473c07342 Fixes: 775a412bf83f6bc0c5c02091ee06cf649b34c593 Fixes: 9888091404a702d7ec79d51b088d994b9fc121bd Signed-off-by: Artem Pisarenko --- Notes: v2: fixes race condition and reimplements synchronization between check= pointing and timers processing in qemu-timer.c include/qemu/timer.h | 12 +++++++++--- slirp/ip6_icmp.c | 4 +++- ui/input.c | 5 +++-- util/qemu-timer.c | 50 +++++++++++++++++++++++++++++++++++++++++++-----= -- 4 files changed, 58 insertions(+), 13 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index e225ad4..8e3f236 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -65,14 +65,20 @@ typedef enum { * instead each attribute in bit set accessed with QEMU_TIMER_ATTR_ ma= cro, * where is a unique part of attribute identifier. * - * No attributes defined currently. + * The following attributes are available: + * + * 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 + * with virtual clock type. */ =20 typedef enum { - QEMU_TIMER_ATTRBIT__NONE + QEMU_TIMER_ATTRBIT_EXTERNAL, } QEMUTimerAttrBit; =20 -#define QEMU_TIMER_ATTR__NONE (1 << QEMU_TIMER_ATTRBIT__NONE) +#define QEMU_TIMER_ATTR_EXTERNAL (1 << QEMU_TIMER_ATTRBIT_EXTERNAL) =20 typedef struct QEMUTimerList QEMUTimerList; =20 diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index ee333d0..cd1e0b9 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -27,7 +27,9 @@ void icmp6_init(Slirp *slirp) return; } =20 - slirp->ra_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, ra_timer_handler,= slirp); + slirp->ra_timer =3D timer_new_full(NULL, QEMU_CLOCK_VIRTUAL, + SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, + ra_timer_handler, slirp); timer_mod(slirp->ra_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + NDP_Interval); } diff --git a/ui/input.c b/ui/input.c index 51b1019..7c9a410 100644 --- a/ui/input.c +++ b/ui/input.c @@ -448,8 +448,9 @@ void qemu_input_event_send_key_delay(uint32_t delay_ms) } =20 if (!kbd_timer) { - kbd_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, qemu_input_queue_pr= ocess, - &kbd_queue); + kbd_timer =3D timer_new_full(NULL, QEMU_CLOCK_VIRTUAL, + SCALE_MS, QEMU_TIMER_ATTR_EXTERNAL, + qemu_input_queue_process, &kbd_queue); } if (queue_count < queue_limit) { qemu_input_queue_delay(&kbd_queue, kbd_timer, diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 2046b68..e9a0f00 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -494,6 +494,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) bool progress =3D false; QEMUTimerCB *cb; void *opaque; + bool need_replay_checkpoint =3D false; =20 if (!atomic_read(&timer_list->active_timers)) { return false; @@ -509,8 +510,15 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) break; default: case QEMU_CLOCK_VIRTUAL: - if (!replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL)) { - goto out; + 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. + */ + need_replay_checkpoint =3D true; } break; case QEMU_CLOCK_HOST: @@ -525,13 +533,38 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) break; } =20 + /* + * Extract expired timers from active timers list and and process them. + * + * 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". + */ current_time =3D qemu_clock_get_ns(timer_list->clock->type); - for(;;) { - qemu_mutex_lock(&timer_list->active_timers_lock); - ts =3D timer_list->active_timers; + qemu_mutex_lock(&timer_list->active_timers_lock); + while ((ts =3D timer_list->active_timers)) { if (!timer_expired_ns(ts, current_time)) { + /* No expired timers left. + * (If rr checkpoint was needed, it either already handled, + * or may be skipped.) */ + break; + } + if (need_replay_checkpoint + && !(ts->attributes & QEMU_TIMER_ATTR_EXTERNAL)) { + /* once we got here, checkpoint clock only once */ + need_replay_checkpoint =3D false; qemu_mutex_unlock(&timer_list->active_timers_lock); - break; + if (!replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL)) { + goto out; + } + qemu_mutex_lock(&timer_list->active_timers_lock); + /* it's better to start over again, + * just in case if timer list was modified + */ + continue; } =20 /* remove timer from the list before calling the callback */ @@ -540,12 +573,15 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) ts->expire_time =3D -1; cb =3D ts->cb; opaque =3D ts->opaque; - qemu_mutex_unlock(&timer_list->active_timers_lock); =20 /* run the callback (the timer list can be modified) */ + qemu_mutex_unlock(&timer_list->active_timers_lock); cb(opaque); + qemu_mutex_lock(&timer_list->active_timers_lock); + progress =3D true; } + qemu_mutex_unlock(&timer_list->active_timers_lock); =20 out: qemu_event_set(&timer_list->timers_done_ev); --=20 2.7.4 From nobody Thu Nov 6 06:13:31 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539765030693318.66576576555883; Wed, 17 Oct 2018 01:30:30 -0700 (PDT) Received: from localhost ([::1]:34509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gChDp-0002Qj-C3 for importer@patchew.org; Wed, 17 Oct 2018 04:30:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCh9J-00075R-Ms for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCh9I-0008Jc-Oa for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:49 -0400 Received: from mail-lj1-x242.google.com ([2a00:1450:4864:20::242]:41688) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCh9I-0008Ic-Ed for qemu-devel@nongnu.org; Wed, 17 Oct 2018 04:25:48 -0400 Received: by mail-lj1-x242.google.com with SMTP id u21-v6so23469859lja.8 for ; Wed, 17 Oct 2018 01:25:48 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id h77-v6sm3897735ljf.59.2018.10.17.01.25.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Oct 2018 01:25:45 -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 :in-reply-to:references; bh=ZYjn/vYGFuPfM/3O21pjNuxhUP/+Csm9i9XUyBvxbN0=; b=AfLJpK7hJsyHoTx2/B8lLK3+aWfikRv4k/rhzKPerbkjh6O/gpOoXmHwcB9bcUvPw4 /6up8klxDJDRxaDCVqa/TFHqJjOZBeCNFI1trPexDFEqtmZ0DTykfFsVlP9Y+kljbCnG fMAPC+h02KwSTeAnCqh3ibz9Kf1Dv4NsetsBJb8izzc7Q28f6ZPvydlHGAmsvsFENkV6 gavGhqDxWKpCZDoCtg+FLPtjMH5TT6oEHil0l5jKXnmp2foQ+5Y1IuonGZZL+j9rA18U +XXtg1hWsyyCY05bBTuWEJoDFipgVPRV0raIvQRh/auA8alXczU5qkJcG1egLSno3Y6i iTqA== 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:in-reply-to:references; bh=ZYjn/vYGFuPfM/3O21pjNuxhUP/+Csm9i9XUyBvxbN0=; b=FHOsKnAjXKSTPu8d/I0aO4zwGPuUFSwYpPdr1hG8/JJSBIi/QDfii3KMkmsh5Nlf77 CYs+igXyH/NBD8YTPc4PYdL+XDAjCble2kZjey0XejFVenAHMysFS56lNQpP9IZw7jjH dXmIehaS2Jj/yW7r26FqOVBNXzqItI8tyCapX1QW2DvqRX6L2mdWq85h8LKyZmDgERoI XutE95PL4FsCtc7kGYds2Odt+InpXorTgZLUX5yFcVLCzha/ycjU+xsp7rlGQXQhmy0C BKnQFqIiy+0zb43gM6xbTyIuCk6Of2StX3NYJew4Xs+CpcdhpVSKtLUzCsDEY8MAzayr V7kQ== X-Gm-Message-State: ABuFfoiTNZkoYCluRtwTg6rbAYMdOq+DcQw0edsGvYgshWOVSK46Sffs a7DMi2IZrfex86U3wzId5uLfZWR2VDo= X-Google-Smtp-Source: ACcGV62TSvwe6z4gzJyzwhz97mqxMRwRin4co0Y42JjEx2MYiE6UAt9z9iiiX3cdejut23tYc4IkVA== X-Received: by 2002:a2e:8457:: with SMTP id u23-v6mr14311515ljh.154.1539764746553; Wed, 17 Oct 2018 01:25:46 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2018 14:24:21 +0600 Message-Id: <549dbf4ebfa4c82051d01a264c27f88929fc277b.1539764043.git.artem.k.pisarenko@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: 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::242 Subject: [Qemu-devel] [PATCH v2 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 --- 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 8e3f236..bd627dc 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -70,7 +70,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 e9a0f00..7315ca1 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -495,6 +495,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) QEMUTimerCB *cb; void *opaque; bool need_replay_checkpoint =3D false; + ReplayCheckpoint replay_checkpoint_id; =20 if (!atomic_read(&timer_list->active_timers)) { return false; @@ -505,43 +506,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); @@ -557,7 +555,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