From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Thomas Huth <thuth@redhat.com>,
qemu-block@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
Laurent Vivier <lvivier@redhat.com>,
Coiby Xu <Coiby.Xu@gmail.com>, Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH for-5.2 07/10] vhost-user-blk-test: fix races by using fd passing
Date: Wed, 11 Nov 2020 12:43:28 +0000 [thread overview]
Message-ID: <20201111124331.1393747-8-stefanha@redhat.com> (raw)
In-Reply-To: <20201111124331.1393747-1-stefanha@redhat.com>
Pass the QMP and vhost-user-blk server sockets as file descriptors. That
way the sockets are already open and in a listen state when the QEMU
process is launched.
This solves the race with qemu-storage-daemon startup where the UNIX
domain sockets may not be ready yet when QEMU attempts to connect. It
also saves us sleeping for 1 second if the qemu-storage-daemon QMP
socket is not ready yet.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qtest/vhost-user-blk-test.c | 42 +++++++++++++++++++------------
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c
index c5ff610d7a..e52340cffb 100644
--- a/tests/qtest/vhost-user-blk-test.c
+++ b/tests/qtest/vhost-user-blk-test.c
@@ -683,8 +683,22 @@ static char *drive_create(void)
return t_path;
}
-static char sock_path_tempate[] = "/tmp/qtest.vhost_user_blk.XXXXXX";
-static char qmp_sock_path_tempate[] = "/tmp/qtest.vhost_user_blk.qmp.XXXXXX";
+static char *create_listen_socket(int *fd)
+{
+ int tmp_fd;
+ char *path;
+
+ /* No race because our pid makes the path unique */
+ path = g_strdup_printf("/tmp/qtest-%d-sock.XXXXXX", getpid());
+ tmp_fd = mkstemp(path);
+ g_assert_cmpint(tmp_fd, >=, 0);
+ close(tmp_fd);
+ unlink(path);
+
+ *fd = qtest_socket_server(path);
+ g_test_queue_destroy(destroy_file, path);
+ return path;
+}
static void quit_storage_daemon(void *qmp_test_state)
{
@@ -709,37 +723,33 @@ static void start_vhost_user_blk(GString *cmd_line, int vus_instances,
int num_queues)
{
const char *vhost_user_blk_bin = qtest_qemu_storage_daemon_binary();
- int fd, qmp_fd, i;
+ int qmp_fd, i;
QTestState *qmp_test_state;
gchar *img_path;
- char *sock_path = NULL;
- char *qmp_sock_path = g_strdup(qmp_sock_path_tempate);
+ char *qmp_sock_path;
GString *storage_daemon_command = g_string_new(NULL);
- qmp_fd = mkstemp(qmp_sock_path);
- g_assert_cmpint(qmp_fd, >=, 0);
- g_test_queue_destroy(destroy_file, qmp_sock_path);
+ qmp_sock_path = create_listen_socket(&qmp_fd);
g_string_append_printf(storage_daemon_command,
"exec %s "
- "--chardev socket,id=qmp,path=%s,server,nowait --monitor chardev=qmp ",
- vhost_user_blk_bin, qmp_sock_path);
+ "--chardev socket,id=qmp,fd=%d,server,nowait --monitor chardev=qmp ",
+ vhost_user_blk_bin, qmp_fd);
g_string_append_printf(cmd_line,
" -object memory-backend-memfd,id=mem,size=256M,share=on -M memory-backend=mem ");
for (i = 0; i < vus_instances; i++) {
- sock_path = g_strdup(sock_path_tempate);
- fd = mkstemp(sock_path);
- g_assert_cmpint(fd, >=, 0);
- g_test_queue_destroy(drive_file, sock_path);
+ int fd;
+ char *sock_path = create_listen_socket(&fd);
+
/* create image file */
img_path = drive_create();
g_string_append_printf(storage_daemon_command,
"--blockdev driver=file,node-name=disk%d,filename=%s "
- "--export type=vhost-user-blk,id=disk%d,addr.type=unix,addr.path=%s,"
+ "--export type=vhost-user-blk,id=disk%d,addr.type=fd,addr.str=%d,"
"node-name=disk%i,writable=on,num-queues=%d ",
- i, img_path, i, sock_path, i, num_queues);
+ i, img_path, i, fd, i, num_queues);
g_string_append_printf(cmd_line, "-chardev socket,id=char%d,path=%s ",
i + 1, sock_path);
--
2.28.0
next prev parent reply other threads:[~2020-11-11 12:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 12:43 [PATCH for-5.2 00/10] block/export: vhost-user-blk server tests and input validation Stefan Hajnoczi
2020-11-11 12:43 ` [PATCH for-5.2 01/10] test: new qTest case to test the vhost-user-blk-server Stefan Hajnoczi
2020-11-25 8:20 ` Coiby Xu
2020-11-25 8:28 ` Coiby Xu
2020-12-07 11:28 ` Stefan Hajnoczi
2020-12-18 14:49 ` Coiby Xu
2020-11-11 12:43 ` [PATCH for-5.2 02/10] tests/qtest: add multi-queue test case to vhost-user-blk-test Stefan Hajnoczi
2020-11-11 12:43 ` [PATCH for-5.2 03/10] libqtest: add qtest_socket_server() Stefan Hajnoczi
2020-11-11 12:43 ` [PATCH for-5.2 04/10] vhost-user-blk-test: rename destroy_drive() to destroy_file() Stefan Hajnoczi
2020-11-12 14:32 ` Max Reitz
2020-11-12 17:04 ` Stefan Hajnoczi
2020-11-11 12:43 ` [PATCH for-5.2 05/10] vhost-user-blk-test: close fork child file descriptors Stefan Hajnoczi
2020-11-24 12:08 ` Coiby Xu
2020-12-03 13:57 ` Stefan Hajnoczi
2020-12-18 13:44 ` Coiby Xu
2020-11-11 12:43 ` [PATCH for-5.2 06/10] vhost-user-blk-test: drop unused return value Stefan Hajnoczi
2020-11-11 12:43 ` Stefan Hajnoczi [this message]
2020-11-11 12:43 ` [PATCH for-5.2 08/10] block/export: port virtio-blk discard/write zeroes input validation Stefan Hajnoczi
2020-11-12 15:25 ` Max Reitz
2020-12-07 11:38 ` Stefan Hajnoczi
2020-11-11 12:43 ` [PATCH for-5.2 09/10] vhost-user-blk-test: test discard/write zeroes invalid inputs Stefan Hajnoczi
2020-11-12 15:40 ` Max Reitz
2020-12-07 11:31 ` Stefan Hajnoczi
2020-11-11 12:43 ` [PATCH for-5.2 10/10] block/export: port virtio-blk read/write range check Stefan Hajnoczi
2020-11-12 15:51 ` Max Reitz
2020-11-17 9:18 ` [PATCH for-5.2 00/10] block/export: vhost-user-blk server tests and input validation Michael S. Tsirkin
2021-01-15 11:48 ` Peter Maydell
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=20201111124331.1393747-8-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/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).