[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/33] virtio-serial: add missing virtio_detach_eleme
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 10/33] virtio-serial: add missing virtio_detach_element() call |
Date: |
Mon, 10 Oct 2016 05:57:47 +0300 |
From: Stefan Hajnoczi <address@hidden>
Ports enter a "throttled" state when writing to the chardev would block.
The current output VirtQueueElement is kept around until the chardev
becomes writable again.
There are several places in the virtio-serial lifecycle where the
VirtQueueElement should be thrown away. For example, if the virtio
device is reset then virtqueue elements are no longer valid.
This patch adds the discard_throttle_data() function to unmap the
scatter-gather list and decrement vq->inuse. This ensures that the
VirtQueueElement is freed properly.
Cc: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
Tested-by: Ladi Prosek <address@hidden>
Reviewed-by: Ladi Prosek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/char/virtio-serial-bus.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index db2a9f1..3955f0f 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -145,6 +145,15 @@ static void discard_vq_data(VirtQueue *vq, VirtIODevice
*vdev)
virtio_notify(vdev, vq);
}
+static void discard_throttle_data(VirtIOSerialPort *port)
+{
+ if (port->elem) {
+ virtqueue_detach_element(port->ovq, port->elem, 0);
+ g_free(port->elem);
+ port->elem = NULL;
+ }
+}
+
static void do_flush_queued_data(VirtIOSerialPort *port, VirtQueue *vq,
VirtIODevice *vdev)
{
@@ -267,6 +276,7 @@ int virtio_serial_close(VirtIOSerialPort *port)
* consume, reset the throttling flag and discard the data.
*/
port->throttled = false;
+ discard_throttle_data(port);
discard_vq_data(port->ovq, VIRTIO_DEVICE(port->vser));
send_control_event(port->vser, port->id, VIRTIO_CONSOLE_PORT_OPEN, 0);
@@ -591,6 +601,9 @@ static void guest_reset(VirtIOSerial *vser)
QTAILQ_FOREACH(port, &vser->ports, next) {
vsc = VIRTIO_SERIAL_PORT_GET_CLASS(port);
+
+ discard_throttle_data(port);
+
if (port->guest_connected) {
port->guest_connected = false;
if (vsc->set_guest_connected) {
@@ -901,6 +914,7 @@ static void remove_port(VirtIOSerial *vser, uint32_t
port_id)
assert(port);
/* Flush out any unconsumed buffers first */
+ discard_throttle_data(port);
discard_vq_data(port->ovq, VIRTIO_DEVICE(port->vser));
send_control_event(vser, port->id, VIRTIO_CONSOLE_PORT_REMOVE, 1);
--
MST
- [Qemu-devel] [PULL 05/33] acpi: provide _PXM method for CPU devices if QEMU is started numa enabled, (continued)
- [Qemu-devel] [PULL 05/33] acpi: provide _PXM method for CPU devices if QEMU is started numa enabled, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 09/33] virtio-blk: add missing virtio_detach_element() call, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 04/33] numa: reduce code duplication by adding helper numa_get_node_for_cpu(), Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 17/33] virtio-net: handle virtio_net_flush_tx() errors, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 19/33] virtio-scsi: handle virtio_scsi_set_config() error, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 13/33] virtio-9p: handle handle_9p_output() error, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 18/33] virtio-scsi: convert virtio_scsi_bad_req() to use virtio_error(), Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 24/33] virtio-9p: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 27/33] virtio-input: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 16/33] virtio-net: handle virtio_net_receive() errors, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 10/33] virtio-serial: add missing virtio_detach_element() call,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 20/33] net: don't poke at chardev internal QemuOpts, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 23/33] virtio-net: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 15/33] virtio-net: handle virtio_net_handle_ctrl() error, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 29/33] virtio-balloon: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 21/33] virtio: prepare change VMSTATE_VIRTIO_DEVICE macro, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 26/33] virtio-gpu: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 22/33] virtio-blk: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 14/33] virtio-blk: handle virtio_blk_handle_request() errors, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 31/33] vhost-vsock: convert VMSTATE_VIRTIO_DEVICE, Michael S. Tsirkin, 2016/10/09
- [Qemu-devel] [PULL 12/33] virtio-blk: make some functions static, Michael S. Tsirkin, 2016/10/09