From nobody Sun May 4 14:08:56 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1621861699; cv=none;
d=zohomail.com; s=zohoarc;
b=Y+Z8zw66CP8KTa/5zKVj+9F6I/IT2Yh8pAGSEYi3Lf2RNLp8bwa+ym1IJIqFoy34bXRNwrI9wq5vPFo9+SoCc89vrTKs8BkcPlh50iVHFuyCkiPO9DOkM99ofRNbAocQwNVYJbrTrHJpbZWusaAtbMEEbWBJjnbpFv5h/sTeetw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1621861699;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=JrpIWLzkGWcUYwerLw6c+S6FjPBoS4ixy8WOaOcBcK4=;
b=X7iO2b2eSNrQ/KMLG98oSQmKJaGohm4ft7K1uBOmrUMz0jvBtxA2c8u5YMH/z8rY9cKZ6UdgjtkKNgCUPda4uYSxxHpYAnO5T+T2mQKndmVodNFJFTstAipG4bmxHV9/O6In+Kl+LdYN6SOdeyeHhPJMTd+TVUvPAoZVjGluWRI=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail header.from=<stefanha@redhat.com> (p=none dis=none)
header.from=<stefanha@redhat.com>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1621861699065937.162789966499;
Mon, 24 May 2021 06:08:19 -0700 (PDT)
Received: from localhost ([::1]:48086 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1llAJe-0005Zc-CK
for importer@patchew.org; Mon, 24 May 2021 09:08:18 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51612)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1llAEK-00039J-TJ
for qemu-devel@nongnu.org; Mon, 24 May 2021 09:02:48 -0400
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27955)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <stefanha@redhat.com>)
id 1llAEI-0007wV-PJ
for qemu-devel@nongnu.org; Mon, 24 May 2021 09:02:48 -0400
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-486-03Wvw-pCNLWBSoxcnfhOfw-1; Mon, 24 May 2021 09:02:41 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
[10.5.11.22])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5BEFEA40C1;
Mon, 24 May 2021 13:02:40 +0000 (UTC)
Received: from localhost (ovpn-113-244.ams2.redhat.com [10.36.113.244])
by smtp.corp.redhat.com (Postfix) with ESMTP id A1B9C10190AA;
Mon, 24 May 2021 13:02:36 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1621861365;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=JrpIWLzkGWcUYwerLw6c+S6FjPBoS4ixy8WOaOcBcK4=;
b=Je+zOHmGbXcZGAZGJl1Ou30tBMWSb0U6h14n1ui/9nM6oF6PuM2w1Qa/smyKPe0ruPL+M8
xSTWds2nmdroWRnrCpQsV+/sTvJvk1QHZOsivt7Ge+R4gxPZyiy1u8YqFySfSnTwokVGYL
8X/PZnVQ2bV3FCoJrmoDh+O6/cgn92E=
X-MC-Unique: 03Wvw-pCNLWBSoxcnfhOfw-1
From: Stefan Hajnoczi <stefanha@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL 8/8] coroutine-sleep: introduce qemu_co_sleep
Date: Mon, 24 May 2021 14:01:50 +0100
Message-Id: <20210524130150.50998-9-stefanha@redhat.com>
In-Reply-To: <20210524130150.50998-1-stefanha@redhat.com>
References: <20210524130150.50998-1-stefanha@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=170.10.133.124;
envelope-from=stefanha@redhat.com;
helo=us-smtp-delivery-124.mimecast.com
X-Spam_score_int: -13
X-Spam_score: -1.4
X-Spam_bar: -
X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371,
DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001,
RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Kevin Wolf <kwolf@redhat.com>,
Elena Ufimtseva <elena.ufimtseva@oracle.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Jagannathan Raman <jag.raman@oracle.com>, qemu-block@nongnu.org,
John G Johnson <john.g.johnson@oracle.com>, John Snow <jsnow@redhat.com>,
Max Reitz <mreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
Content-Type: text/plain; charset="utf-8"
From: Paolo Bonzini <pbonzini@redhat.com>
Allow using QemuCoSleep to sleep forever until woken by qemu_co_sleep_wake.
This makes the logic of qemu_co_sleep_ns_wakeable easy to understand.
In the future we will introduce an API that can work even if the
sleep and wake happen from different threads. For now, initializing
w->to_wake after timer_mod is fine because the timer can only fire in
the same AioContext.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-7-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/qemu/coroutine.h | 5 +++++
util/qemu-coroutine-sleep.c | 26 +++++++++++++++++++-------
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index 82c0671f80..292e61aef0 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -303,6 +303,11 @@ typedef struct QemuCoSleep {
void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
QEMUClockType type, int64_t ns=
);
=20
+/**
+ * Yield the coroutine until the next call to qemu_co_sleep_wake.
+ */
+void coroutine_fn qemu_co_sleep(QemuCoSleep *w);
+
static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64=
_t ns)
{
QemuCoSleep w =3D { 0 };
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index 89c3b758c5..571ab521ff 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -41,12 +41,9 @@ static void co_sleep_cb(void *opaque)
qemu_co_sleep_wake(w);
}
=20
-void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
- QEMUClockType type, int64_t ns)
+void coroutine_fn qemu_co_sleep(QemuCoSleep *w)
{
Coroutine *co =3D qemu_coroutine_self();
- AioContext *ctx =3D qemu_get_current_aio_context();
- QEMUTimer ts;
=20
const char *scheduled =3D qatomic_cmpxchg(&co->scheduled, NULL,
qemu_co_sleep_ns__scheduled);
@@ -58,11 +55,26 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep=
*w,
}
=20
w->to_wake =3D co;
- aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w),
- timer_mod(&ts, qemu_clock_get_ns(type) + ns);
qemu_coroutine_yield();
- timer_del(&ts);
=20
/* w->to_wake is cleared before resuming this coroutine. */
assert(w->to_wake =3D=3D NULL);
}
+
+void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
+ QEMUClockType type, int64_t ns)
+{
+ AioContext *ctx =3D qemu_get_current_aio_context();
+ QEMUTimer ts;
+
+ aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, w);
+ timer_mod(&ts, qemu_clock_get_ns(type) + ns);
+
+ /*
+ * The timer will fire in the current AiOContext, so the callback
+ * must happen after qemu_co_sleep yields and there is no race
+ * between timer_mod and qemu_co_sleep.
+ */
+ qemu_co_sleep(w);
+ timer_del(&ts);
+}
--=20
2.31.1