From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erQfn-0006Uo-H7 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:03:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erQfj-0005kJ-Ju for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:03:11 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39682 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erQfj-0005jk-DW for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:03:07 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F2C9B40FB657 for ; Thu, 1 Mar 2018 16:03:06 +0000 (UTC) Date: Thu, 1 Mar 2018 16:03:04 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Message-ID: <20180301160304.GT14643@redhat.com> Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20180301084438.13594-1-peterx@redhat.com> <20180301084438.13594-16-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180301084438.13594-16-peterx@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 15/15] chardev: tcp: postpone TLS work until machine done List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Paolo Bonzini , Juan Quintela , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Markus Armbruster , Stefan Hajnoczi , "Dr . David Alan Gilbert" On Thu, Mar 01, 2018 at 04:44:38PM +0800, Peter Xu wrote: > TLS handshake may create background GSource tasks, while we won't know > the correct GMainContext until the whole chardev (including frontend) > inited. Let's postpone the initial TLS handshake until machine done. > > If we dynamically add tcp chardev, it won't be affected since we have a > new tcp_chr_machine_done flag to know whether we should postpone it or > not. > > Signed-off-by: Peter Xu > --- > chardev/char-socket.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) I don't like this patch either for the same reasons as previous patch - its creating different behaviour depending on whether the 'wait' flag happens to have been set in -chardev. > > diff --git a/chardev/char-socket.c b/chardev/char-socket.c > index 2b355fc7a8..13aeca0b27 100644 > --- a/chardev/char-socket.c > +++ b/chardev/char-socket.c > @@ -72,6 +72,8 @@ typedef struct { > static gboolean socket_reconnect_timeout(gpointer opaque); > static void tcp_chr_telnet_init(Chardev *chr); > > +static bool tcp_chr_machine_done; > + > static void tcp_chr_reconn_timer_cancel(SocketChardev *s) > { > if (s->reconnect_timer) { > @@ -719,6 +721,11 @@ static void tcp_chr_tls_init(Chardev *chr) > Error *err = NULL; > gchar *name; > > + if (!tcp_chr_machine_done) { > + /* This will be postponed to machine_done notifier */ > + return; > + } > + > if (s->is_listen) { > tioc = qio_channel_tls_new_server( > s->ioc, s->tls_creds, > @@ -1131,10 +1138,17 @@ static int tcp_chr_machine_done_hook(Chardev *chr) > { > SocketChardev *s = SOCKET_CHARDEV(chr); > > + /* Set it multiple times won't hurt */ > + tcp_chr_machine_done = true; > + > if (s->reconnect_time) { > tcp_chr_connect_async(chr); > } > > + if (s->tls_creds) { > + tcp_chr_tls_init(chr); > + } > + > return 0; > } > > -- > 2.14.3 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|