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,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PATCH v3 21/33] qemu-socket: pass monitor link to socket_get_fd directly
Date: Fri, 16 Apr 2021 11:08:59 +0300 [thread overview]
Message-ID: <20210416080911.83197-22-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210416080911.83197-1-vsementsov@virtuozzo.com>
Detecting monitor by current coroutine works bad when we are not in
coroutine context. And that's exactly so in nbd reconnect code, where
qio_channel_socket_connect_sync() is called from thread.
Add a possibility to pass monitor by hand, to be used in the following
commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
include/io/channel-socket.h | 20 ++++++++++++++++++++
include/qemu/sockets.h | 2 +-
io/channel-socket.c | 17 +++++++++++++----
tests/unit/test-util-sockets.c | 16 ++++++++--------
util/qemu-sockets.c | 10 +++++-----
5 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/include/io/channel-socket.h b/include/io/channel-socket.h
index e747e63514..6d0915420d 100644
--- a/include/io/channel-socket.h
+++ b/include/io/channel-socket.h
@@ -78,6 +78,23 @@ qio_channel_socket_new_fd(int fd,
Error **errp);
+/**
+ * qio_channel_socket_connect_sync_mon:
+ * @ioc: the socket channel object
+ * @addr: the address to connect to
+ * @mon: current monitor. If NULL, it will be detected by
+ * current coroutine.
+ * @errp: pointer to a NULL-initialized error object
+ *
+ * Attempt to connect to the address @addr. This method
+ * will run in the foreground so the caller will not regain
+ * execution control until the connection is established or
+ * an error occurs.
+ */
+int qio_channel_socket_connect_sync_mon(QIOChannelSocket *ioc,
+ SocketAddress *addr,
+ Monitor *mon,
+ Error **errp);
/**
* qio_channel_socket_connect_sync:
* @ioc: the socket channel object
@@ -88,6 +105,9 @@ qio_channel_socket_new_fd(int fd,
* will run in the foreground so the caller will not regain
* execution control until the connection is established or
* an error occurs.
+ *
+ * This a wrapper, calling qio_channel_socket_connect_sync_mon()
+ * with @mon=NULL.
*/
int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,
SocketAddress *addr,
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 7d1f813576..cdf6f2413b 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -41,7 +41,7 @@ int unix_listen(const char *path, Error **errp);
int unix_connect(const char *path, Error **errp);
SocketAddress *socket_parse(const char *str, Error **errp);
-int socket_connect(SocketAddress *addr, Error **errp);
+int socket_connect(SocketAddress *addr, Monitor *mon, Error **errp);
int socket_listen(SocketAddress *addr, int num, Error **errp);
void socket_listen_cleanup(int fd, Error **errp);
int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);
diff --git a/io/channel-socket.c b/io/channel-socket.c
index de259f7eed..9dc42ca29d 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -135,14 +135,15 @@ qio_channel_socket_new_fd(int fd,
}
-int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,
- SocketAddress *addr,
- Error **errp)
+int qio_channel_socket_connect_sync_mon(QIOChannelSocket *ioc,
+ SocketAddress *addr,
+ Monitor *mon,
+ Error **errp)
{
int fd;
trace_qio_channel_socket_connect_sync(ioc, addr);
- fd = socket_connect(addr, errp);
+ fd = socket_connect(addr, mon, errp);
if (fd < 0) {
trace_qio_channel_socket_connect_fail(ioc);
return -1;
@@ -158,6 +159,14 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,
}
+int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,
+ SocketAddress *addr,
+ Error **errp)
+{
+ return qio_channel_socket_connect_sync_mon(ioc, addr, NULL, errp);
+}
+
+
static void qio_channel_socket_connect_worker(QIOTask *task,
gpointer opaque)
{
diff --git a/tests/unit/test-util-sockets.c b/tests/unit/test-util-sockets.c
index 72b9246529..d902ecede7 100644
--- a/tests/unit/test-util-sockets.c
+++ b/tests/unit/test-util-sockets.c
@@ -90,7 +90,7 @@ static void test_socket_fd_pass_name_good(void)
addr.type = SOCKET_ADDRESS_TYPE_FD;
addr.u.fd.str = g_strdup(mon_fdname);
- fd = socket_connect(&addr, &error_abort);
+ fd = socket_connect(&addr, NULL, &error_abort);
g_assert_cmpint(fd, !=, -1);
g_assert_cmpint(fd, !=, mon_fd);
close(fd);
@@ -122,7 +122,7 @@ static void test_socket_fd_pass_name_bad(void)
addr.type = SOCKET_ADDRESS_TYPE_FD;
addr.u.fd.str = g_strdup(mon_fdname);
- fd = socket_connect(&addr, &err);
+ fd = socket_connect(&addr, NULL, &err);
g_assert_cmpint(fd, ==, -1);
error_free_or_abort(&err);
@@ -149,7 +149,7 @@ static void test_socket_fd_pass_name_nomon(void)
addr.type = SOCKET_ADDRESS_TYPE_FD;
addr.u.fd.str = g_strdup("myfd");
- fd = socket_connect(&addr, &err);
+ fd = socket_connect(&addr, NULL, &err);
g_assert_cmpint(fd, ==, -1);
error_free_or_abort(&err);
@@ -173,7 +173,7 @@ static void test_socket_fd_pass_num_good(void)
addr.type = SOCKET_ADDRESS_TYPE_FD;
addr.u.fd.str = g_strdup_printf("%d", sfd);
- fd = socket_connect(&addr, &error_abort);
+ fd = socket_connect(&addr, NULL, &error_abort);
g_assert_cmpint(fd, ==, sfd);
fd = socket_listen(&addr, 1, &error_abort);
@@ -195,7 +195,7 @@ static void test_socket_fd_pass_num_bad(void)
addr.type = SOCKET_ADDRESS_TYPE_FD;
addr.u.fd.str = g_strdup_printf("%d", sfd);
- fd = socket_connect(&addr, &err);
+ fd = socket_connect(&addr, NULL, &err);
g_assert_cmpint(fd, ==, -1);
error_free_or_abort(&err);
@@ -218,7 +218,7 @@ static void test_socket_fd_pass_num_nocli(void)
addr.type = SOCKET_ADDRESS_TYPE_FD;
addr.u.fd.str = g_strdup_printf("%d", STDOUT_FILENO);
- fd = socket_connect(&addr, &err);
+ fd = socket_connect(&addr, NULL, &err);
g_assert_cmpint(fd, ==, -1);
error_free_or_abort(&err);
@@ -247,10 +247,10 @@ static gpointer unix_client_thread_func(gpointer user_data)
for (i = 0; i < ABSTRACT_SOCKET_VARIANTS; i++) {
if (row->expect_connect[i]) {
- fd = socket_connect(row->client[i], &error_abort);
+ fd = socket_connect(row->client[i], NULL, &error_abort);
g_assert_cmpint(fd, >=, 0);
} else {
- fd = socket_connect(row->client[i], &err);
+ fd = socket_connect(row->client[i], NULL, &err);
g_assert_cmpint(fd, ==, -1);
error_free_or_abort(&err);
}
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 8af0278f15..8b7e3cc7bf 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -1116,9 +1116,9 @@ fail:
return NULL;
}
-static int socket_get_fd(const char *fdstr, int num, Error **errp)
+static int socket_get_fd(const char *fdstr, int num, Monitor *mon, Error **errp)
{
- Monitor *cur_mon = monitor_cur();
+ Monitor *cur_mon = mon ?: monitor_cur();
int fd;
if (num != 1) {
error_setg_errno(errp, EINVAL, "socket_get_fd: too many connections");
@@ -1145,7 +1145,7 @@ static int socket_get_fd(const char *fdstr, int num, Error **errp)
return fd;
}
-int socket_connect(SocketAddress *addr, Error **errp)
+int socket_connect(SocketAddress *addr, Monitor *mon, Error **errp)
{
int fd;
@@ -1159,7 +1159,7 @@ int socket_connect(SocketAddress *addr, Error **errp)
break;
case SOCKET_ADDRESS_TYPE_FD:
- fd = socket_get_fd(addr->u.fd.str, 1, errp);
+ fd = socket_get_fd(addr->u.fd.str, 1, mon, errp);
break;
case SOCKET_ADDRESS_TYPE_VSOCK:
@@ -1187,7 +1187,7 @@ int socket_listen(SocketAddress *addr, int num, Error **errp)
break;
case SOCKET_ADDRESS_TYPE_FD:
- fd = socket_get_fd(addr->u.fd.str, num, errp);
+ fd = socket_get_fd(addr->u.fd.str, num, NULL, errp);
break;
case SOCKET_ADDRESS_TYPE_VSOCK:
--
2.29.2
next prev parent reply other threads:[~2021-04-16 8:24 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 ` [PATCH v3 11/33] block/nbd: rename NBDConnectThread to NBDClientConnection Vladimir Sementsov-Ogievskiy
2021-04-27 22:28 ` 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 ` Vladimir Sementsov-Ogievskiy [this message]
2021-04-19 9:34 ` [PATCH v3 21/33] qemu-socket: pass monitor link to socket_get_fd directly 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-22-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=berrange@redhat.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=kraxel@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).