From nobody Tue Feb 10 06:58:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1594628750; cv=none; d=zohomail.com; s=zohoarc; b=O20X3gPhpS1upVRE4dv1FIM7LcwXH1x99OTAr5ZdFG3400C9beD3t6d29FAxBJFkDAg4Y01sRh4OcKjCZJw7avQrU0IsxlLAPKpWM/pUM8Pz5xolMICzjop1KHyiCPm9x5VDHIK9W/95XN9kleaY86dH8/0Gv0RkfrizPE3j4Cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594628750; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TCSxY69a4IEh6ENvK1x9IfIircfR5ePI2fwQkbZqkdo=; b=AeuMKrJbePoeaHDdDP1xfvrYipp9ZxQVdJJEsfBxdGUkx4PtlReWMp/3ojNBh+AQRTv3MsLSvpcPE/rXufL9qcxhOs6Ray4D9IsNHXv4zPXz/2C7wU/tKLKoBR9pp5jFrRDmidhkFRbMSHEcNpPvb5BfOhLFBEIlCdiWXA/Zu14= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594628750759190.5425214508283; Mon, 13 Jul 2020 01:25:50 -0700 (PDT) Received: from localhost ([::1]:58196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jutmX-0003Z7-Bv for importer@patchew.org; Mon, 13 Jul 2020 04:25:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jutlb-0001xe-I7 for qemu-devel@nongnu.org; Mon, 13 Jul 2020 04:24:51 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:32594 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jutlZ-0006cT-Gv for qemu-devel@nongnu.org; Mon, 13 Jul 2020 04:24:51 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-408-GljYrIiIOvi3lJARap52uA-1; Mon, 13 Jul 2020 04:24:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C4EF107ACCA; Mon, 13 Jul 2020 08:24:41 +0000 (UTC) Received: from localhost (unknown [10.36.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id D74106FEF3; Mon, 13 Jul 2020 08:24:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594628688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TCSxY69a4IEh6ENvK1x9IfIircfR5ePI2fwQkbZqkdo=; b=fXuc1S9JfSksPeir312SZX4pnnS3VU5YDeX+ullv19sw6E/XUwiqd9G7nlOjuOpzgjOW7F 9e/2bUiqPeeZJ/Hdw15Oa8gJbrXaGj+hc4O4fUlI6aCBYV3zyu4r44KJayzbjHDSPz5uNI OgmPBVaDd3M01Wl+n0MI/mTxKmMDTHA= X-MC-Unique: GljYrIiIOvi3lJARap52uA-1 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PULL 1/8] char-socket: initialize reconnect timer only when the timer doesn't start Date: Mon, 13 Jul 2020 12:24:17 +0400 Message-Id: <20200713082424.2947383-2-marcandre.lureau@redhat.com> In-Reply-To: <20200713082424.2947383-1-marcandre.lureau@redhat.com> References: <20200713082424.2947383-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 01:36:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Li Feng , "Dr. David Alan Gilbert" , Markus Armbruster , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Li Feng When the disconnect event is triggered in the connecting stage, the tcp_chr_disconnect_locked may be called twice. The first call: #0 qemu_chr_socket_restart_timer (chr=3D0x55555582ee90) at chardev/cha= r-socket.c:120 #1 0x000055555558e38c in tcp_chr_disconnect_locked (chr=3D) at chardev/char-socket.c:490 #2 0x000055555558e3cd in tcp_chr_disconnect (chr=3D0x55555582ee90) at = chardev/char-socket.c:497 #3 0x000055555558ea32 in tcp_chr_new_client (chr=3Dchr@entry=3D0x55555= 582ee90, sioc=3Dsioc@entry=3D0x55555582f0b0) at chardev/char-socket.c:892 #4 0x000055555558eeb8 in qemu_chr_socket_connected (task=3D0x55555582f= 300, opaque=3D) at chardev/char-socket.c:1090 #5 0x0000555555574352 in qio_task_complete (task=3Dtask@entry=3D0x5555= 5582f300) at io/task.c:196 #6 0x00005555555745f4 in qio_task_thread_result (opaque=3D0x55555582f3= 00) at io/task.c:111 #7 qio_task_wait_thread (task=3D0x55555582f300) at io/task.c:190 #8 0x000055555558f17e in tcp_chr_wait_connected (chr=3D0x55555582ee90,= errp=3D0x555555802a08 ) at chardev/char-socket.c:1013 #9 0x0000555555567cbd in char_socket_client_reconnect_test (opaque=3D0= x5555557fe020 ) at tests/test-char.c:1152 The second call: #0 0x00007ffff5ac3277 in raise () from /lib64/libc.so.6 #1 0x00007ffff5ac4968 in abort () from /lib64/libc.so.6 #2 0x00007ffff5abc096 in __assert_fail_base () from /lib64/libc.so.6 #3 0x00007ffff5abc142 in __assert_fail () from /lib64/libc.so.6 #4 0x000055555558d10a in qemu_chr_socket_restart_timer (chr=3D0x555555= 82ee90) at chardev/char-socket.c:125 #5 0x000055555558df0c in tcp_chr_disconnect_locked (chr=3D) at chardev/char-socket.c:490 #6 0x000055555558df4d in tcp_chr_disconnect (chr=3D0x55555582ee90) at = chardev/char-socket.c:497 #7 0x000055555558e5b2 in tcp_chr_new_client (chr=3Dchr@entry=3D0x55555= 582ee90, sioc=3Dsioc@entry=3D0x55555582f0b0) at chardev/char-socket.c:892 #8 0x000055555558e93a in tcp_chr_connect_client_sync (chr=3Dchr@entry= =3D0x55555582ee90, errp=3Derrp@entry=3D0x7fffffffd178) at chardev/char-sock= et.c:944 #9 0x000055555558ec78 in tcp_chr_wait_connected (chr=3D0x55555582ee90,= errp=3D0x555555802a08 ) at chardev/char-socket.c:1035 #10 0x000055555556804b in char_socket_client_test (opaque=3D0x5555557fe= 020 ) at tests/test-char.c:1023 Run test/test-char to reproduce this issue. test-char: chardev/char-socket.c:125: qemu_chr_socket_restart_timer: Assert= ion `!s->reconnect_timer' failed. Signed-off-by: Li Feng Acked-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200522025554.41063-1-fengli@smartx.com> --- chardev/char-socket.c | 2 +- tests/test-char.c | 73 +++++++++++++++++++++++++++++++++---------- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 5758d9900fc..320aa7c642f 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -490,7 +490,7 @@ static void tcp_chr_disconnect_locked(Chardev *chr) if (emit_close) { qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } - if (s->reconnect_time) { + if (s->reconnect_time && !s->reconnect_timer) { qemu_chr_socket_restart_timer(chr); } } diff --git a/tests/test-char.c b/tests/test-char.c index 3afc9b1b8d5..73ba1cf6010 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -625,12 +625,14 @@ static void char_udp_test(void) typedef struct { int event; bool got_pong; + CharBackend *be; } CharSocketTestData; =20 =20 #define SOCKET_PING "Hello" #define SOCKET_PONG "World" =20 +typedef void (*char_socket_cb)(void *opaque, QEMUChrEvent event); =20 static void char_socket_event(void *opaque, QEMUChrEvent event) @@ -639,6 +641,27 @@ char_socket_event(void *opaque, QEMUChrEvent event) data->event =3D event; } =20 +static void +char_socket_event_with_error(void *opaque, QEMUChrEvent event) +{ + static bool first_error; + CharSocketTestData *data =3D opaque; + CharBackend *be =3D data->be; + data->event =3D event; + switch (event) { + case CHR_EVENT_OPENED: + if (!first_error) { + first_error =3D true; + qemu_chr_fe_disconnect(be); + } + return; + case CHR_EVENT_CLOSED: + return; + default: + return; + } +} + =20 static void char_socket_read(void *opaque, const uint8_t *buf, int size) @@ -699,19 +722,24 @@ char_socket_addr_to_opt_str(SocketAddress *addr, bool= fd_pass, } =20 =20 -static void -char_socket_ping_pong(QIOChannel *ioc) +static int +char_socket_ping_pong(QIOChannel *ioc, Error **errp) { char greeting[sizeof(SOCKET_PING)]; const char *response =3D SOCKET_PONG; =20 - qio_channel_read_all(ioc, greeting, sizeof(greeting), &error_abort); + int ret; + ret =3D qio_channel_read_all(ioc, greeting, sizeof(greeting), errp); + if (ret !=3D 0) { + object_unref(OBJECT(ioc)); + return -1; + } =20 g_assert(memcmp(greeting, SOCKET_PING, sizeof(greeting)) =3D=3D 0); =20 - qio_channel_write_all(ioc, response, sizeof(SOCKET_PONG), &error_abort= ); - + qio_channel_write_all(ioc, response, sizeof(SOCKET_PONG), errp); object_unref(OBJECT(ioc)); + return 0; } =20 =20 @@ -723,7 +751,7 @@ char_socket_server_client_thread(gpointer data) =20 qio_channel_socket_connect_sync(ioc, addr, &error_abort); =20 - char_socket_ping_pong(QIO_CHANNEL(ioc)); + char_socket_ping_pong(QIO_CHANNEL(ioc), &error_abort); =20 return NULL; } @@ -783,6 +811,7 @@ static void char_socket_server_test(gconstpointer opaqu= e) =20 reconnect: data.event =3D -1; + data.be =3D &be; qemu_chr_fe_set_handlers(&be, NULL, NULL, char_socket_event, NULL, &data, NULL, true); @@ -855,10 +884,13 @@ char_socket_client_server_thread(gpointer data) QIOChannelSocket *ioc =3D data; QIOChannelSocket *cioc; =20 +retry: cioc =3D qio_channel_socket_accept(ioc, &error_abort); g_assert_nonnull(cioc); =20 - char_socket_ping_pong(QIO_CHANNEL(cioc)); + if (char_socket_ping_pong(QIO_CHANNEL(cioc), NULL) !=3D 0) { + goto retry; + } =20 return NULL; } @@ -869,12 +901,13 @@ typedef struct { const char *reconnect; bool wait_connected; bool fd_pass; + char_socket_cb event_cb; } CharSocketClientTestConfig; =20 - static void char_socket_client_test(gconstpointer opaque) { const CharSocketClientTestConfig *config =3D opaque; + const char_socket_cb event_cb =3D config->event_cb; QIOChannelSocket *ioc; char *optstr; Chardev *chr; @@ -938,8 +971,9 @@ static void char_socket_client_test(gconstpointer opaqu= e) =20 reconnect: data.event =3D -1; + data.be =3D &be; qemu_chr_fe_set_handlers(&be, NULL, NULL, - char_socket_event, NULL, + event_cb, NULL, &data, NULL, true); if (config->reconnect) { g_assert(data.event =3D=3D -1); @@ -977,7 +1011,7 @@ static void char_socket_client_test(gconstpointer opaq= ue) /* Setup a callback to receive the reply to our greeting */ qemu_chr_fe_set_handlers(&be, char_socket_can_read, char_socket_read, - char_socket_event, NULL, + event_cb, NULL, &data, NULL, true); g_assert(data.event =3D=3D CHR_EVENT_OPENED); data.event =3D -1; @@ -1422,17 +1456,20 @@ int main(int argc, char **argv) =20 #define SOCKET_CLIENT_TEST(name, addr) \ static CharSocketClientTestConfig client1 ## name =3D \ - { addr, NULL, false, false }; \ + { addr, NULL, false, false, char_socket_event}; \ static CharSocketClientTestConfig client2 ## name =3D \ - { addr, NULL, true, false }; \ + { addr, NULL, true, false, char_socket_event }; \ static CharSocketClientTestConfig client3 ## name =3D \ - { addr, ",reconnect=3D1", false }; \ + { addr, ",reconnect=3D1", false, false, char_socket_event }; \ static CharSocketClientTestConfig client4 ## name =3D \ - { addr, ",reconnect=3D1", true }; \ + { addr, ",reconnect=3D1", true, false, char_socket_event }; \ static CharSocketClientTestConfig client5 ## name =3D \ - { addr, NULL, false, true }; \ + { addr, NULL, false, true, char_socket_event }; \ static CharSocketClientTestConfig client6 ## name =3D \ - { addr, NULL, true, true }; \ + { addr, NULL, true, true, char_socket_event }; \ + static CharSocketClientTestConfig client7 ## name =3D \ + { addr, ",reconnect=3D1", true, false, \ + char_socket_event_with_error }; \ g_test_add_data_func("/char/socket/client/mainloop/" # name, \ &client1 ##name, char_socket_client_test); \ g_test_add_data_func("/char/socket/client/wait-conn/" # name, \ @@ -1444,7 +1481,9 @@ int main(int argc, char **argv) g_test_add_data_func("/char/socket/client/mainloop-fdpass/" # name, \ &client5 ##name, char_socket_client_test); \ g_test_add_data_func("/char/socket/client/wait-conn-fdpass/" # name, \ - &client6 ##name, char_socket_client_test) + &client6 ##name, char_socket_client_test); \ + g_test_add_data_func("/char/socket/client/reconnect-error/" # name, \ + &client7 ##name, char_socket_client_test) =20 if (has_ipv4) { SOCKET_SERVER_TEST(tcp, &tcpaddr); --=20 2.27.0.221.ga08a83db2b