From patchwork Wed Mar 13 10:55:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 780027 Delivered-To: patch@linaro.org Received: by 2002:adf:f741:0:b0:33e:7753:30bd with SMTP id z1csp112629wrp; Wed, 13 Mar 2024 03:56:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZLkla1HVuo34rPXtPysjTxBXYvhkORp9PARO2R0zSF4G/UcqNXjmX/0OGLtPq/7oO+1f6lSbtx+KZuVUxskI+ X-Google-Smtp-Source: AGHT+IGvppUvqNrDpUaaNynRxwDd4quaJP9NPC0NQgWLpYmGR9RV2zI80aRpZACPPLJ3m2G0AP/r X-Received: by 2002:a05:6808:1187:b0:3c1:c124:6d4d with SMTP id j7-20020a056808118700b003c1c1246d4dmr4592451oil.56.1710327389024; Wed, 13 Mar 2024 03:56:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710327388; cv=none; d=google.com; s=arc-20160816; b=Fhf5RyJBXQx7hqE90rlDldf3ztRKbD8YYEEFU/KBHVVN0FuaqvpUkFFqmNY14uZ3/a LJwGa4be9hT2k/odFh8fCPKl0Pfdkv6+OLE4C8miIGvo1oJMW2O6rtPzW8Fd2Uyx21c5 JwjHShtDRoUBoxFPSid3XMzef/N5GqRBGf/dYYD0S3fUSCJokzf6VfKbBgG+2BvmV1wV TkITveEqaju8hABvh7oSjbsJi+uScVVv6KCEZ4CMUHyCwpaJ/+gsgX0EG2EK/6WrsMZg RlZZcT1IHN5f6LN9OSlTTMlWRGl2GqAA9AV5rYXoFnh/aIv+a6KtMU3WNQIOFttgAky0 8XcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o6QDwYzo62XZFD/GhIgkJ+Hn9SLx+3ew7YSnia2dKPw=; fh=SOx5jGRISimNYto+GAJnnbqozdA4y+bYXtSuueN6vdQ=; b=uBJ2g+LpO20kand5B/cHmRv+G8xG3ptcXaBz9eIvraBXWQFHVVtHp7Wn4nD3l5I9kH vPVzHrmTwfR5zaiFaU+HUOxOcWlgX+L9hSPJaC2BSV77UsfmSwhm8Gg98BdS/aa2fekO Zzh2KgdSWVYjuBctiQg047woX0la7Ref8kDTQh6vtFINAtYyHWixOm0IxR9m6kv+ozwI yvRDkk+y8eFsvLHtZSgJ0t9a0fLMjc6NM+n7e+ts5X84HJMSA8BvKsL2YevFc1NwFvMG 0NrOHayfiOwvHUzEZQ3NOIs4PiSbAeXs/O1NjfCoWPyWJhp73XpXZTKe9MxGASdbw8hX aV1Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KbZcYWxH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a24-20020a05620a103800b00788257bc19dsi9156682qkk.634.2024.03.13.03.56.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 03:56:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KbZcYWxH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkMH1-0005Mq-4P; Wed, 13 Mar 2024 06:55:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rkMGs-0005Fr-GA for qemu-devel@nongnu.org; Wed, 13 Mar 2024 06:55:44 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkMGf-0007BD-Ja for qemu-devel@nongnu.org; Wed, 13 Mar 2024 06:55:32 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-33eaafc4419so494717f8f.0 for ; Wed, 13 Mar 2024 03:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710327327; x=1710932127; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o6QDwYzo62XZFD/GhIgkJ+Hn9SLx+3ew7YSnia2dKPw=; b=KbZcYWxHGSTdiKxGQwf0+6YciI+lXCywEJNgh8RUOjVXxU4loeOeb3Esp4e2snRgd9 H2Z0REjfzgaKDNVgPjMDDDnLDjhKPeI41Eh/zxWsaKvJLwQRcvaiJVsKOvbD/g/Pgx2+ bq8d7VtP3LsQsjbiIIgEcfwGfaRQJOyW0W/z1oYzlUWGyrDCKuaoGON1XOSz3RzYsADo s82UoJbgG0jjsbxyF86ju3V1PcL36Ie/aEoDx3qq+e585lkeH6ErPbzhD6r//pJ0Hq86 aHIb1f+Mtxb+0q0vhduU79/+XQR7oeXP9JQAc0Dsysq5c5m9rEBKsej3U4NJZnZLnCJM LJmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710327327; x=1710932127; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o6QDwYzo62XZFD/GhIgkJ+Hn9SLx+3ew7YSnia2dKPw=; b=Drw9uJdb4Bw3jnbTZmsp7bNlR2N/5wRNS5CvL/1x4WE9hg1+ADtf9fp7xHfuI9bTcK qjQp5EJ9c86S3mqGXFbuQ6v59qcCIENmlXPF2pzSgoZEBgBHK5MCcu8ihZtsOCBEtihP 5UtDUQQxqFk4R7H8wA1HoGDaTavI16nQJ7hob5z2CHhf4k5rdBYk8kDpx5TCcxjHmuNG r7xC5M7noVNzwstFn2ETCaK/quNxt72O0BBuI3OmquQB/11cPDJdlowLymYJj0WcOWh9 IUNvCTfyWGBKikztBEVF84Zov+6nsI5XpZ9HHH0c/f3MMZJI6XA+o026RpCqoIbyYv4x Hp6Q== X-Gm-Message-State: AOJu0YzBc96NTei2QXGMoUBnhcZnbxPQlwR/c2gyvrjKrgqaaxlB6PJN haP5/fz85+GSv8c2caWecdOhCgG5YJsSfSwl7fCC9t2hwqMfE4vFUrBCHUFCM949+OPsIgQbWpk k1lw= X-Received: by 2002:a5d:5956:0:b0:33e:621e:35b2 with SMTP id e22-20020a5d5956000000b0033e621e35b2mr1808362wri.6.1710327327323; Wed, 13 Mar 2024 03:55:27 -0700 (PDT) Received: from linaro.. ([102.35.208.160]) by smtp.gmail.com with ESMTPSA id w17-20020adfee51000000b0033e1be7f3d8sm11390338wro.70.2024.03.13.03.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 03:55:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Alexandre Iooss , Richard Henderson , Laurent Vivier , Thomas Huth , Pierrick Bouvier , Mahmoud Mandour , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [RFC PATCH 3/5] sysemu: generalise qtest_warp_clock as qemu_clock_advance_virtual_time Date: Wed, 13 Mar 2024 14:55:02 +0400 Message-Id: <20240313105504.341875-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240313105504.341875-1-pierrick.bouvier@linaro.org> References: <20240313105504.341875-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=pierrick.bouvier@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée Move the key functionality of moving time forward into the clock sub-system itself. This will allow us to plumb in time control into plugins. Signed-off-by: Alex Bennée --- include/qemu/timer.h | 15 +++++++++++++++ system/qtest.c | 25 +++---------------------- util/qemu-timer.c | 26 ++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 9a366e551fb..910587d8293 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -245,6 +245,21 @@ bool qemu_clock_run_timers(QEMUClockType type); */ bool qemu_clock_run_all_timers(void); +/** + * qemu_clock_advance_virtual_time(): advance the virtual time tick + * @target: target time in nanoseconds + * + * This function is used where the control of the flow of time has + * been delegated to outside the clock subsystem (be it qtest, icount + * or some other external source). You can ask the clock system to + * return @early at the first expired timer. + * + * Time can only move forward, attempts to reverse time would lead to + * an error. + * + * Returns: new virtual time. + */ +int64_t qemu_clock_advance_virtual_time(int64_t dest); /* * QEMUTimerList diff --git a/system/qtest.c b/system/qtest.c index ee8b139e982..e6f6b4e62d5 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -337,26 +337,6 @@ void qtest_set_virtual_clock(int64_t count) qatomic_set_i64(&qtest_clock_counter, count); } -static void qtest_clock_warp(int64_t dest) -{ - int64_t clock = cpus_get_virtual_clock(); - AioContext *aio_context; - assert(qtest_enabled()); - aio_context = qemu_get_aio_context(); - while (clock < dest) { - int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL, - QEMU_TIMER_ATTR_ALL); - int64_t warp = qemu_soonest_timeout(dest - clock, deadline); - - cpus_set_virtual_clock(cpus_get_virtual_clock() + warp); - - qemu_clock_run_timers(QEMU_CLOCK_VIRTUAL); - timerlist_run_timers(aio_context->tlg.tl[QEMU_CLOCK_VIRTUAL]); - clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - } - qemu_clock_notify(QEMU_CLOCK_VIRTUAL); -} - static bool (*process_command_cb)(CharBackend *chr, gchar **words); void qtest_set_command_cb(bool (*pc_cb)(CharBackend *chr, gchar **words)) @@ -755,7 +735,8 @@ static void qtest_process_command(CharBackend *chr, gchar **words) ns = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL, QEMU_TIMER_ATTR_ALL); } - qtest_clock_warp(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + ns); + qemu_clock_advance_virtual_time( + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + ns); qtest_send_prefix(chr); qtest_sendf(chr, "OK %"PRIi64"\n", (int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)); @@ -781,7 +762,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words) g_assert(words[1]); ret = qemu_strtoi64(words[1], NULL, 0, &ns); g_assert(ret == 0); - qtest_clock_warp(ns); + qemu_clock_advance_virtual_time(ns); qtest_send_prefix(chr); qtest_sendf(chr, "OK %"PRIi64"\n", (int64_t)qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)); diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 6a0de33dd2b..213114be68c 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -645,6 +645,11 @@ int64_t qemu_clock_get_ns(QEMUClockType type) } } +static void qemu_virtual_clock_set_ns(int64_t time) +{ + return cpus_set_virtual_clock(time); +} + void init_clocks(QEMUTimerListNotifyCB *notify_cb) { QEMUClockType type; @@ -675,3 +680,24 @@ bool qemu_clock_run_all_timers(void) return progress; } + +int64_t qemu_clock_advance_virtual_time(int64_t dest) +{ + int64_t clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + AioContext *aio_context; + aio_context = qemu_get_aio_context(); + while (clock < dest) { + int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL, + QEMU_TIMER_ATTR_ALL); + int64_t warp = qemu_soonest_timeout(dest - clock, deadline); + + qemu_virtual_clock_set_ns(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + warp); + + qemu_clock_run_timers(QEMU_CLOCK_VIRTUAL); + timerlist_run_timers(aio_context->tlg.tl[QEMU_CLOCK_VIRTUAL]); + clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + } + qemu_clock_notify(QEMU_CLOCK_VIRTUAL); + + return clock; +}