From nobody Tue Oct 14 13:13:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550678913364217.7644319869861; Wed, 20 Feb 2019 08:08:33 -0800 (PST) Received: from localhost ([127.0.0.1]:41662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwUQ7-0003Aj-7n for importer@patchew.org; Wed, 20 Feb 2019 11:08:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwTzf-0005EX-02 for qemu-devel@nongnu.org; Wed, 20 Feb 2019 10:41:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwTzJ-0000EA-9t for qemu-devel@nongnu.org; Wed, 20 Feb 2019 10:40:52 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34536) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwTzE-0007fR-6v for qemu-devel@nongnu.org; Wed, 20 Feb 2019 10:40:43 -0500 Received: by mail-wr1-x441.google.com with SMTP id f14so26578189wrg.1 for ; Wed, 20 Feb 2019 07:40:19 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u184sm13035735wmg.45.2019.02.20.07.40.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Feb 2019 07:40:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=A/2YGqYNp9meO0uWYxMkI89yxfxVHJdrL7sc/4vgJtc=; b=ZVyvISJheCgJeXIvltwW699DoHz5aNtcLUSIc6MrGqA+7K+0TlsHwNd0sfxFQEEpU1 Ucng4AI8wXK21BihK3IeXRegI9gr3ScQKuGt8NLh/VTpgUvSogk9jAT8Cyj4O2Il40Ey 75+At0Vzt0hK1GIQ2B9YodDWd4gF4o+2XYz1JjdlEVVxSaMH3fv26zOFDoZISF2k2HmV V8U+5UDgW1an8zprwiTP78Psun9tBAIAMMJev8ObpiAYH6OX8EFWPK8yEIQ/HVUo6MQ/ 2VX+EtH4Xuj3PJxNjk/DcT+p6ERG0gUjxDoymdfGp2BIhPilXjEPGT1ohcg6VsVwdKwP 2sFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=A/2YGqYNp9meO0uWYxMkI89yxfxVHJdrL7sc/4vgJtc=; b=mkJ0Jsed8FKaTxyJ2swR6Ujs2+KylclqdFk2XkT/grfAd+DtcrOAgu04Ef12LdibQn qcehUhu+rH5ISxBrd/cQg0nNTILaZmcwi9twAHmOms9e1GifFrozCJnrgU7UKqUM+Kbx DBxcX46jGuUNMc7kWtaMiyzc5NYV8XKoNnk2qMYgXfWfzEc+brZGhBfRXMqweabTD4Ku KFszYCrk6rqG7DkbYbmKOv55kh/3NkGTt26AB4t7nb1q6kikRQ+jfYVppR6J9Vn3Q584 ViBiXB55wWKUtVEExGq9AC/talqElwom/99uTZGSmD+BlQCLKCgCYIhf19d/RqCwQBbF ClSA== X-Gm-Message-State: AHQUAubohpjtpbt5/nYJo3IufaSwKGYcXc2UP6dXqFLbt9fA1GWea9ih vTw3kk3IRb5ZFwLdfZ5TycQShXMk X-Google-Smtp-Source: AHgI3IYdsS6wVJF9vj6T/oobu8KxDQoC4Oyx4HbExyyHjFGeBpPoq0UbktMrDqpWFdMtm1R2N+1yaA== X-Received: by 2002:adf:eb45:: with SMTP id u5mr24022439wrn.102.1550677217924; Wed, 20 Feb 2019 07:40:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2019 16:40:16 +0100 Message-Id: <1550677216-5077-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH] chardev-socket: do not blindly reset handlers when switching GMainContext X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the socket is connecting or connected, tcp_chr_update_read_handler will be called but it should not set the NetListener's callbacks again. Otherwise, tcp_chr_accept is invoked while the socket is in connected state and you get an assertion failure. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- chardev/char-socket.c | 2 +- tests/test-char.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 4fcdd8a..6d287ba 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -632,7 +632,7 @@ static void tcp_chr_update_read_handler(Chardev *chr) { SocketChardev *s =3D SOCKET_CHARDEV(chr); =20 - if (s->listener) { + if (s->listener && s->state =3D=3D TCP_CHARDEV_STATE_DISCONNECTED) { /* * It's possible that chardev context is changed in * qemu_chr_be_update_read_handlers(). Reset it for QIO net diff --git a/tests/test-char.c b/tests/test-char.c index 63b4d32..f1dec89 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1003,6 +1003,97 @@ static void char_socket_client_test(gconstpointer op= aque) g_free(optstr); } =20 +static void +count_closed_event(void *opaque, int event) +{ + int *count =3D opaque; + if (event =3D=3D CHR_EVENT_CLOSED) { + (*count)++; + } +} + + +static void char_socket_server_two_clients_test(gconstpointer opaque) +{ + SocketAddress *incoming_addr =3D (gpointer) opaque; + Chardev *chr; + CharBackend be =3D {0}; + QObject *qaddr; + SocketAddress *addr; + Visitor *v; + char *optstr; + QemuOpts *opts; + QIOChannelSocket *ioc1, *ioc2; + int closed =3D 0; + + g_setenv("QTEST_SILENT_ERRORS", "1", 1); + /* + * We rely on addr containing "nowait", otherwise + * qemu_chr_new() will block until a client connects. We + * can't spawn our client thread though, because until + * qemu_chr_new() returns we don't know what TCP port was + * allocated by the OS + */ + optstr =3D char_socket_addr_to_opt_str(incoming_addr, + false, + NULL, + true); + opts =3D qemu_opts_parse_noisily(qemu_find_opts("chardev"), + optstr, true); + g_assert_nonnull(opts); + chr =3D qemu_chr_new_from_opts(opts, NULL, &error_abort); + qemu_opts_del(opts); + g_assert_nonnull(chr); + g_assert(!object_property_get_bool(OBJECT(chr), "connected", &error_ab= ort)); + + qaddr =3D object_property_get_qobject(OBJECT(chr), "addr", &error_abor= t); + g_assert_nonnull(qaddr); + + v =3D qobject_input_visitor_new(qaddr); + visit_type_SocketAddress(v, "addr", &addr, &error_abort); + visit_free(v); + qobject_unref(qaddr); + + qemu_chr_fe_init(&be, chr, &error_abort); + + qemu_chr_fe_set_handlers(&be, NULL, NULL, count_closed_event, NULL, + &closed, NULL, true); + + ioc1 =3D qio_channel_socket_new(); + qio_channel_socket_connect_sync(ioc1, addr, &error_abort); + qemu_chr_wait_connected(chr, &error_abort); + + /* switch the chardev to another context */ + GMainContext *ctx =3D g_main_context_new(); + qemu_chr_fe_set_handlers(&be, NULL, NULL, count_closed_event, NULL, + &closed, ctx, true); + + /* Start a second connection while the first is still connected. + * It will be placed in the listen() backlog, and connect() will + * succeed immediately. + */ + ioc2 =3D qio_channel_socket_new(); + qio_channel_socket_connect_sync(ioc2, addr, &error_abort); + + object_unparent(OBJECT(ioc1)); + /* The two connections should now be processed serially. */ + while (g_main_context_iteration(ctx, TRUE)) { + if (closed =3D=3D 1 && ioc2) { + object_unparent(OBJECT(ioc2)); + ioc2 =3D NULL; + } + if (closed =3D=3D 2) { + break; + } + } + + qapi_free_SocketAddress(addr); + object_unparent(OBJECT(chr)); + g_main_context_unref(ctx); + g_free(optstr); + g_unsetenv("QTEST_SILENT_ERRORS"); +} + =20 #ifdef HAVE_CHARDEV_SERIAL static void char_serial_test(void) @@ -1346,6 +1437,10 @@ int main(int argc, char **argv) SOCKET_SERVER_TEST(unix, &unixaddr); SOCKET_CLIENT_TEST(unix, &unixaddr); #endif + g_test_add_data_func("/char/socket/server/two-clients/tcp", &tcpaddr, + char_socket_server_two_clients_test); + g_test_add_data_func("/char/socket/server/two-clients/unix", &unixaddr, + char_socket_server_two_clients_test); =20 =20 g_test_add_func("/char/udp", char_udp_test); --=20 1.8.3.1