From patchwork Sun Oct 14 14:55:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Pisarenko X-Patchwork-Id: 10640669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B514E112B for ; Sun, 14 Oct 2018 14:57:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0F3F25223 for ; Sun, 14 Oct 2018 14:57:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 925B328E8F; Sun, 14 Oct 2018 14:57:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 178E525223 for ; Sun, 14 Oct 2018 14:57:59 +0000 (UTC) Received: from localhost ([::1]:48641 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBhqA-0000yq-99 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 14 Oct 2018 10:57:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBhox-0008LX-8h for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:56:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBhot-0002MU-4m for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:56:43 -0400 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:43530) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gBhos-0002BB-RD for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:56:39 -0400 Received: by mail-lj1-x243.google.com with SMTP id r8-v6so15208521ljc.10 for ; Sun, 14 Oct 2018 07:56:38 -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=MQMAve9qAuvPsobeD1xmEjXP2Dp+ucvJJIwHuZAMQB8=; b=VQpRVALN8VbiEN2ZD36KhAtJ2FCmw7v9pMymEGCnHvFLFrWk7DbsDvUoyw7OYEN90m jdWJyt/HmbG4PguR7RkVovf8C+xC7rjWtiQJXkzYOk8x9+guErhhSQFmog6B8XUGwsin WPjNLj5OmdrvTCGO86ZGGOLm0Qd+r6+RTBAo1y7AALpMyuLA70gooME6IvO8YI/8MtFp 6D81TuALslEvjx2RJYwCW50ae8DcKCyDi3pHeK6CBS41nqQEonrg3QbeK/DROIN7vqbL hKi5PyWviCAgjAfFjxRvzDT8xojxyyRq966bizNwQcc2RzWMPcO6y2QASKOTImt4lJc6 kk+g== 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=MQMAve9qAuvPsobeD1xmEjXP2Dp+ucvJJIwHuZAMQB8=; b=HQ1SV4Op5bR7rgVo+BxctMSw8LhVgHFSVUjqLjg0DSLOARLf2vj6qJyk2R/fjJ21U9 T6ihSjRmXUw1B5JgazBMSlN/9G92ssPXbRoena8CY5hBKkEUP2ZcqqXuBknbnWJODdUa yEe0aLc8g+bUW/6ofYii8rTFFmBGprkHKqo5Kx5ZOutjIsPsLSSyjwW3Zkc0VVfUIGAC Iye4bm4GXs+xkE5rgXCxmEjTiqeJeC9qLCv/xCqWUwIHlJ9vkDZLVT57QRmrIusTvier 3bO9U8CcFPHfdfvoLQVyH/605UANoNVfGfC48uIdv5qKR58Vzh19OkDaL5gJBB6ussLx kjaQ== X-Gm-Message-State: ABuFfoh2+KiHlVjs6NO19YKhktDw/vafT3kG3EQkQN9AsLQxgtC8FB6+ 48SRSvlt6i95PyzvOT+/wEuG4dD6rQY= X-Google-Smtp-Source: ACcGV63u29A5fKlCV3azybC+r+94omu1AeDPMnDnVpkatulit80wLWPqIjp8e33juxDi5SII//rnMg== X-Received: by 2002:a2e:20f:: with SMTP id 15-v6mr8467692ljc.141.1539528996811; Sun, 14 Oct 2018 07:56:36 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id b29-v6sm1516654lfj.81.2018.10.14.07.56.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Oct 2018 07:56:36 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Sun, 14 Oct 2018 20:55:07 +0600 Message-Id: <9b0f2ac8f5579c34806276315e32c465c06c5c8e.1539528213.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::243 Subject: [Qemu-devel] [PATCH 1/3] Revert some patches from recent series [PATCH v6] "Fixing record/replay and adding reverse debugging", which introduced new virtual clock type for use in external subsystems. These changes breaks desired behavior in non-record/replay usage scenarios. 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. - * */ typedef enum { @@ -57,7 +49,6 @@ typedef enum { QEMU_CLOCK_VIRTUAL = 1, QEMU_CLOCK_HOST = 2, QEMU_CLOCK_VIRTUAL_RT = 3, - QEMU_CLOCK_VIRTUAL_EXT = 4, QEMU_CLOCK_MAX } QEMUClockType; 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 = 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); } @@ -27,10 +27,9 @@ void icmp6_init(Slirp *slirp) return; } - slirp->ra_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL_EXT, - ra_timer_handler, slirp); + slirp->ra_timer = 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); } 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 = QTAILQ_FIRST(queue); switch (item->type) { case QEMU_INPUT_QUEUE_DELAY: - 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); return; case QEMU_INPUT_QUEUE_EVENT: @@ -301,7 +301,7 @@ static void qemu_input_queue_delay(struct QemuInputEventQueueHead *queue, queue_count++; 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) } if (!kbd_timer) { - kbd_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL_EXT, - qemu_input_queue_process, &kbd_queue); + kbd_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, 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 eb60d8f..86bfe84 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -496,7 +496,6 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) 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 { From patchwork Sun Oct 14 14:55:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Pisarenko X-Patchwork-Id: 10640671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8C5B13AD for ; Sun, 14 Oct 2018 14:58:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A65592A109 for ; Sun, 14 Oct 2018 14:58:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 971DB2A10C; Sun, 14 Oct 2018 14:58:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id AE5B42A109 for ; Sun, 14 Oct 2018 14:58:51 +0000 (UTC) Received: from localhost ([::1]:48644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBhr0-0001cn-T1 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 14 Oct 2018 10:58:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBhpM-0000Bw-9H for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:57:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBhpF-0003KL-Qk for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:57:08 -0400 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:43531) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gBhpF-0003Jj-Ah; Sun, 14 Oct 2018 10:57:01 -0400 Received: by mail-lj1-x244.google.com with SMTP id r8-v6so15208933ljc.10; Sun, 14 Oct 2018 07:57:00 -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=KOam1urfSvH8JuKO+fP4YO02VluG1J2vB92scTe9LdY=; b=kOUa5ZRw8lZoA3qbPLrlyhWfK7PQWQQvJ4X3qgE68CoehwmVanh+Z2HnXf9HZzfMrg E5p4XTRgs9Pi6wcqS6gq7RXZfdWvMwd3NaonP8oTuvAyNkeVlUn/+Y4O+JnFgYiuvZtO fsFXVv/LnyT6UulQlKHytYEMB0nrUfJTYRIRZW2otlKzsQgucpQqfgUwmo3j2RrM7pMi C1Wu/7AT2QvvXMQKzgfmuxqgbTXsmXwmeK2KiXX8i2ZjwbD3ExwsME7TmcGhXocTYh0Y eCQMdYqvmAUYmjB06BM9CBNw31CWKnapRPxbLPnDFlA1/DkTkw5x5swgHTYjK0bwqDTf 2ooQ== 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=KOam1urfSvH8JuKO+fP4YO02VluG1J2vB92scTe9LdY=; b=WvonOvjxfErdoPNdLVGhNAZNo5yjeI9htP15eDu82VQuR/zaY0PjhIiHM2Rq+L/IFD qlwZT763twpYQuMilVs/70S1pEEln8+mnJIgk4lPhYroZmsAinFFyKyaBKEr7feraV7X UKd+WW3tT3mj5JwmaVuwjlBKJl3jG6gbHgTAL3ymZy1ZyhhPrvI74GgdXwYMLoVprUkJ qHZwnon6G1OvXAAFWbRMZpZIpQH38YuFQns+S94U4EtW9iFPFkP2KQgi0TQNygmNUZsr +6hwHa9HWANhIaa1qwWQue63hnDE3PXqSw7q/4pO8utJPMRho+0W91/32XGB2KzbCqmN wrhA== X-Gm-Message-State: ABuFfogfihKnubUlSAeAJxiADYflzRMPDPP0cxFEXrKz7wArOrhwHBkc /r+NtTbXbJ6nJtMTATDDLbaIcqB7Yb0= X-Google-Smtp-Source: ACcGV60H5aauD7D4DTOZpc17sjELYMrEiyA+bnwn+dvo5NytADm2aAG6+oGWxjh7Pyt6tCbQ4G0Zjw== X-Received: by 2002:a2e:e09:: with SMTP id 9-v6mr8383941ljo.159.1539529019210; Sun, 14 Oct 2018 07:56:59 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id b29-v6sm1516654lfj.81.2018.10.14.07.56.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Oct 2018 07:56:58 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Sun, 14 Oct 2018 20:55:08 +0600 Message-Id: <442bb618199daa309d3191a5ee848e659a46c0ce.1539528213.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::244 Subject: [Qemu-devel] [PATCH 2/3] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Attributes are simple flags, associated with individual timers for their whole lifetime. They intended to be used to mark individual timers for special handling by various qemu features operating at qemu core level. Existing timer, aio and coroutine interface extended with attribute-enabled variants of functions, which create/initialize timers. Signed-off-by: Artem Pisarenko --- Notes: Conversion and association between QEMUTimerAttrBit and accessor macro are dumb. Maybe better alternatives exist (like QFlags in Qt framework) or existing qemu code may be reused, if any. Attributes also may be better named as flags, but they looks like something volatile, whereas 'attribute' expresses constant nature better. include/block/aio.h | 50 +++++++++++++++++++- include/qemu/coroutine.h | 5 +- include/qemu/timer.h | 110 ++++++++++++++++++++++++++++++++++++++------ tests/ptimer-test-stubs.c | 7 +-- util/qemu-coroutine-sleep.c | 6 ++- util/qemu-timer.c | 12 +++-- 6 files changed, 165 insertions(+), 25 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index f08630c..a6be3fb 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -407,10 +407,35 @@ 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_a_tl(ctx->tlg.tl[type], scale, 0, cb, opaque); } /** + * aio_timer_new_a: + * @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. Use that + * unless you really need dynamic memory allocation. + * + * Returns: a pointer to the new timer + */ +static inline QEMUTimer *aio_timer_new_a(AioContext *ctx, QEMUClockType type, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) +{ + return timer_new_a_tl(ctx->tlg.tl[type], scale, attributes, cb, opaque); +} + + +/** * aio_timer_init: * @ctx: the aio context * @ts: the timer @@ -427,7 +452,28 @@ static inline void aio_timer_init(AioContext *ctx, int scale, QEMUTimerCB *cb, void *opaque) { - timer_init_tl(ts, ctx->tlg.tl[type], scale, cb, opaque); + timer_init_a_tl(ts, ctx->tlg.tl[type], scale, 0, cb, opaque); +} + +/** + * aio_timer_init_a: + * @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_a(AioContext *ctx, + QEMUTimer *ts, QEMUClockType type, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) +{ + timer_init_a_tl(ts, ctx->tlg.tl[type], scale, attributes, cb, opaque); } /** diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h index 9801e7f..cffc2b2 100644 --- a/include/qemu/coroutine.h +++ b/include/qemu/coroutine.h @@ -276,7 +276,10 @@ void qemu_co_rwlock_unlock(CoRwlock *lock); /** * Yield the coroutine for a given duration */ -void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns); +#define qemu_co_sleep_ns(type, ns) \ + qemu_co_sleep_a_ns(type, 0, ns) +void coroutine_fn qemu_co_sleep_a_ns(QEMUClockType type, int attributes, + int64_t ns); /** * Yield until a file descriptor becomes readable diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 39ea907..031e3a1 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -52,6 +52,28 @@ typedef enum { QEMU_CLOCK_MAX } QEMUClockType; +/** + * 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 property. + * 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(id) macro, + * where 'id' is a unique part of attribute identifier. + * + * No attributes defined currently. + */ + +typedef enum { + /* none */ +} QEMUTimerAttrBit; + +#define QEMU_TIMER_ATTR(id) (1 << QEMU_TIMER_ATTRBIT_ ## id) + typedef struct QEMUTimerList QEMUTimerList; struct QEMUTimerListGroup { @@ -67,6 +89,7 @@ struct QEMUTimer { QEMUTimerCB *cb; void *opaque; QEMUTimer *next; + int attributes; int scale; }; @@ -418,10 +441,11 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg); */ /** - * timer_init_tl: + * timer_init_a_tl: * @ts: the timer to be initialised * @timer_list: the timer list to attach the timer to * @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 * @@ -431,9 +455,9 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg); * 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_a_tl(QEMUTimer *ts, + QEMUTimerList *timer_list, int scale, int attributes, + QEMUTimerCB *cb, void *opaque); /** * timer_init: @@ -452,7 +476,29 @@ void timer_init_tl(QEMUTimer *ts, 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_a_tl(ts, main_loop_tlg.tl[type], scale, 0, cb, opaque); +} + +/** + * timer_init_a: + * @ts: the timer to be initialised + * @type: the clock to associate with the timer + * @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 call when the timer expires + * @opaque: the opaque pointer to pass to the callback + * + * Initialize a timer with the given scale and attributes 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. + */ +static inline void timer_init_a(QEMUTimer *ts, QEMUClockType type, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) +{ + timer_init_a_tl(ts, main_loop_tlg.tl[type], scale, attributes, cb, opaque); } /** @@ -513,9 +559,10 @@ static inline void timer_init_ms(QEMUTimer *ts, QEMUClockType type, } /** - * timer_new_tl: + * timer_new_a_tl: * @timer_list: the timer list to attach the timer to * @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 * @@ -527,13 +574,13 @@ static inline void timer_init_ms(QEMUTimer *ts, QEMUClockType type, * * 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_a_tl(QEMUTimerList *timer_list, + int scale, int attributes, + QEMUTimerCB *cb, + void *opaque) { QEMUTimer *ts = g_malloc0(sizeof(QEMUTimer)); - timer_init_tl(ts, timer_list, scale, cb, opaque); + timer_init_a_tl(ts, timer_list, scale, attributes, cb, opaque); return ts; } @@ -544,8 +591,8 @@ 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. + * Create a new timer with the given scale, + * 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 @@ -558,7 +605,34 @@ static inline QEMUTimer *timer_new_tl(QEMUTimerList *timer_list, 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_a_tl(main_loop_tlg.tl[type], scale, 0, cb, opaque); +} + +/** + * timer_new_a: + * @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 with the given scale and attributes, + * 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. + * + * Returns: a pointer to the timer + */ +static inline QEMUTimer *timer_new_a(QEMUClockType type, + int scale, int attributes, + QEMUTimerCB *cb, void *opaque) +{ + return timer_new_a_tl(main_loop_tlg.tl[type], + scale, attributes, cb, opaque); } /** @@ -631,6 +705,14 @@ static inline QEMUTimer *timer_new_ms(QEMUClockType type, QEMUTimerCB *cb, } /** + * 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..5c5a7f7 100644 --- a/tests/ptimer-test-stubs.c +++ b/tests/ptimer-test-stubs.c @@ -34,14 +34,15 @@ int64_t ptimer_test_time_ns; int use_icount = 1; bool qtest_allowed; -void timer_init_tl(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque) +void timer_init_a_tl(QEMUTimer *ts, + QEMUTimerList *timer_list, int scale, int attributes, + QEMUTimerCB *cb, void *opaque) { ts->timer_list = timer_list; ts->cb = cb; ts->opaque = opaque; ts->scale = scale; + ts->attributes = attributes; ts->expire_time = -1; } diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c index afb678f..d54ed09 100644 --- a/util/qemu-coroutine-sleep.c +++ b/util/qemu-coroutine-sleep.c @@ -31,7 +31,8 @@ static void co_sleep_cb(void *opaque) aio_co_wake(sleep_cb->co); } -void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns) +void coroutine_fn qemu_co_sleep_a_ns(QEMUClockType type, int attributes, + int64_t ns) { AioContext *ctx = qemu_get_current_aio_context(); CoSleepCB sleep_cb = { @@ -46,7 +47,8 @@ void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns) __func__, scheduled); abort(); } - sleep_cb.ts = aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, &sleep_cb); + sleep_cb.ts = aio_timer_new_a(ctx, type, SCALE_NS, attributes, + co_sleep_cb, &sleep_cb); timer_mod(sleep_cb.ts, qemu_clock_get_ns(type) + ns); qemu_coroutine_yield(); timer_del(sleep_cb.ts); diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 86bfe84..29d8e39 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -339,17 +339,23 @@ int qemu_poll_ns(GPollFD *fds, guint nfds, int64_t timeout) } -void timer_init_tl(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque) +void timer_init_a_tl(QEMUTimer *ts, + QEMUTimerList *timer_list, int scale, int attributes, + QEMUTimerCB *cb, void *opaque) { ts->timer_list = timer_list; ts->cb = cb; ts->opaque = opaque; ts->scale = scale; + ts->attributes = attributes; ts->expire_time = -1; } +int timer_get_attributes(QEMUTimer *ts) +{ + return ts->attributes; +} + void timer_deinit(QEMUTimer *ts) { assert(ts->expire_time == -1); From patchwork Sun Oct 14 14:55:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Pisarenko X-Patchwork-Id: 10640673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 32547112B for ; Sun, 14 Oct 2018 15:00:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 213F32A10E for ; Sun, 14 Oct 2018 15:00:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14E722A111; Sun, 14 Oct 2018 15:00:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 85F922A10E for ; Sun, 14 Oct 2018 15:00:06 +0000 (UTC) Received: from localhost ([::1]:48655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBhsD-0002UK-Uf for patchwork-qemu-devel@patchwork.kernel.org; Sun, 14 Oct 2018 11:00:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBhpb-0000Ow-Ln for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:57:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBhpR-0003WN-RE for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:57:18 -0400 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]:39983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gBhpO-0003Pg-5t for qemu-devel@nongnu.org; Sun, 14 Oct 2018 10:57:12 -0400 Received: by mail-lj1-x241.google.com with SMTP id r83-v6so15208788ljr.7 for ; Sun, 14 Oct 2018 07:57:08 -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=O20jC3QsUYZtTk3J0luh6RD4XXRD3tfo9DOulOBOi7g=; b=lNy0USZ56Jc+1foUW7p2JRIu0GJdwSoUeDjgZ3KOhODBnttrIJyXRGAVqXvAJNOXBg GLXzCMkEgfkLadql9aElng1TLDKLXsLPDYlCU1x7LMK0sLJci7cMwBD/34UHjI5xk9Fi 1IqmlQzZHT5Rtnj0IMTkrFrnXAcKsAX8+sXaimzKuHmA2ehVAH4XYjYZfLarhk5x0K4a dM01Zea2GMlvvfI4vAyib3d/bRV7s24a4PKe9gbByyxC4UApvkmAi0sbVUmMfwdyp0MG ZKVBm9MAe8OYNSbkC8oZfdGiS+Yd1Gk6F1H50dEron5nClATcasV/iAr71kr1N0DfJNn BYmQ== 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=O20jC3QsUYZtTk3J0luh6RD4XXRD3tfo9DOulOBOi7g=; b=FoGnp1Xh2k2iM7Dr6UXaok1E72MC0Is516Mb51eUWpl1OjNNgQZBOWWtDo1mFzyKGR WGLd5zMx3U95RPQ5GglMoX75Ax3Q+tcoh8fnW8SmKwlfpbExwEjbHhPCfSPo3lERRby6 v3fwLDt87ZZudJQdfkmcNkDfyv6iInI062yc6pQ7hCO3uIbtni71oFR9615gqsBi74wJ Cjibe1WxEnrot9mlq/+cfX9+LUyvOvYPq5tUaznseCoggOCvFs1vxKIl99JxMR9maW5I MCpWpdL2u5zdKQgE8qhg7tOjADjAHmQzKFIS8dTjiX8emIOvsVGAcCYlb6E0Of8HL6aX jtug== X-Gm-Message-State: ABuFfojoXGUhfFq7jSRgE8+5lth69UbYcG3CLQHLBAFoeodjUl6r8Oqs hgaCgGiUFY42jYIqw0UOZBCa4JvmXfs= X-Google-Smtp-Source: ACcGV60SzeKGydwJEXASabFDDfCMfiybYxuQ/qezSHl2FJNFmSwY8Zg61FAaf2gUZDQQ+4iitncLQg== X-Received: by 2002:a2e:9e88:: with SMTP id f8-v6mr8553489ljk.142.1539529026824; Sun, 14 Oct 2018 07:57:06 -0700 (PDT) Received: from localhost.localdomain ([77.221.221.49]) by smtp.gmail.com with ESMTPSA id b29-v6sm1516654lfj.81.2018.10.14.07.57.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Oct 2018 07:57:06 -0700 (PDT) From: Artem Pisarenko To: qemu-devel@nongnu.org Date: Sun, 14 Oct 2018 20:55:09 +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 3/3] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- include/qemu/timer.h | 10 ++++++-- slirp/ip6_icmp.c | 4 +++- ui/input.c | 5 ++-- util/qemu-timer.c | 67 ++++++++++++++++++++++++++++++++++++---------------- 4 files changed, 60 insertions(+), 26 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 031e3a1..53bfba5 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -65,11 +65,17 @@ typedef enum { * instead each attribute in bit set accessed with QEMU_TIMER_ATTR(id) macro, * where 'id' 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 could be + * used for the subsystems that operate outside the guest core. Applicable only + * with virtual clock type. */ typedef enum { - /* none */ + QEMU_TIMER_ATTRBIT_EXTERNAL, } QEMUTimerAttrBit; #define QEMU_TIMER_ATTR(id) (1 << QEMU_TIMER_ATTRBIT_ ## id) diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c index ee333d0..7c08433 100644 --- a/slirp/ip6_icmp.c +++ b/slirp/ip6_icmp.c @@ -27,7 +27,9 @@ void icmp6_init(Slirp *slirp) return; } - slirp->ra_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, ra_timer_handler, slirp); + slirp->ra_timer = timer_new_a(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..6279187 100644 --- a/ui/input.c +++ b/ui/input.c @@ -448,8 +448,9 @@ void qemu_input_event_send_key_delay(uint32_t delay_ms) } if (!kbd_timer) { - kbd_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, qemu_input_queue_process, - &kbd_queue); + kbd_timer = timer_new_a(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 29d8e39..8c6d1cb 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -490,6 +490,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) bool progress = false; QEMUTimerCB *cb; void *opaque; + bool need_replay_checkpoint = false; if (!atomic_read(&timer_list->active_timers)) { return false; @@ -500,28 +501,52 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) goto out; } - switch (timer_list->clock->type) { - case QEMU_CLOCK_REALTIME: - break; - default: - case QEMU_CLOCK_VIRTUAL: - if (!replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL)) { - goto out; - } - 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; - } - current_time = qemu_clock_get_ns(timer_list->clock->type); + + if (replay_mode != REPLAY_MODE_NONE) { + switch (timer_list->clock->type) { + case QEMU_CLOCK_REALTIME: + break; + default: + case QEMU_CLOCK_VIRTUAL: + /* Check whether there are pending timers used for external + * subsystems, before doing replay checkpoint. If there are only + * such timers, then checkpoint will be redundant, because these + * timers don't change guest state directly. + * Procedure optimized to finish traversing timer list quickly, + * because it's a rare condition. + */ + qemu_mutex_lock(&timer_list->active_timers_lock); + ts = timer_list->active_timers; + while (timer_expired_ns(ts, current_time)) { + if (!(ts->attributes & QEMU_TIMER_ATTR(EXTERNAL))) { + need_replay_checkpoint = true; + break; + } + ts = ts->next; + } + qemu_mutex_unlock(&timer_list->active_timers_lock); + if (!need_replay_checkpoint) { + break; + } + + if (!replay_checkpoint(CHECKPOINT_CLOCK_VIRTUAL)) { + goto out; + } + 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; + } + } + for(;;) { qemu_mutex_lock(&timer_list->active_timers_lock); ts = timer_list->active_timers;