From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etsZA-000431-W7 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 05:14:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etsZ5-0002hs-40 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 05:14:28 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52044 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 1etsZ4-0002hc-Uv for qemu-devel@nongnu.org; Thu, 08 Mar 2018 05:14:23 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 758B140252F3 for ; Thu, 8 Mar 2018 10:14:12 +0000 (UTC) Date: Thu, 8 Mar 2018 10:13:59 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Message-ID: <20180308101359.GE4718@redhat.com> Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20180306053320.15401-1-peterx@redhat.com> <20180306053320.15401-10-peterx@redhat.com> <20180307123650.GD20201@redhat.com> <20180308034409.GA32252@xz-mi> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180308034409.GA32252@xz-mi> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 9/9] 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 , Stefan Hajnoczi , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau On Thu, Mar 08, 2018 at 11:44:09AM +0800, Peter Xu wrote: > On Wed, Mar 07, 2018 at 12:36:50PM +0000, Daniel P. Berrang=C3=A9 wrote= : >=20 > [...] >=20 > > > diff --git a/chardev/char-socket.c b/chardev/char-socket.c > > > index bd40864f87..997c70dd7d 100644 > > > --- a/chardev/char-socket.c > > > +++ b/chardev/char-socket.c > > > @@ -31,6 +31,7 @@ > > > #include "qemu/option.h" > > > #include "qapi/error.h" > > > #include "qapi/clone-visitor.h" > > > +#include "sysemu/sysemu.h" > > > =20 > > > #include "chardev/char-io.h" > > > =20 > > > @@ -722,6 +723,11 @@ static void tcp_chr_tls_init(Chardev *chr) > > > Error *err =3D NULL; > > > gchar *name; > > > =20 > > > + if (!machine_init_done) { > > > + /* This will be postponed to machine_done notifier */ > > > + return; > > > + } > > > + > > > if (s->is_listen) { > > > tioc =3D qio_channel_tls_new_server( > > > s->ioc, s->tls_creds, > > > @@ -1145,6 +1151,10 @@ static int tcp_chr_machine_done_hook(Chardev= *chr) > > > tcp_chr_connect_async(chr); > > > } > > > =20 > > > + if (s->tls_creds) { > > > + tcp_chr_tls_init(chr); > > > + } > >=20 > > This looks questionable - AFAICT, there's no guarantee we have any > > client connection active when the machine dnoe hook runs. Only if > > the chardev is set in client mode, and reconnect_time is *not* set, > > but this seems to be run unconditionally. >=20 > You are right. Thanks for spotting that. >=20 > Then how about this? It's a bit ugly, but I think it should be safe: Is it perhaps not possible to just check if 's->ioc' is non-NULL in the tcp_chr_machine_done_hook for your original patch ? >=20 > diff --git a/chardev/char-socket.c b/chardev/char-socket.c > index bd40864f87..b4686fd23f 100644 > --- a/chardev/char-socket.c > +++ b/chardev/char-socket.c > @@ -31,6 +31,7 @@ > #include "qemu/option.h" > #include "qapi/error.h" > #include "qapi/clone-visitor.h" > +#include "sysemu/sysemu.h" >=20 > #include "chardev/char-io.h" >=20 > @@ -51,6 +52,11 @@ typedef struct { > QIONetListener *listener; > GSource *hup_source; > QCryptoTLSCreds *tls_creds; > + /* > + * This should only be used once - when we want to setup TLS for > + * the session but we need to wait until machine init done. > + */ > + bool tls_need_postponed_init; > int connected; > int max_size; > int do_telnetopt; > @@ -791,7 +797,15 @@ static int tcp_chr_new_client(Chardev *chr, QIOCha= nnelSocket *sioc) > } >=20 > if (s->tls_creds) { > - tcp_chr_tls_init(chr); > + if (machine_init_done) { > + tcp_chr_tls_init(chr); > + } else { > + /* > + * Postpone to machine init done since we need the correct > + * context to setup the TLS handshake. > + */ > + s->tls_need_postponed_init =3D true; > + } > } else { > if (s->do_telnetopt) { > tcp_chr_telnet_init(chr); > @@ -1145,6 +1159,11 @@ static int tcp_chr_machine_done_hook(Chardev *ch= r) > tcp_chr_connect_async(chr); > } >=20 > + if (s->tls_need_postponed_init) { > + assert(s->tls_creds); > + tcp_chr_tls_init(chr); > + } > + > return 0; > } >=20 > Thanks, >=20 > --=20 > Peter Xu Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberran= ge :| |: https://libvirt.org -o- https://fstop138.berrange.c= om :| |: https://entangle-photo.org -o- https://www.instagram.com/dberran= ge :|