From nobody Mon Feb 9 01:28:20 2026 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 1550685896241182.62633760491394; Wed, 20 Feb 2019 10:04:56 -0800 (PST) Received: from localhost ([127.0.0.1]:44961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwWEk-0001Sm-5d for importer@patchew.org; Wed, 20 Feb 2019 13:04:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwVtT-0000Sv-CE for qemu-devel@nongnu.org; Wed, 20 Feb 2019 12:42:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwVtR-0001W6-G2 for qemu-devel@nongnu.org; Wed, 20 Feb 2019 12:42:51 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37812) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwVtN-0001Rb-Qh for qemu-devel@nongnu.org; Wed, 20 Feb 2019 12:42:48 -0500 Received: by mail-wm1-x344.google.com with SMTP id x10so7204379wmg.2 for ; Wed, 20 Feb 2019 09:42:41 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s8sm39581339wrn.44.2019.02.20.09.42.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Feb 2019 09:42:39 -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:mime-version :content-transfer-encoding; bh=rgJdVxXb//3nYJuXxwYqYPd/dzhtb8fdbqHq4H7VHt8=; b=cOUIgkPEYqdKthqos+rjV2ATIf1tR3vZh7Cb3UKWyvfqARuR6SCCO1esrQz8SVM6QE IwdC8Nb2w8BhYzDFINSCXQG7Kjr3PYWqmTDKRufQy3co9KV93JvM8FbvwMAxiTLN0BoC znv7iOo+P9Qa+uc/vaBlPc4bM84M1E4pN89FV6/BoM7DeGIOpB5EBTtSuKDzxjwIaYly Gl8Z76cFF94yYjPuzwAVzy5nFTEi/AOmYIY97MwgdofqlHRamjUlRy/k13StlmNtaweP I+ooXCgwxW9pEjtKoYmJ/9xWROvYYN4ylUaG5z8u0aHs0hwdRA+UhDNw6WTjs2JrWg49 KPtA== 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 :mime-version:content-transfer-encoding; bh=rgJdVxXb//3nYJuXxwYqYPd/dzhtb8fdbqHq4H7VHt8=; b=RIKYbO43Gdgd4W08tpKjAriOk2FWKI2mRPNI3u4uTa204PPJbOAH3p96H9Lldu82yv Yt7SqAt8A+RnJM+eJQRemmGfw02ELE1xBOaJt63af29A0oXiXznGY7RkwsLGKrXtC3J1 8TMnrYfIArpg0dEwVvGycqEcafA0n87HtCJAbIeKqwhGffZzBAkYPkGqXGfLZ1ACg5HP D/BcHSlkMOEzGPUELrwpkutAegxWm9oN6dlgddb4qKBGLV5i/JDI8NGjdP1EOlSsGPiZ EG347UK4oLRiCrPcwqPI1efxSwHCGqxMBqkt5Ozaxiuwz9a7C3L2Z2kW/pBecZTYPTAc US4Q== X-Gm-Message-State: AHQUAuZi26LV4RG3MfZWAQ6xNwSeviPCSMC2og4h58C0mIYDpAve/xdB 67nS+97xhNCyG5NRlVbdP6DYKOm4 X-Google-Smtp-Source: AHgI3IbaPn6n7FIMpQdtlDPgLYyfJkPawhZ8D+/jJbSbyZcHtYTKMxLxknq+3FifDWcxBv7kWO1MtA== X-Received: by 2002:a1c:6854:: with SMTP id d81mr6991772wmc.91.1550684560171; Wed, 20 Feb 2019 09:42:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2019 18:42:38 +0100 Message-Id: <1550684558-12865-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v2] 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: marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- chardev/char-socket.c | 2 +- tests/test-char.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++= +++- 2 files changed, 95 insertions(+), 2 deletions(-) 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..e372f77 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_unref(OBJECT(ioc1)); + /* The two connections should now be processed serially. */ + while (g_main_context_iteration(ctx, TRUE)) { + if (closed =3D=3D 1 && ioc2) { + object_unref(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) @@ -1312,7 +1403,9 @@ int main(int argc, char **argv) g_test_add_data_func("/char/socket/server/mainloop-fdpass/" # name, \ &server3 ##name, char_socket_server_test); \ g_test_add_data_func("/char/socket/server/wait-conn-fdpass/" # name, \ - &server4 ##name, char_socket_server_test) + &server4 ##name, char_socket_server_test); \ + g_test_add_data_func("/char/socket/server/two-clients/" # name, \ + &tcpaddr, char_socket_server_two_clients_test) =20 #define SOCKET_CLIENT_TEST(name, addr) \ CharSocketClientTestConfig client1 ## name =3D \ --=20 1.8.3.1