2012-11-08 09:17:33

by Amit Shah

Subject: [[PATCH v9 3/3] 1/1] virtio_console: Remove buffers from out_vq at port removal

From: Sjur Brændeland <[email protected]>

Remove buffers from the out-queue when a port is removed. Rproc_serial
communicates with remote processors that may crash and leave buffers in
the out-queue. The virtio serial ports may have buffers in the out-queue
as well, e.g. for non-blocking ports and the host didn't consume them
yet.

[Amit: Remove WARN_ON for generic ports case.]

Signed-off-by: Sjur Brændeland <[email protected]>
Signed-off-by: Amit Shah <[email protected]>
---
drivers/char/virtio_console.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 9ebadcb..5ff3b3e 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -1521,6 +1521,10 @@ static void remove_port_data(struct port *port)
/* Remove buffers we queued up for the Host to send us data in. */
while ((buf = virtqueue_detach_unused_buf(port->in_vq)))
free_buf(buf, true);
+
+ /* Remove buffers we queued up for the Host to consume */
+ while ((buf = virtqueue_detach_unused_buf(port->out_vq)))
+ free_buf(buf, true);
}

/*
--
1.7.7.6

2012-11-16 01:16:33

by Rusty Russell

Subject: Re: [[PATCH v9 3/3] 1/1] virtio_console: Remove buffers from out_vq at port removal

Amit Shah <[email protected]> writes:
> From: Sjur Brændeland <[email protected]>
>
> Remove buffers from the out-queue when a port is removed. Rproc_serial
> communicates with remote processors that may crash and leave buffers in
> the out-queue. The virtio serial ports may have buffers in the out-queue
> as well, e.g. for non-blocking ports and the host didn't consume them
> yet.
>
> [Amit: Remove WARN_ON for generic ports case.]
>
> Signed-off-by: Sjur Brændeland <[email protected]>
> Signed-off-by: Amit Shah <[email protected]>

I already have this in my pending queue; I've promoted it to my
virtio-next branch now.

Thanks,
Rusty.