From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Borntraeger Subject: [RFC/PATCH] virtio-console: wait for console ports Date: Wed, 21 Sep 2011 17:52:23 +0200 Message-ID: <4E7A0837.5080908@de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: KVM list , Rusty Russell , Carsten Otte , virtualization@lists.linux-foundation.org To: Amit Shah Return-path: Received: from mtagate1.uk.ibm.com ([194.196.100.161]:46654 "EHLO mtagate1.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752392Ab1IUPw2 (ORCPT ); Wed, 21 Sep 2011 11:52:28 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p8LFqQRV002523 for ; Wed, 21 Sep 2011 15:52:26 GMT Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8LFqPiG2330692 for ; Wed, 21 Sep 2011 16:52:25 +0100 Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8LFqOQj022503 for ; Wed, 21 Sep 2011 09:52:25 -0600 Sender: kvm-owner@vger.kernel.org List-ID: Amit, can you have a look at the patch below and give feedback or apply if appropriate? --- On s390 I have seen some random "Warning: unable to open an initial console" boot failure. Turns out that tty_open fails, because the hvc_alloc was not yet done. In former times this could not happen, since the probe function automatically called hvc_alloc. With newer versions (multiport) some host<->guest interaction is required before hvc_alloc is called. This might be too late, especially if an initramfs is involved. Lets use a completion if we have multiport and an early console. Signed-off-by: Christian Borntraeger --- drivers/char/virtio_console.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) Index: b/drivers/char/virtio_console.c =================================================================== --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -19,6 +19,7 @@ */ #include #include +#include #include #include #include @@ -73,6 +74,7 @@ struct ports_driver_data { static struct ports_driver_data pdrvdata; DEFINE_SPINLOCK(pdrvdata_lock); +DECLARE_COMPLETION(port_added); /* This struct holds information that's relevant only for console ports */ struct console { @@ -1352,6 +1354,7 @@ static void handle_control_message(struc break; init_port_console(port); + complete(&port_added); /* * Could remove the port here in case init fails - but * have to notify the host first. @@ -1648,6 +1651,10 @@ static int __devinit virtcons_probe(stru struct ports_device *portdev; int err; bool multiport; + bool early = early_put_chars != 0; + + /* Ensure to read early_put_chars now */ + barrier(); portdev = kmalloc(sizeof(*portdev), GFP_KERNEL); if (!portdev) { @@ -1719,6 +1726,17 @@ static int __devinit virtcons_probe(stru __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID, VIRTIO_CONSOLE_DEVICE_READY, 1); + + /* If there was an early virtio console, assume that there are no + * other consoles. We need to wait until the hvc_alloc matches the + * hvc_instantiate, otherwise tty_open will complain, resulting in + * a "Warning: unable to open an initial console" boot failure. + * Without multiport this is done in add_port above. With multiport + * this might take some host<->guest communication - thus we have to + * wait. */ + if (multiport && early) + wait_for_completion(&port_added); + return 0; free_vqs: