Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 13 Nov 2019 14:28:42 -0500
From:   "Michael S. Tsirkin" <mst@redhat.com>
To:     Laurent Vivier <lvivier@redhat.com>
Cc:     linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Amit Shah <amit@kernel.org>,
        virtualization@lists.linux-foundation.org, stable@vger.kernel.org
Subject: Re: [PATCH v2] virtio_console: allocate inbufs in add_port() only if
 it is needed
Message-ID: <20191113142757-mutt-send-email-mst@kernel.org>
References: <20191113150056.9990-1-lvivier@redhat.com>
 <20191113101929-mutt-send-email-mst@kernel.org>
 <20191113102126-mutt-send-email-mst@kernel.org>
 <7bd34d61-146f-8edb-d82d-7285a83437b4@redhat.com>
MIME-Version: 1.0
In-Reply-To: <7bd34d61-146f-8edb-d82d-7285a83437b4@redhat.com>
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, Nov 13, 2019 at 05:37:34PM +0100, Laurent Vivier wrote:
> On 13/11/2019 16:22, Michael S. Tsirkin wrote:
> > On Wed, Nov 13, 2019 at 10:21:11AM -0500, Michael S. Tsirkin wrote:
> >> On Wed, Nov 13, 2019 at 04:00:56PM +0100, Laurent Vivier wrote:
> >>> When we hot unplug a virtserialport and then try to hot plug again,
> >>> it fails:
> >>>
> >>> (qemu) chardev-add socket,id=3Dserial0,path=3D/tmp/serial0,server,now=
ait
> >>> (qemu) device_add virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,\
> >>>                   chardev=3Dserial0,id=3Dserial0,name=3Dserial0
> >>> (qemu) device_del serial0
> >>> (qemu) device_add virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,\
> >>>                   chardev=3Dserial0,id=3Dserial0,name=3Dserial0
> >>> kernel error:
> >>>   virtio-ports vport2p2: Error allocating inbufs
> >>> qemu error:
> >>>   virtio-serial-bus: Guest failure in adding port 2 for device \
> >>>                      virtio-serial0.0
> >>>
> >>> This happens because buffers for the in_vq are allocated when the por=
t is
> >>> added but are not released when the port is unplugged.
> >>>
> >>> They are only released when virtconsole is removed (see a7a69ec0d8e4)
> >>>
> >>> To avoid the problem and to be symmetric, we could allocate all the b=
uffers
> >>> in init_vqs() as they are released in remove_vqs(), but it sounds lik=
e
> >>> a waste of memory.
> >>>
> >>> Rather than that, this patch changes add_port() logic to ignore ENOSP=
C
> >>> error in fill_queue(), which means queue has already been filled.
> >>>
> >>> Fixes: a7a69ec0d8e4 ("virtio_console: free buffers after reset")
> >>> Cc: mst@redhat.com
> >>> Cc: stable@vger.kernel.org
> >>> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> >>> ---
> >>>
> >>> Notes:
> >>>     v2: making fill_queue return int and testing return code for -ENO=
SPC
> >>>
> >>>  drivers/char/virtio_console.c | 24 +++++++++---------------
> >>>  1 file changed, 9 insertions(+), 15 deletions(-)
> >>>
> >>> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_cons=
ole.c
> >>> index 7270e7b69262..9e6534fd1aa4 100644
> >>> --- a/drivers/char/virtio_console.c
> >>> +++ b/drivers/char/virtio_console.c
> >>> @@ -1325,24 +1325,24 @@ static void set_console_size(struct port *por=
t, u16 rows, u16 cols)
> >>>  =09port->cons.ws.ws_col =3D cols;
> >>>  }
> >>> =20
> >>> -static unsigned int fill_queue(struct virtqueue *vq, spinlock_t *loc=
k)
> >>> +static int fill_queue(struct virtqueue *vq, spinlock_t *lock)
> >>>  {
> >>>  =09struct port_buffer *buf;
> >>> -=09unsigned int nr_added_bufs;
> >>> +=09int nr_added_bufs;
> >>>  =09int ret;
> >>> =20
> >>>  =09nr_added_bufs =3D 0;
> >>>  =09do {
> >>>  =09=09buf =3D alloc_buf(vq->vdev, PAGE_SIZE, 0);
> >>>  =09=09if (!buf)
> >>> -=09=09=09break;
> >>> +=09=09=09return -ENOMEM;
> >>> =20
> >>>  =09=09spin_lock_irq(lock);
> >>>  =09=09ret =3D add_inbuf(vq, buf);
> >>>  =09=09if (ret < 0) {
> >>>  =09=09=09spin_unlock_irq(lock);
> >>>  =09=09=09free_buf(buf, true);
> >>> -=09=09=09break;
> >>> +=09=09=09return ret;
> >>>  =09=09}
> >>>  =09=09nr_added_bufs++;
> >>>  =09=09spin_unlock_irq(lock);
> >=20
> > So actually, how about handling ENOSPC specially here, and
> > returning success? After all queue is full as requested ...
>=20
> I think it's interesting to return -ENOSPC to manage it as a real error
> in virtcons_probe() as in this function the queue should not be already
> full (is this right?) and to return the real error code.
>=20
> Thanks,
> Laurent

OK then. Pls add comments.