From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5C4EC38A2A for ; Fri, 8 May 2020 12:29:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B2AA21473 for ; Fri, 8 May 2020 12:29:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uT7yj9Sc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B2AA21473 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jX28V-0001lS-Pd for qemu-devel@archiver.kernel.org; Fri, 08 May 2020 08:29:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jX27k-0000ob-NT for qemu-devel@nongnu.org; Fri, 08 May 2020 08:29:04 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55212) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jX27j-0005Qr-BO for qemu-devel@nongnu.org; Fri, 08 May 2020 08:29:04 -0400 Received: by mail-wm1-x342.google.com with SMTP id h4so9995249wmb.4 for ; Fri, 08 May 2020 05:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=mDm/CZSZapOmEAWddnZho74iwr3jpLjXjgP43QfNbqQ=; b=uT7yj9Sci0W0H+fUHIdlpasfQXs24WtmCSmIArxSr9ZbsIWupwPq3KIw5/by554TcT ftyFt4yO9ZtltAAYNBr5KsJfECE1IGqhX7ar55FVOvTFC0wDM7Am8hCjVpgoq1JpvuMo g2gpjONivjLwJG8f6JXF3mioXoz/LwBmTtm6xdZHAWq9hB4GYDXgMDt9F5Dmz+ecoA7I AYLgZq0Vv0ikR20jQ25zMCYQt3pYDPnwdzKlmWEw5b1lw2iu9c8KpX7ePtCdhDwa16zM APYoGBSDxlLSgCwZCCyDK8xJmvXscbNC0h9a/Yvu/vGiZBVIweJnTLUQsfFEWN3n+1zC qc7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=mDm/CZSZapOmEAWddnZho74iwr3jpLjXjgP43QfNbqQ=; b=WFy/CcYT7+ym/FxoX/gbZSMb7lL07K5aJXMnjBXM81YtrlZheaddmnjtVmYgWxBNlx ftV+JxhEBze1kP/fLwuTorel0pG6/uDfAGR/+f5fnKQXmzujEIVDU82uPS4Fugyy25yJ 7u8WQ3DrjdaZTCu70LPmr7pk2Wc2swln5VPYypjZenob89nqpD7J1Q57CPwJHM3WbA2j r8RIoOOqxKyAfX+98YIB8JDFW905/5J1eaJPmwCTziOdMzNgp3waFA+zGpzRB4wzl8ob zpVyzI16DnvlyZx69ElWIaTKtGPuADZ5iZku/qkILLm3OYz6GSDdAvVhCyqKIWbkhYLW IVmw== X-Gm-Message-State: AGi0PuYangwTpBu1njj6Q5hNGf2dYFnIFlBZd330u/0Aq34f02BPADSC atX29fh9r2PJTHPwOWaSnZl8KoUGnQlAfqyPneY= X-Google-Smtp-Source: APiQypLk+vu+zne2rC5BohT9MbhQ/U1+Wbq3wdG414pIIGupVcVPjziax2V7gu3osi8zqe4OZxsWaTqyp9No+ovF1kA= X-Received: by 2002:a7b:c38b:: with SMTP id s11mr15946320wmj.55.1588940940795; Fri, 08 May 2020 05:29:00 -0700 (PDT) MIME-Version: 1.0 References: <20200428085122.1621-1-fengli@smartx.com> <20200508051441.8143-1-fengli@smartx.com> <20200508051441.8143-3-fengli@smartx.com> In-Reply-To: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Fri, 8 May 2020 14:28:48 +0200 Message-ID: Subject: Re: [PATCH v3 2/2] char-socket: initialize reconnect timer only when the timer doesn't start To: Li Feng Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=marcandre.lureau@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, FROM_EXCESS_BASE64=0.979, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Feng Li , Kyle Zhang , Dima Stepanov , "open list:All patches CC here" , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi On Fri, May 8, 2020 at 2:16 PM Li Feng wrote: > > Have you applied the first one? > io/channel: fix crash when qio_channel_readv_all return 0 > Sorry, I missed that one. With that it passes. thanks > Thanks, > > Feng Li > > Marc-Andr=C3=A9 Lureau =E4=BA=8E2020=E5=B9= =B45=E6=9C=888=E6=97=A5=E5=91=A8=E4=BA=94 =E4=B8=8B=E5=8D=887:01=E5=86=99= =E9=81=93=EF=BC=9A > > > > > On Fri, May 8, 2020 at 7:14 AM Li Feng wrote: > > > > > > 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 chard= ev/char-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=3D0x55555582ee9= 0) at chardev/char-socket.c:497 > > > #3 0x000055555558ea32 in tcp_chr_new_client (chr=3Dchr@entry=3D0= x55555582ee90, sioc=3Dsioc@entry=3D0x55555582f0b0) at chardev/char-socket.c= :892 > > > #4 0x000055555558eeb8 in qemu_chr_socket_connected (task=3D0x555= 55582f300, opaque=3D) at chardev/char-socket.c:1090 > > > #5 0x0000555555574352 in qio_task_complete (task=3Dtask@entry=3D= 0x55555582f300) at io/task.c:196 > > > #6 0x00005555555745f4 in qio_task_thread_result (opaque=3D0x5555= 5582f300) 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=3D0x5555558= 2ee90, errp=3D0x555555802a08 ) at chardev/char-socket.c:1013 > > > #9 0x0000555555567cbd in char_socket_client_reconnect_test (opaq= ue=3D0x5555557fe020 ) 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=3D0x= 55555582ee90) 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=3D0x55555582ee9= 0) at chardev/char-socket.c:497 > > > #7 0x000055555558e5b2 in tcp_chr_new_client (chr=3Dchr@entry=3D0= x55555582ee90, 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= -socket.c:944 > > > #9 0x000055555558ec78 in tcp_chr_wait_connected (chr=3D0x5555558= 2ee90, errp=3D0x555555802a08 ) at chardev/char-socket.c:1035 > > > #10 0x000055555556804b in char_socket_client_test (opaque=3D0x555= 5557fe020 ) 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: = Assertion `!s->reconnect_timer' failed. > > > > > > Signed-off-by: Li Feng > > > > After applying your patch, with qemu configure --enable-debug > > --enable-sanitizers: > > > > $ tests/test-char > > Unexpected error in qio_channel_readv_all() at > > /home/elmarco/src/qq/io/channel.c:147: > > Unexpected end-of-file before all bytes were read > > [1] 2445287 abort (core dumped) tests/test-char > > > > > --- > > > chardev/char-socket.c | 2 +- > > > tests/test-char.c | 68 ++++++++++++++++++++++++++++++++++++++++-= ---------- > > > 2 files changed, 55 insertions(+), 15 deletions(-) > > > > > > diff --git a/chardev/char-socket.c b/chardev/char-socket.c > > > index 1f14c2c7c8..d84330b3c9 100644 > > > --- a/chardev/char-socket.c > > > +++ b/chardev/char-socket.c > > > @@ -486,7 +486,7 @@ static void tcp_chr_disconnect_locked(Chardev *ch= r) > > > 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 8d39bdc9fa..d5c9049eec 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; > > > > > > > > > #define SOCKET_PING "Hello" > > > #define SOCKET_PONG "World" > > > > > > +typedef void (*char_socket_cb)(void *opaque, QEMUChrEvent event); > > > > > > static void > > > char_socket_event(void *opaque, QEMUChrEvent event) > > > @@ -639,6 +641,27 @@ char_socket_event(void *opaque, QEMUChrEvent eve= nt) > > > data->event =3D event; > > > } > > > > > > +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; > > > + } > > > +} > > > + > > > > > > 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, > > > } > > > > > > > > > -static void > > > +static int > > > char_socket_ping_pong(QIOChannel *ioc) > > > { > > > char greeting[sizeof(SOCKET_PING)]; > > > const char *response =3D SOCKET_PONG; > > > > > > - qio_channel_read_all(ioc, greeting, sizeof(greeting), &error_abo= rt); > > > + int ret; > > > + ret =3D qio_channel_read_all(ioc, greeting, sizeof(greeting), &e= rror_abort); > > > + if (ret !=3D 0) { > > > + object_unref(OBJECT(ioc)); > > > + return -1; > > > + } > > > > > > g_assert(memcmp(greeting, SOCKET_PING, sizeof(greeting)) =3D=3D = 0); > > > > > > qio_channel_write_all(ioc, response, sizeof(SOCKET_PONG), &error= _abort); > > > - > > > object_unref(OBJECT(ioc)); > > > + return 0; > > > } > > > > > > > > > @@ -783,6 +811,7 @@ static void char_socket_server_test(gconstpointer= opaque) > > > > > > 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; > > > > > > +retry: > > > cioc =3D qio_channel_socket_accept(ioc, &error_abort); > > > g_assert_nonnull(cioc); > > > > > > - char_socket_ping_pong(QIO_CHANNEL(cioc)); > > > + if (char_socket_ping_pong(QIO_CHANNEL(cioc)) !=3D 0) { > > > + goto retry; > > > + } > > > > > > return NULL; > > > } > > > @@ -869,6 +901,7 @@ typedef struct { > > > const char *reconnect; > > > bool wait_connected; > > > bool fd_pass; > > > + char_socket_cb event_cb; > > > } CharSocketClientTestConfig; > > > > > > static void char_socket_client_dupid_test(gconstpointer opaque) > > > @@ -920,6 +953,7 @@ static void char_socket_client_dupid_test(gconstp= ointer opaque) > > > 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; > > > @@ -983,8 +1017,9 @@ static void char_socket_client_test(gconstpointe= r opaque) > > > > > > 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); > > > @@ -1022,7 +1057,7 @@ static void char_socket_client_test(gconstpoint= er opaque) > > > /* 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; > > > @@ -1467,19 +1502,22 @@ int main(int argc, char **argv) > > > > > > #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", false, false }; = \ > > > + { addr, ",reconnect=3D1", false, false, char_socket_event };= \ > > > + static CharSocketClientTestConfig client8 ## 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, = \ > > > @@ -1493,7 +1531,9 @@ int main(int argc, char **argv) > > > g_test_add_data_func("/char/socket/client/wait-conn-fdpass/" # n= ame, \ > > > &client6 ##name, char_socket_client_test); = \ > > > g_test_add_data_func("/char/socket/client/dupid-reconnect/" # na= me, \ > > > - &client7 ##name, char_socket_client_dupid_t= est) > > > + &client7 ##name, char_socket_client_dupid_t= est);\ > > > + g_test_add_data_func("/char/socket/client/reconnect-error/" # na= me, \ > > > + &client8 ##name, char_socket_client_test) > > > > > > if (has_ipv4) { > > > SOCKET_SERVER_TEST(tcp, &tcpaddr); > > > -- > > > 2.11.0 > > > > > > --=20 Marc-Andr=C3=A9 Lureau