mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

virtio: console: Move vq and vq buf removal into separate functions 

This common code will be shared with the PM freeze function.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Amit Shah 2011-12-22 16:58:27 +05:30 committed by Rusty Russell
parent f0fe6f1150
commit a0e2dbfc22
1 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
drivers/char/virtio_console.c
View File

@ -1271,6 +1271,20 @@ static void remove_port(struct kref *kref)
kfree(port); kfree(port);
} }
static void remove_port_data(struct port *port)
{
struct port_buffer *buf;
/* Remove unused data this port might have received. */
discard_port_data(port);
reclaim_consumed_buffers(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);
}
/* /*
* Port got unplugged. Remove port from portdev's list and drop the * Port got unplugged. Remove port from portdev's list and drop the
* kref reference. If no userspace has this port opened, it will * kref reference. If no userspace has this port opened, it will
@ -1278,8 +1292,6 @@ static void remove_port(struct kref *kref)
*/ */
static void unplug_port(struct port *port) static void unplug_port(struct port *port)
{ {
struct port_buffer *buf;
spin_lock_irq(&port->portdev->ports_lock); spin_lock_irq(&port->portdev->ports_lock);
list_del(&port->list); list_del(&port->list);
spin_unlock_irq(&port->portdev->ports_lock); spin_unlock_irq(&port->portdev->ports_lock);
@ -1300,14 +1312,7 @@ static void unplug_port(struct port *port)
hvc_remove(port->cons.hvc); hvc_remove(port->cons.hvc);
} }
/* Remove unused data this port might have received. */ remove_port_data(port);
discard_port_data(port);
reclaim_consumed_buffers(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);
/* /*
* We should just assume the device itself has gone off -- * We should just assume the device itself has gone off --
@ -1659,6 +1664,28 @@ static const struct file_operations portdev_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static void remove_vqs(struct ports_device *portdev)
{
portdev->vdev->config->del_vqs(portdev->vdev);
kfree(portdev->in_vqs);
kfree(portdev->out_vqs);
}
static void remove_controlq_data(struct ports_device *portdev)
{
struct port_buffer *buf;
unsigned int len;
if (!use_multiport(portdev))
return;
while ((buf = virtqueue_get_buf(portdev->c_ivq, &len)))
free_buf(buf);
while ((buf = virtqueue_detach_unused_buf(portdev->c_ivq)))
free_buf(buf);
}
/* /*
* Once we're further in boot, we get probed like any other virtio * Once we're further in boot, we get probed like any other virtio
* device. * device.
@ -1764,9 +1791,7 @@ free_vqs:
/* The host might want to notify mgmt sw about device add failure */ /* The host might want to notify mgmt sw about device add failure */
__send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID, __send_control_msg(portdev, VIRTIO_CONSOLE_BAD_ID,
VIRTIO_CONSOLE_DEVICE_READY, 0); VIRTIO_CONSOLE_DEVICE_READY, 0);
vdev->config->del_vqs(vdev); remove_vqs(portdev);
kfree(portdev->in_vqs);
kfree(portdev->out_vqs);
free_chrdev: free_chrdev:
unregister_chrdev(portdev->chr_major, "virtio-portsdev"); unregister_chrdev(portdev->chr_major, "virtio-portsdev");
free: free:
@ -1804,21 +1829,8 @@ static void virtcons_remove(struct virtio_device *vdev)
* have to just stop using the port, as the vqs are going * have to just stop using the port, as the vqs are going
* away. * away.
*/ */
if (use_multiport(portdev)) { remove_controlq_data(portdev);
struct port_buffer *buf; remove_vqs(portdev);
unsigned int len;
while ((buf = virtqueue_get_buf(portdev->c_ivq, &len)))
free_buf(buf);
while ((buf = virtqueue_detach_unused_buf(portdev->c_ivq)))
free_buf(buf);
}
vdev->config->del_vqs(vdev);
kfree(portdev->in_vqs);
kfree(portdev->out_vqs);
kfree(portdev); kfree(portdev);
} }