From nobody Sun May 4 12:02:08 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=1621861948; cv=none;
d=zohomail.com; s=zohoarc;
b=AgC+F9UJINJ7QJoNUUYkwcenP/N5pBvZxXjAKagd8x1ha9zZOz+2zT5DMaNsXaQkV44psD26i1FGefk0h0jjoVCFyEA5E6AVDVTfc7GVZYShHTZnOT/aV+e04uuNQdov9y/cTiiYCE6msltUtgLIRF4xsIObVPOwwLK1M/zOj5E=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1621861948;
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=uO4+E8RP2Ua5+4hVx4LGaMf6mX/r5La2/K1i3KqW4Xg=;
b=jEumQ70oYhUrpZ2twNL+dfXvxy0nY04QhsW2spTvhHC8t2C11G00oY/R70dmxmRZRfHr6wQVHP53E2pbW97zVY21uW3WWPe+C+RRNGRufnZe9T8cCS+9WTyzF7Wtw+/QTqf0qzknFgyIM/5TCfP8PNpHXVIz30bMWSuPf59WKRg=
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 1621861948486273.17692809322716;
Mon, 24 May 2021 06:12:28 -0700 (PDT)
Received: from localhost ([::1]:55080 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 1llANf-00027E-Fe
for importer@patchew.org; Mon, 24 May 2021 09:12:27 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51616)
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 1llAEL-0003Bj-FA
for qemu-devel@nongnu.org; Mon, 24 May 2021 09:02:49 -0400
Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24192)
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 1llAEE-0007uM-D4
for qemu-devel@nongnu.org; Mon, 24 May 2021 09:02:49 -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-312-VbpXtGcaN4WV9jkdQ6DdfQ-1; Mon, 24 May 2021 09:02:36 -0400
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
[10.5.11.13])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C5D8107ACF2;
Mon, 24 May 2021 13:02:35 +0000 (UTC)
Received: from localhost (ovpn-113-244.ams2.redhat.com [10.36.113.244])
by smtp.corp.redhat.com (Postfix) with ESMTP id 21BE06EF42;
Mon, 24 May 2021 13:02:34 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1621861360;
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=uO4+E8RP2Ua5+4hVx4LGaMf6mX/r5La2/K1i3KqW4Xg=;
b=hFOzfixFHarKyVtUrv8veRpN8lYI9mJBN4KCpRWJAl4uT8q4H/xmeEFr8gCJpEivA7ZSMX
yYagcUEOUMp0naGyDOxQnEMxiA7k5B12rVrT+HMseg+pdpPwyudY0XCVPzYQI0CD6DcQbw
heU4ayvjBqHUgFCVdfB1391JPxYpSk0=
X-MC-Unique: VbpXtGcaN4WV9jkdQ6DdfQ-1
From: Stefan Hajnoczi <stefanha@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL 7/8] coroutine-sleep: replace QemuCoSleepState pointer with
struct in the API
Date: Mon, 24 May 2021 14:01:49 +0100
Message-Id: <20210524130150.50998-8-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.79 on 10.5.11.13
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>
Right now, users of qemu_co_sleep_ns_wakeable are simply passing
a pointer to QemuCoSleepState by reference to the function. But
QemuCoSleepState really is just a Coroutine*; making the
content of the struct public is just as efficient and lets us
skip the user_state_pointer indirection.
Since the usage is changed, take the occasion to rename the
struct to QemuCoSleep.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-6-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/qemu/coroutine.h | 23 +++++++++++----------
block/block-copy.c | 8 ++++----
block/nbd.c | 10 ++++-----
util/qemu-coroutine-sleep.c | 41 ++++++++++++++++---------------------
4 files changed, 39 insertions(+), 43 deletions(-)
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index c5d7742989..82c0671f80 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -291,21 +291,22 @@ void qemu_co_rwlock_wrlock(CoRwlock *lock);
*/
void qemu_co_rwlock_unlock(CoRwlock *lock);
=20
-typedef struct QemuCoSleepState QemuCoSleepState;
+typedef struct QemuCoSleep {
+ Coroutine *to_wake;
+} QemuCoSleep;
=20
/**
- * Yield the coroutine for a given duration. During this yield, @sleep_sta=
te
- * is set to an opaque pointer, which may be used for
- * qemu_co_sleep_wake(). Be careful, the pointer is set back to zero when =
the
- * timer fires. Don't save the obtained value to other variables and don't=
call
- * qemu_co_sleep_wake from another aio context.
+ * Yield the coroutine for a given duration. Initializes @w so that,
+ * during this yield, it can be passed to qemu_co_sleep_wake() to
+ * terminate the sleep.
*/
-void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
- QemuCoSleepState **sleep_state=
);
+void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
+ QEMUClockType type, int64_t ns=
);
+
static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64=
_t ns)
{
- QemuCoSleepState *unused =3D NULL;
- qemu_co_sleep_ns_wakeable(type, ns, &unused);
+ QemuCoSleep w =3D { 0 };
+ qemu_co_sleep_ns_wakeable(&w, type, ns);
}
=20
/**
@@ -314,7 +315,7 @@ static inline void coroutine_fn qemu_co_sleep_ns(QEMUCl=
ockType type, int64_t ns)
* qemu_co_sleep_ns() and should be checked to be non-NULL before calling
* qemu_co_sleep_wake().
*/
-void qemu_co_sleep_wake(QemuCoSleepState *sleep_state);
+void qemu_co_sleep_wake(QemuCoSleep *w);
=20
/**
* Yield until a file descriptor becomes readable
diff --git a/block/block-copy.c b/block/block-copy.c
index f896dc56f2..c2e5090412 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -50,7 +50,7 @@ typedef struct BlockCopyCallState {
/* State */
int ret;
bool finished;
- QemuCoSleepState *sleep_state;
+ QemuCoSleep sleep;
bool cancelled;
=20
/* OUT parameters */
@@ -625,8 +625,8 @@ block_copy_dirty_clusters(BlockCopyCallState *call_stat=
e)
if (ns > 0) {
block_copy_task_end(task, -EAGAIN);
g_free(task);
- qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, ns,
- &call_state->sleep_state);
+ qemu_co_sleep_ns_wakeable(&call_state->sleep,
+ QEMU_CLOCK_REALTIME, ns);
continue;
}
}
@@ -674,7 +674,7 @@ out:
=20
void block_copy_kick(BlockCopyCallState *call_state)
{
- qemu_co_sleep_wake(call_state->sleep_state);
+ qemu_co_sleep_wake(&call_state->sleep);
}
=20
/*
diff --git a/block/nbd.c b/block/nbd.c
index 1c6315b168..616f9ae6c4 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -116,7 +116,7 @@ typedef struct BDRVNBDState {
CoQueue free_sema;
Coroutine *connection_co;
Coroutine *teardown_co;
- QemuCoSleepState *connection_co_sleep_ns_state;
+ QemuCoSleep reconnect_sleep;
bool drained;
bool wait_drained_end;
int in_flight;
@@ -289,7 +289,7 @@ static void coroutine_fn nbd_client_co_drain_begin(Bloc=
kDriverState *bs)
BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque;
=20
s->drained =3D true;
- qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
+ qemu_co_sleep_wake(&s->reconnect_sleep);
=20
nbd_co_establish_connection_cancel(bs, false);
=20
@@ -328,7 +328,7 @@ static void nbd_teardown_connection(BlockDriverState *b=
s)
=20
s->state =3D NBD_CLIENT_QUIT;
if (s->connection_co) {
- qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
+ qemu_co_sleep_wake(&s->reconnect_sleep);
nbd_co_establish_connection_cancel(bs, true);
}
if (qemu_in_coroutine()) {
@@ -685,8 +685,8 @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDS=
tate *s)
}
bdrv_inc_in_flight(s->bs);
} else {
- qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, timeout,
- &s->connection_co_sleep_ns_state);
+ qemu_co_sleep_ns_wakeable(&s->reconnect_sleep,
+ QEMU_CLOCK_REALTIME, timeout);
if (s->drained) {
continue;
}
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index 1d25019620..89c3b758c5 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -19,42 +19,37 @@
=20
static const char *qemu_co_sleep_ns__scheduled =3D "qemu_co_sleep_ns";
=20
-struct QemuCoSleepState {
+void qemu_co_sleep_wake(QemuCoSleep *w)
+{
Coroutine *co;
- QemuCoSleepState **user_state_pointer;
-};
=20
-void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
-{
- if (sleep_state) {
+ co =3D w->to_wake;
+ w->to_wake =3D NULL;
+ if (co) {
/* Write of schedule protected by barrier write in aio_co_schedule=
*/
- const char *scheduled =3D qatomic_cmpxchg(&sleep_state->co->schedu=
led,
+ const char *scheduled =3D qatomic_cmpxchg(&co->scheduled,
qemu_co_sleep_ns__schedule=
d, NULL);
=20
assert(scheduled =3D=3D qemu_co_sleep_ns__scheduled);
- *sleep_state->user_state_pointer =3D NULL;
- aio_co_wake(sleep_state->co);
+ aio_co_wake(co);
}
}
=20
static void co_sleep_cb(void *opaque)
{
- QemuCoSleepState **sleep_state =3D opaque;
- qemu_co_sleep_wake(*sleep_state);
+ QemuCoSleep *w =3D opaque;
+ qemu_co_sleep_wake(w);
}
=20
-void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
- QemuCoSleepState **sleep_state)
+void coroutine_fn qemu_co_sleep_ns_wakeable(QemuCoSleep *w,
+ QEMUClockType type, int64_t ns)
{
+ Coroutine *co =3D qemu_coroutine_self();
AioContext *ctx =3D qemu_get_current_aio_context();
QEMUTimer ts;
- QemuCoSleepState state =3D {
- .co =3D qemu_coroutine_self(),
- .user_state_pointer =3D sleep_state,
- };
=20
- const char *scheduled =3D qatomic_cmpxchg(&state.co->scheduled, NULL,
- qemu_co_sleep_ns__scheduled);
+ const char *scheduled =3D qatomic_cmpxchg(&co->scheduled, NULL,
+ qemu_co_sleep_ns__scheduled);
if (scheduled) {
fprintf(stderr,
"%s: Co-routine was already scheduled in '%s'\n",
@@ -62,12 +57,12 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockTy=
pe type, int64_t ns,
abort();
}
=20
- aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, sleep_state);
- *sleep_state =3D &state;
+ 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
- /* qemu_co_sleep_wake clears *sleep_state before resuming this corouti=
ne. */
- assert(*sleep_state =3D=3D NULL);
+ /* w->to_wake is cleared before resuming this coroutine. */
+ assert(w->to_wake =3D=3D NULL);
}
--=20
2.31.1