From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com,
eblake@redhat.com, mreitz@redhat.com, kwolf@redhat.com,
rvkagan@yandex-team.ru, den@openvz.org
Subject: [PATCH v3 11/33] block/nbd: rename NBDConnectThread to NBDClientConnection
Date: Fri, 16 Apr 2021 11:08:49 +0300 [thread overview]
Message-ID: <20210416080911.83197-12-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210416080911.83197-1-vsementsov@virtuozzo.com>
We are going to move connection code to own file and want clear names
and APIs.
The structure is shared between user and (possibly) several runs of
connect-thread. So it's wrong to call it "thread". Let's rename to
something more generic.
Appropriately rename connect_thread and thr variables to conn.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/nbd.c | 137 ++++++++++++++++++++++++++--------------------------
1 file changed, 68 insertions(+), 69 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index dab73bdf3b..9ce6a323eb 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -66,7 +66,7 @@ typedef enum NBDClientState {
NBD_CLIENT_QUIT
} NBDClientState;
-typedef struct NBDConnectThread {
+typedef struct NBDClientConnection {
/* Initialization constants */
SocketAddress *saddr; /* address to connect to */
@@ -82,7 +82,7 @@ typedef struct NBDConnectThread {
bool running; /* thread is running now */
bool detached; /* thread is detached and should cleanup the state */
Coroutine *wait_co; /* nbd_co_establish_connection() wait in yield() */
-} NBDConnectThread;
+} NBDClientConnection;
typedef struct BDRVNBDState {
QIOChannelSocket *sioc; /* The master data channel */
@@ -115,34 +115,34 @@ typedef struct BDRVNBDState {
char *x_dirty_bitmap;
bool alloc_depth;
- NBDConnectThread *connect_thread;
+ NBDClientConnection *conn;
} BDRVNBDState;
-static void nbd_free_connect_thread(NBDConnectThread *thr);
+static void nbd_free_connect_thread(NBDClientConnection *conn);
static int nbd_establish_connection(BlockDriverState *bs, SocketAddress *saddr,
Error **errp);
static coroutine_fn QIOChannelSocket *
-nbd_co_establish_connection(NBDConnectThread *thr, Error **errp);
-static void nbd_co_establish_connection_cancel(NBDConnectThread *thr);
+nbd_co_establish_connection(NBDClientConnection *conn, Error **errp);
+static void nbd_co_establish_connection_cancel(NBDClientConnection *conn);
static int nbd_client_handshake(BlockDriverState *bs, Error **errp);
static void nbd_yank(void *opaque);
static void nbd_clear_bdrvstate(BlockDriverState *bs)
{
BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
- NBDConnectThread *thr = s->connect_thread;
+ NBDClientConnection *conn = s->conn;
bool do_free;
- qemu_mutex_lock(&thr->mutex);
- if (thr->running) {
- thr->detached = true;
+ qemu_mutex_lock(&conn->mutex);
+ if (conn->running) {
+ conn->detached = true;
}
- do_free = !thr->running && !thr->detached;
- qemu_mutex_unlock(&thr->mutex);
+ do_free = !conn->running && !conn->detached;
+ qemu_mutex_unlock(&conn->mutex);
/* the runaway thread will clean it up itself */
if (do_free) {
- nbd_free_connect_thread(thr);
+ nbd_free_connect_thread(conn);
}
yank_unregister_instance(BLOCKDEV_YANK_INSTANCE(bs->node_name));
@@ -286,7 +286,7 @@ static void coroutine_fn nbd_client_co_drain_begin(BlockDriverState *bs)
qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
}
- nbd_co_establish_connection_cancel(s->connect_thread);
+ nbd_co_establish_connection_cancel(s->conn);
reconnect_delay_timer_del(s);
@@ -326,7 +326,7 @@ static void nbd_teardown_connection(BlockDriverState *bs)
if (s->connection_co_sleep_ns_state) {
qemu_co_sleep_wake(s->connection_co_sleep_ns_state);
}
- nbd_co_establish_connection_cancel(s->connect_thread);
+ nbd_co_establish_connection_cancel(s->conn);
}
if (qemu_in_coroutine()) {
s->teardown_co = qemu_coroutine_self();
@@ -353,101 +353,101 @@ static bool nbd_client_connecting_wait(BDRVNBDState *s)
static void nbd_init_connect_thread(BDRVNBDState *s)
{
- s->connect_thread = g_new(NBDConnectThread, 1);
+ s->conn = g_new(NBDClientConnection, 1);
- *s->connect_thread = (NBDConnectThread) {
+ *s->conn = (NBDClientConnection) {
.saddr = QAPI_CLONE(SocketAddress, s->saddr),
};
- qemu_mutex_init(&s->connect_thread->mutex);
+ qemu_mutex_init(&s->conn->mutex);
}
-static void nbd_free_connect_thread(NBDConnectThread *thr)
+static void nbd_free_connect_thread(NBDClientConnection *conn)
{
- if (thr->sioc) {
- qio_channel_close(QIO_CHANNEL(thr->sioc), NULL);
- object_unref(OBJECT(thr->sioc));
+ if (conn->sioc) {
+ qio_channel_close(QIO_CHANNEL(conn->sioc), NULL);
+ object_unref(OBJECT(conn->sioc));
}
- error_free(thr->err);
- qapi_free_SocketAddress(thr->saddr);
- g_free(thr);
+ error_free(conn->err);
+ qapi_free_SocketAddress(conn->saddr);
+ g_free(conn);
}
static void *connect_thread_func(void *opaque)
{
- NBDConnectThread *thr = opaque;
+ NBDClientConnection *conn = opaque;
int ret;
bool do_free = false;
- thr->sioc = qio_channel_socket_new();
+ conn->sioc = qio_channel_socket_new();
- error_free(thr->err);
- thr->err = NULL;
- ret = qio_channel_socket_connect_sync(thr->sioc, thr->saddr, &thr->err);
+ error_free(conn->err);
+ conn->err = NULL;
+ ret = qio_channel_socket_connect_sync(conn->sioc, conn->saddr, &conn->err);
if (ret < 0) {
- object_unref(OBJECT(thr->sioc));
- thr->sioc = NULL;
+ object_unref(OBJECT(conn->sioc));
+ conn->sioc = NULL;
}
- qemu_mutex_lock(&thr->mutex);
+ qemu_mutex_lock(&conn->mutex);
- assert(thr->running);
- thr->running = false;
- if (thr->wait_co) {
- aio_co_schedule(NULL, thr->wait_co);
- thr->wait_co = NULL;
+ assert(conn->running);
+ conn->running = false;
+ if (conn->wait_co) {
+ aio_co_schedule(NULL, conn->wait_co);
+ conn->wait_co = NULL;
}
- do_free = thr->detached;
+ do_free = conn->detached;
- qemu_mutex_unlock(&thr->mutex);
+ qemu_mutex_unlock(&conn->mutex);
if (do_free) {
- nbd_free_connect_thread(thr);
+ nbd_free_connect_thread(conn);
}
return NULL;
}
/*
- * Get a new connection in context of @thr:
+ * Get a new connection in context of @conn:
* if thread is running, wait for completion
* if thread is already succeeded in background, and user didn't get the
* result, just return it now
* otherwise if thread is not running, start a thread and wait for completion
*/
static coroutine_fn QIOChannelSocket *
-nbd_co_establish_connection(NBDConnectThread *thr, Error **errp)
+nbd_co_establish_connection(NBDClientConnection *conn, Error **errp)
{
QIOChannelSocket *sioc = NULL;
QemuThread thread;
- qemu_mutex_lock(&thr->mutex);
+ qemu_mutex_lock(&conn->mutex);
/*
* Don't call nbd_co_establish_connection() in several coroutines in
* parallel. Only one call at once is supported.
*/
- assert(!thr->wait_co);
+ assert(!conn->wait_co);
- if (!thr->running) {
- if (thr->sioc) {
+ if (!conn->running) {
+ if (conn->sioc) {
/* Previous attempt finally succeeded in background */
- sioc = g_steal_pointer(&thr->sioc);
- qemu_mutex_unlock(&thr->mutex);
+ sioc = g_steal_pointer(&conn->sioc);
+ qemu_mutex_unlock(&conn->mutex);
return sioc;
}
- thr->running = true;
- error_free(thr->err);
- thr->err = NULL;
+ conn->running = true;
+ error_free(conn->err);
+ conn->err = NULL;
qemu_thread_create(&thread, "nbd-connect",
- connect_thread_func, thr, QEMU_THREAD_DETACHED);
+ connect_thread_func, conn, QEMU_THREAD_DETACHED);
}
- thr->wait_co = qemu_coroutine_self();
+ conn->wait_co = qemu_coroutine_self();
- qemu_mutex_unlock(&thr->mutex);
+ qemu_mutex_unlock(&conn->mutex);
/*
* We are going to wait for connect-thread finish, but
@@ -455,9 +455,9 @@ nbd_co_establish_connection(NBDConnectThread *thr, Error **errp)
*/
qemu_coroutine_yield();
- qemu_mutex_lock(&thr->mutex);
+ qemu_mutex_lock(&conn->mutex);
- if (thr->running) {
+ if (conn->running) {
/*
* Obviously, drained section wants to start. Report the attempt as
* failed. Still connect thread is executing in background, and its
@@ -465,12 +465,12 @@ nbd_co_establish_connection(NBDConnectThread *thr, Error **errp)
*/
error_setg(errp, "Connection attempt cancelled by other operation");
} else {
- error_propagate(errp, thr->err);
- thr->err = NULL;
- sioc = g_steal_pointer(&thr->sioc);
+ error_propagate(errp, conn->err);
+ conn->err = NULL;
+ sioc = g_steal_pointer(&conn->sioc);
}
- qemu_mutex_unlock(&thr->mutex);
+ qemu_mutex_unlock(&conn->mutex);
return sioc;
}
@@ -481,17 +481,16 @@ nbd_co_establish_connection(NBDConnectThread *thr, Error **errp)
* stop the thread itself neither close the socket. It just safely wakes
* nbd_co_establish_connection() sleeping in the yield().
*/
-static void nbd_co_establish_connection_cancel(NBDConnectThread *thr)
+static void nbd_co_establish_connection_cancel(NBDClientConnection *conn)
{
- qemu_mutex_lock(&thr->mutex);
+ qemu_mutex_lock(&conn->mutex);
- if (thr->wait_co) {
- aio_co_schedule(NULL, thr->wait_co);
- thr->wait_co = NULL;
+ if (conn->wait_co) {
+ aio_co_schedule(NULL, conn->wait_co);
+ conn->wait_co = NULL;
}
- qemu_mutex_unlock(&thr->mutex);
-
+ qemu_mutex_unlock(&conn->mutex);
}
static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
@@ -537,7 +536,7 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
s->ioc = NULL;
}
- s->sioc = nbd_co_establish_connection(s->connect_thread, NULL);
+ s->sioc = nbd_co_establish_connection(s->conn, NULL);
if (!s->sioc) {
ret = -ECONNREFUSED;
goto out;
--
2.29.2
next prev parent reply other threads:[~2021-04-16 8:19 UTC|newest]
Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 8:08 [PATCH v3 00/33] block/nbd: rework client connection Vladimir Sementsov-Ogievskiy
2021-04-16 8:08 ` [PATCH v3 01/33] block/nbd: fix channel object leak Vladimir Sementsov-Ogievskiy
2021-05-24 21:31 ` Eric Blake
2021-05-25 4:47 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:08 ` [PATCH v3 02/33] block/nbd: fix how state is cleared on nbd_open() failure paths Vladimir Sementsov-Ogievskiy
2021-04-21 14:00 ` Roman Kagan
2021-04-21 22:27 ` Vladimir Sementsov-Ogievskiy
2021-04-22 8:49 ` Roman Kagan
2021-06-01 21:39 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 03/33] block/nbd: ensure ->connection_thread is always valid Vladimir Sementsov-Ogievskiy
2021-06-01 21:41 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 04/33] block/nbd: nbd_client_handshake(): fix leak of s->ioc Vladimir Sementsov-Ogievskiy
2021-04-22 8:59 ` Roman Kagan
2021-04-16 8:08 ` [PATCH v3 05/33] block/nbd: BDRVNBDState: drop unused connect_err and connect_status Vladimir Sementsov-Ogievskiy
2021-06-01 21:43 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 06/33] util/async: aio_co_schedule(): support reschedule in same ctx Vladimir Sementsov-Ogievskiy
2021-04-23 10:09 ` Roman Kagan
2021-04-26 8:52 ` Vladimir Sementsov-Ogievskiy
2021-05-12 6:56 ` Paolo Bonzini
2021-05-12 7:15 ` Vladimir Sementsov-Ogievskiy
2021-05-13 21:04 ` Paolo Bonzini
2021-05-14 17:27 ` Roman Kagan
2021-05-14 21:19 ` Paolo Bonzini
2021-06-08 18:45 ` Vladimir Sementsov-Ogievskiy
2021-06-09 9:35 ` Paolo Bonzini
2021-06-09 10:24 ` Vladimir Sementsov-Ogievskiy
2021-06-09 12:17 ` Paolo Bonzini
2021-04-16 8:08 ` [PATCH v3 07/33] block/nbd: simplify waking of nbd_co_establish_connection() Vladimir Sementsov-Ogievskiy
2021-04-27 21:44 ` Roman Kagan
2021-06-02 19:05 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 08/33] block/nbd: drop thr->state Vladimir Sementsov-Ogievskiy
2021-04-27 22:23 ` Roman Kagan
2021-04-28 8:01 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:08 ` [PATCH v3 09/33] block/nbd: bs-independent interface for nbd_co_establish_connection() Vladimir Sementsov-Ogievskiy
2021-06-02 19:14 ` Eric Blake
2021-06-08 10:12 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:08 ` [PATCH v3 10/33] block/nbd: make nbd_co_establish_connection_cancel() bs-independent Vladimir Sementsov-Ogievskiy
2021-06-02 21:18 ` Eric Blake
2021-04-16 8:08 ` Vladimir Sementsov-Ogievskiy [this message]
2021-04-27 22:28 ` [PATCH v3 11/33] block/nbd: rename NBDConnectThread to NBDClientConnection Roman Kagan
2021-06-02 21:21 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 12/33] block/nbd: introduce nbd_client_connection_new() Vladimir Sementsov-Ogievskiy
2021-06-02 21:22 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 13/33] block/nbd: introduce nbd_client_connection_release() Vladimir Sementsov-Ogievskiy
2021-04-27 22:35 ` Roman Kagan
2021-04-28 8:06 ` Vladimir Sementsov-Ogievskiy
2021-06-02 21:27 ` Eric Blake
2021-06-03 11:59 ` Vladimir Sementsov-Ogievskiy
2021-06-08 10:00 ` Vladimir Sementsov-Ogievskiy
2021-06-08 14:18 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 14/33] nbd: move connection code from block/nbd to nbd/client-connection Vladimir Sementsov-Ogievskiy
2021-04-27 22:45 ` Roman Kagan
2021-04-28 8:14 ` Vladimir Sementsov-Ogievskiy
2021-06-09 15:49 ` Vladimir Sementsov-Ogievskiy
2021-06-03 15:55 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 15/33] nbd/client-connection: use QEMU_LOCK_GUARD Vladimir Sementsov-Ogievskiy
2021-04-28 6:08 ` Roman Kagan
2021-04-28 8:17 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:08 ` [PATCH v3 16/33] nbd/client-connection: add possibility of negotiation Vladimir Sementsov-Ogievskiy
2021-05-11 10:45 ` Roman Kagan
2021-05-12 6:42 ` Vladimir Sementsov-Ogievskiy
2021-06-08 19:23 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:08 ` [PATCH v3 17/33] nbd/client-connection: implement connection retry Vladimir Sementsov-Ogievskiy
2021-05-11 20:54 ` Roman Kagan
2021-06-08 10:24 ` Vladimir Sementsov-Ogievskiy
2021-06-03 16:17 ` Eric Blake
2021-06-03 17:49 ` Vladimir Sementsov-Ogievskiy
2021-06-08 10:38 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:08 ` [PATCH v3 18/33] nbd/client-connection: shutdown connection on release Vladimir Sementsov-Ogievskiy
2021-05-11 21:08 ` Roman Kagan
2021-05-12 6:39 ` Vladimir Sementsov-Ogievskiy
2021-06-03 16:20 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 19/33] block/nbd: split nbd_handle_updated_info out of nbd_client_handshake() Vladimir Sementsov-Ogievskiy
2021-05-12 8:40 ` Roman Kagan
2021-06-03 16:29 ` Eric Blake
2021-06-09 17:23 ` Vladimir Sementsov-Ogievskiy
2021-06-09 18:28 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 20/33] block/nbd: use negotiation of NBDClientConnection Vladimir Sementsov-Ogievskiy
2021-06-03 18:05 ` Eric Blake
2021-04-16 8:08 ` [PATCH v3 21/33] qemu-socket: pass monitor link to socket_get_fd directly Vladimir Sementsov-Ogievskiy
2021-04-19 9:34 ` Daniel P. Berrangé
2021-04-19 10:09 ` Vladimir Sementsov-Ogievskiy
2021-05-12 9:40 ` Roman Kagan
2021-05-12 9:59 ` Daniel P. Berrangé
2021-05-13 11:02 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:09 ` [PATCH v3 22/33] block/nbd: pass monitor directly to connection thread Vladimir Sementsov-Ogievskiy
2021-06-03 18:16 ` Eric Blake
2021-06-03 18:31 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:09 ` [PATCH v3 23/33] block/nbd: nbd_teardown_connection() don't touch s->sioc Vladimir Sementsov-Ogievskiy
2021-06-03 19:04 ` Eric Blake
2021-04-16 8:09 ` [PATCH v3 24/33] block/nbd: drop BDRVNBDState::sioc Vladimir Sementsov-Ogievskiy
2021-06-03 19:12 ` Eric Blake
2021-04-16 8:09 ` [PATCH v3 25/33] nbd/client-connection: return only one io channel Vladimir Sementsov-Ogievskiy
2021-06-03 19:58 ` Eric Blake
2021-04-16 8:09 ` [PATCH v3 26/33] block-coroutine-wrapper: allow non bdrv_ prefix Vladimir Sementsov-Ogievskiy
2021-06-03 20:00 ` Eric Blake
2021-06-03 20:53 ` Eric Blake
2021-06-04 5:29 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:09 ` [PATCH v3 27/33] block/nbd: split nbd_co_do_establish_connection out of nbd_reconnect_attempt Vladimir Sementsov-Ogievskiy
2021-06-03 20:04 ` Eric Blake
2021-06-04 5:30 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:09 ` [PATCH v3 28/33] nbd/client-connection: do qio_channel_set_delay(false) Vladimir Sementsov-Ogievskiy
2021-06-03 20:48 ` Eric Blake
2021-06-04 5:32 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:09 ` [PATCH v3 29/33] nbd/client-connection: add option for non-blocking connection attempt Vladimir Sementsov-Ogievskiy
2021-06-03 20:51 ` Eric Blake
2021-04-16 8:09 ` [PATCH v3 30/33] block/nbd: reuse nbd_co_do_establish_connection() in nbd_open() Vladimir Sementsov-Ogievskiy
2021-06-03 20:57 ` Eric Blake
2021-04-16 8:09 ` [PATCH v3 31/33] block/nbd: add nbd_clinent_connected() helper Vladimir Sementsov-Ogievskiy
2021-05-12 7:06 ` Paolo Bonzini
2021-05-12 7:19 ` Vladimir Sementsov-Ogievskiy
2021-06-03 21:08 ` Eric Blake
2021-04-16 8:09 ` [PATCH v3 32/33] block/nbd: safer transition to receiving request Vladimir Sementsov-Ogievskiy
2021-06-03 21:11 ` Eric Blake
2021-06-04 5:36 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:09 ` [PATCH v3 33/33] block/nbd: drop connection_co Vladimir Sementsov-Ogievskiy
2021-04-16 8:14 ` Vladimir Sementsov-Ogievskiy
2021-04-16 8:21 ` Vladimir Sementsov-Ogievskiy
2021-06-03 21:27 ` Eric Blake
2021-06-04 5:39 ` Vladimir Sementsov-Ogievskiy
2021-05-12 6:54 ` [PATCH v3 00/33] block/nbd: rework client connection Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210416080911.83197-12-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rvkagan@yandex-team.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).