From patchwork Wed Aug 5 09:58:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 39335 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n759xRTJ000736 for ; Wed, 5 Aug 2009 09:59:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933319AbZHEJ7T (ORCPT ); Wed, 5 Aug 2009 05:59:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933188AbZHEJ7T (ORCPT ); Wed, 5 Aug 2009 05:59:19 -0400 Received: from mx2.redhat.com ([66.187.237.31]:52102 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933314AbZHEJ7R (ORCPT ); Wed, 5 Aug 2009 05:59:17 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n759xAPJ015841; Wed, 5 Aug 2009 05:59:10 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n759x9be017857; Wed, 5 Aug 2009 05:59:09 -0400 Received: from localhost (vpn-12-175.rdu.redhat.com [10.11.12.175]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n759x51I021937; Wed, 5 Aug 2009 05:59:07 -0400 Date: Wed, 5 Aug 2009 15:28:55 +0530 From: Amit Shah To: Rusty Russell Cc: virtualization@lists.linux-foundation.org, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: Re: [PATCH 1/1] virtio_serial: A char device for simple guest <-> host communication Message-ID: <20090805095855.GA21740@amit-x200.redhat.com> References: <1248717876-17630-1-git-send-email-amit.shah@redhat.com> <1248717876-17630-2-git-send-email-amit.shah@redhat.com> <200908050933.42709.rusty@rustcorp.com.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <200908050933.42709.rusty@rustcorp.com.au> User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On (Wed) Aug 05 2009 [09:33:40], Rusty Russell wrote: > On Tue, 28 Jul 2009 03:34:33 am Amit Shah wrote: > > We expose multiple char devices ("ports") for simple communication > > between the host userspace and guest. > > Hi Amit, > > OK, seems like it's time for some serious review. Below. Thanks for the review, Rusty. The result is: drivers/char/Kconfig | 5 - drivers/char/virtio_serial.c | 160 ++++++++++++++++++------------------------ include/linux/virtio_serial.h | 3 3 files changed, 73 insertions(+), 95 deletions(-) Major changes since the last version are: - add support for poll() - return as much data as possible for read() - fix memleaks - remove ioctl code - other cleanups suggested by Rusty Thanks, Amit From 04fa836c1d965ba57d6d662830e431e4c12637f5 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Wed, 5 Aug 2009 15:22:01 +0530 Subject: [PATCH] virtio_serial: A char device for simple guest <-> host communication We expose multiple char devices ("ports") for simple communication between the host userspace and guest. Sample offline usages can be: poking around in a guest to find out the file systems used, applications installed, etc. Online usages can be sharing of clipboard data between the guest and the host, sending information about logged-in users to the host, locking the screen or session when a vnc session is closed, and so on. The interface presented to guest userspace is of a simple char device, so it can be used like this: fd = open("/dev/vmch0", O_RDWR); ret = read(fd, buf, 100); ret = write(fd, string, strlen(string)); Each port is to be assigned a unique function, for example, the first 4 ports may be reserved for libvirt usage, the next 4 for generic streaming data and so on. This port-function mapping isn't finalised yet. For requirements, use-cases and some history see http://www.linux-kvm.org/page/VMchannel_Requirements Signed-off-by: Amit Shah --- drivers/char/Kconfig | 7 + drivers/char/Makefile | 1 + drivers/char/virtio_serial.c | 688 +++++++++++++++++++++++++++++++++++++++++ include/linux/virtio_serial.h | 24 ++ 4 files changed, 720 insertions(+), 0 deletions(-) create mode 100644 drivers/char/virtio_serial.c create mode 100644 include/linux/virtio_serial.h diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 6a06913..69fce0d 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -679,6 +679,13 @@ config VIRTIO_CONSOLE help Virtio console for use with lguest and other hypervisors. +config VIRTIO_SERIAL + tristate "Virtio serial" + select VIRTIO + help + Virtio serial device driver for simple guest and host + communication. Character devices at /dev/vmchNN will be + created when corresponding ports are found. config HVCS tristate "IBM Hypervisor Virtual Console Server support" diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 66f779a..5e1915b 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -54,6 +54,7 @@ obj-$(CONFIG_HVC_XEN) += hvc_xen.o obj-$(CONFIG_HVC_IUCV) += hvc_iucv.o obj-$(CONFIG_HVC_UDBG) += hvc_udbg.o obj-$(CONFIG_VIRTIO_CONSOLE) += virtio_console.o +obj-$(CONFIG_VIRTIO_SERIAL) += virtio_serial.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MSPEC) += mspec.o diff --git a/drivers/char/virtio_serial.c b/drivers/char/virtio_serial.c new file mode 100644 index 0000000..fa5ed24 --- /dev/null +++ b/drivers/char/virtio_serial.c @@ -0,0 +1,688 @@ +/* + * VirtIO Serial driver + * + * This is paravirtualised serial guest<->host communication channel + * for relaying short messages and events in either direction. + * + * One PCI device can have multiple serial ports so that different + * applications can communicate without polluting the PCI device space + * in the guest. + * + * Copyright (C) 2009, Red Hat, Inc. + * + * Author(s): Amit Shah + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct virtio_serial_struct { + struct work_struct rx_work; + struct work_struct tx_work; + struct work_struct queue_work; + struct work_struct config_work; + + struct list_head port_head; + struct list_head unused_buf; + + struct virtio_device *vdev; + struct class *class; + struct virtqueue *in_vq, *out_vq; + + struct virtio_serial_config *config; +}; + +/* This struct holds individual buffers received for each port */ +struct virtio_serial_port_buffer { + struct list_head next; + + char *buf; + + size_t len; /* length of the buffer */ + size_t offset; /* offset in the buf from which to consume data */ +}; + +/* This struct is put in each buffer that gets passed to userspace and + * vice-versa + */ +struct virtio_serial_id { + u32 id; /* Port number */ +}; + +struct virtio_serial_port { + /* Next port in the list */ + struct list_head next; + + /* Buffer management */ + struct virtio_serial_port_buffer read_buf; + struct list_head readbuf_head; + wait_queue_head_t waitqueue; + + /* Each port associates with a separate char device */ + struct cdev cdev; + struct device *dev; +}; + +static struct virtio_serial_struct virtserial; + +static int major = 60; /* from the experimental range */ + +static struct virtio_serial_port *get_port_from_id(u32 id) +{ + struct virtio_serial_port *port; + + list_for_each_entry(port, &virtserial.port_head, next) { + if (MINOR(port->dev->devt) == id) + return port; + } + return NULL; +} + +static int get_id_from_port(struct virtio_serial_port *port) +{ + return MINOR(port->dev->devt); +} + +static struct virtio_serial_port *get_port_from_buf(char *buf) +{ + u32 id; + + memcpy(&id, buf, sizeof(id)); + + return get_port_from_id(id); +} + + +static ssize_t virtserial_read(struct file *filp, char __user *ubuf, + size_t count, loff_t *offp) +{ + struct virtio_serial_port *port; + struct virtio_serial_port_buffer *buf, *buf2; + ssize_t ubuf_offset, ret; + + port = filp->private_data; + + ret = 0; + if (list_empty(&port->readbuf_head)) { + if (filp->f_flags & O_NONBLOCK) + return -EAGAIN; + + ret = wait_event_interruptible(port->waitqueue, + !list_empty(&port->readbuf_head)); + } + if (ret < 0) + return ret; + + ubuf_offset = 0; + list_for_each_entry_safe(buf, buf2, &port->readbuf_head, next) { + size_t copy_size; + + copy_size = count; + if (copy_size > buf->len - buf->offset) + copy_size = buf->len - buf->offset; + + ret = copy_to_user(ubuf + ubuf_offset, buf->buf + buf->offset, + copy_size); + + /* FIXME: Deal with ret != 0 */ + /* Return the number of bytes actually copied */ + ret = copy_size - ret; + buf->offset += ret; + ubuf_offset += ret; + count -= ret; + ret = ubuf_offset; + + if (buf->len - buf->offset == 0) { + list_del(&buf->next); + kfree(buf->buf); + kfree(buf); + } + if (!count) + break; + } + return ret; +} + +/* For data that exceeds PAGE_SIZE in size we should send it all in + * one sg to not unnecessarily split up the data. Also some (all?) + * vnc clients don't consume split data. + * + * If we are to keep PAGE_SIZE sized buffers, we then have to stack + * multiple of those in one virtio request. virtio-ring returns to us + * just one pointer for all the buffers. So use this struct to + * allocate the bufs in so that freeing this up later is easier. + */ +struct vbuf { + char **bufs; + struct scatterlist *sg; + unsigned int nent; +}; + +static ssize_t virtserial_write(struct file *filp, const char __user *ubuf, + size_t count, loff_t *offp) +{ + struct virtqueue *out_vq; + struct virtio_serial_port *port; + struct virtio_serial_id id; + struct vbuf *vbuf; + size_t offset, size; + ssize_t ret; + int i, id_len; + + port = filp->private_data; + id.id = get_id_from_port(port); + out_vq = virtserial.out_vq; + + id_len = sizeof(id); + + ret = -ENOMEM; + vbuf = kzalloc(sizeof(struct vbuf), GFP_KERNEL); + if (!vbuf) + return ret; + + /* Max. number of buffers clubbed together in one message */ + vbuf->nent = (count + id_len + PAGE_SIZE - 1) / PAGE_SIZE; + + vbuf->bufs = kzalloc(vbuf->nent, GFP_KERNEL); + if (!vbuf->bufs) + goto free_vbuf; + + vbuf->sg = kzalloc(vbuf->nent, GFP_KERNEL); + if (!vbuf->sg) + goto free_bufs; + sg_init_table(vbuf->sg, vbuf->nent); + + i = 0; /* vbuf->bufs[i] */ + offset = 0; /* offset in the user buffer */ + while (count - offset) { + size = min(count - offset + id_len, PAGE_SIZE); + vbuf->bufs[i] = kzalloc(size, GFP_KERNEL); + if (!vbuf->bufs[i]) { + ret = -EFBIG; + goto free_buffers; + } + if (id_len) { + memcpy(vbuf->bufs[i], &id, id_len); + size -= id_len; + } + ret = copy_from_user(vbuf->bufs[i] + id_len, ubuf + offset, size); + offset += size - ret; + + sg_set_buf(&vbuf->sg[i], vbuf->bufs[i], size - ret + id_len); + id_len = 0; /* Pass the port id only in the first buffer */ + i++; + } + if (out_vq->vq_ops->add_buf(out_vq, vbuf->sg, i, 0, vbuf)) { + /* XXX: We can't send the buffer. Report failure */ + ret = 0; + } + /* Tell Host to go! */ + out_vq->vq_ops->kick(out_vq); + + /* We're expected to return the amount of data we wrote */ + return offset; +free_buffers: + while (i--) + kfree(vbuf->bufs[i]); + kfree(vbuf->sg); +free_bufs: + kfree(vbuf->bufs); +free_vbuf: + kfree(vbuf); + return ret; +} + +static int virtserial_release(struct inode *inode, struct file *filp) +{ + return 0; +} + +static int virtserial_open(struct inode *inode, struct file *filp) +{ + struct cdev *cdev = inode->i_cdev; + struct virtio_serial_port *port; + + port = container_of(cdev, struct virtio_serial_port, cdev); + + filp->private_data = port; + return 0; +} + +static unsigned int virtserial_poll(struct file *filp, poll_table *wait) +{ + struct virtio_serial_port *port; + unsigned int ret; + + port = filp->private_data; + poll_wait(filp, &port->waitqueue, wait); + + ret = 0; + if (!list_empty(&port->readbuf_head)) + ret |= POLLIN | POLLRDNORM; + + return ret; +} + +static const struct file_operations virtserial_fops = { + .owner = THIS_MODULE, + .open = virtserial_open, + .read = virtserial_read, + .write = virtserial_write, + .poll = virtserial_poll, + .release = virtserial_release, +}; + +static void virtio_serial_queue_work_handler(struct work_struct *work) +{ + struct scatterlist sg[1]; + struct virtqueue *vq; + struct virtio_serial_port_buffer *buf; + + vq = virtserial.in_vq; + while (1) { + /* We have to keep track of the unused buffers + * so that they can be freed when the module + * is being removed + */ + buf = kzalloc(sizeof(*buf), GFP_KERNEL); + if (!buf) + break; + buf->buf = kzalloc(PAGE_SIZE, GFP_KERNEL); + if (!buf->buf) { + kfree(buf); + break; + } + sg_init_one(sg, buf->buf, PAGE_SIZE); + + if (vq->vq_ops->add_buf(vq, sg, 0, 1, buf->buf) < 0) { + kfree(buf->buf); + kfree(buf); + break; + } + list_add_tail(&buf->next, &virtserial.unused_buf); + } + vq->vq_ops->kick(vq); +} + +static void virtio_serial_rx_work_handler(struct work_struct *work) +{ + struct virtio_serial_port *port = NULL; + struct virtio_serial_port_buffer *buf; + struct virtqueue *vq; + char *tmpbuf; + unsigned int tmplen; + + vq = virtserial.in_vq; + while ((tmpbuf = vq->vq_ops->get_buf(vq, &tmplen))) { + list_for_each_entry(buf, &virtserial.unused_buf, next) { + if (tmpbuf == buf->buf) + break; + } + BUG_ON(!buf); + /* The buffer is no longer unused */ + list_del(&buf->next); + + port = get_port_from_buf(tmpbuf); + if (!port) { + /* No valid index at start of + * buffer. Drop it. + */ + pr_debug("%s: invalid index in buffer, %c %d\n", + __func__, tmpbuf[0], tmpbuf[0]); + kfree(tmpbuf); + kfree(buf); + break; + } + buf->len = tmplen; + buf->offset = sizeof(struct virtio_serial_id); + list_add_tail(&buf->next, &port->readbuf_head); + + wake_up_interruptible(&port->waitqueue); + } + /* Allocate buffers for all the ones that got used up */ + schedule_work(&virtserial.queue_work); +} + +static void virtio_serial_tx_work_handler(struct work_struct *work) +{ + struct virtqueue *vq; + struct vbuf *vbuf; + unsigned int tmplen; + int i; + + vq = virtserial.out_vq; + while ((vbuf = vq->vq_ops->get_buf(vq, &tmplen))) { + for (i = 0; i < vbuf->nent; i++) { + kfree(vbuf->bufs[i]); + } + kfree(vbuf->bufs); + kfree(vbuf->sg); + kfree(vbuf); + } +} + +static void rx_intr(struct virtqueue *vq) +{ + schedule_work(&virtserial.rx_work); +} + +static void tx_intr(struct virtqueue *vq) +{ + schedule_work(&virtserial.tx_work); +} + +static void config_intr(struct virtio_device *vdev) +{ + schedule_work(&virtserial.config_work); +} + +static u32 virtserial_get_hot_add_port(struct virtio_serial_config *config) +{ + u32 i; + u32 port_nr; + + for (i = 0; i < virtserial.config->max_nr_ports / 32; i++) { + port_nr = ffs(config->ports_map[i] ^ virtserial.config->ports_map[i]); + if (port_nr) + break; + } + if (unlikely(!port_nr)) + return VIRTIO_SERIAL_BAD_ID; + + /* We used ffs above */ + port_nr--; + + /* FIXME: Do this only when add_port is successful */ + virtserial.config->ports_map[i] |= 1U << port_nr; + + port_nr += i * 32; + return port_nr; +} + +static u32 virtserial_find_next_port(u32 *map, int *map_i) +{ + u32 port_nr; + + while (1) { + port_nr = ffs(*map); + if (port_nr) + break; + + if (unlikely(*map_i >= virtserial.config->max_nr_ports / 32)) + return VIRTIO_SERIAL_BAD_ID; + ++*map_i; + *map = virtserial.config->ports_map[*map_i]; + } + /* We used ffs above */ + port_nr--; + + /* FIXME: Do this only when add_port is successful / reset bit + * in config space if add_port was unsuccessful + */ + *map &= ~(1U << port_nr); + + port_nr += *map_i * 32; + return port_nr; +} + +static int virtserial_add_port(u32 port_nr) +{ + struct virtio_serial_port *port; + dev_t devt; + int ret; + + port = kzalloc(sizeof(struct virtio_serial_port), GFP_KERNEL); + if (!port) + return -ENOMEM; + + devt = MKDEV(major, port_nr); + cdev_init(&port->cdev, &virtserial_fops); + + ret = register_chrdev_region(devt, 1, "virtio-serial"); + if (ret < 0) { + pr_err("%s: error registering chrdev region, ret = %d\n", + __func__, ret); + goto free_cdev; + } + ret = cdev_add(&port->cdev, devt, 1); + if (ret < 0) { + pr_err("%s: error adding cdev, ret = %d\n", __func__, ret); + goto free_cdev; + } + port->dev = device_create(virtserial.class, NULL, devt, NULL, + "vmch%u", port_nr); + if (IS_ERR(port->dev)) { + ret = PTR_ERR(port->dev); + pr_err("%s: Error creating device, ret = %d\n", __func__, ret); + goto free_cdev; + } + INIT_LIST_HEAD(&port->readbuf_head); + init_waitqueue_head(&port->waitqueue); + + list_add_tail(&port->next, &virtserial.port_head); + + pr_info("virtio-serial port found at id %u\n", port_nr); + + return 0; +free_cdev: + unregister_chrdev(major, "virtio-serial"); + return ret; +} + +static u32 get_ports_map_size(u32 max_ports) +{ + return sizeof(u32) * ((max_ports + 31) / 32); +} + +static void virtio_serial_config_work_handler(struct work_struct *work) +{ + struct virtio_serial_config *virtserconf; + struct virtio_device *vdev = virtserial.vdev; + u32 i, port_nr; + int ret; + + virtserconf = kmalloc(sizeof(struct virtio_serial_config) + + get_ports_map_size(virtserial.config->max_nr_ports), + GFP_KERNEL); + vdev->config->get(vdev, + offsetof(struct virtio_serial_config, nr_active_ports), + &virtserconf->nr_active_ports, + sizeof(virtserconf->nr_active_ports)); + vdev->config->get(vdev, + offsetof(struct virtio_serial_config, ports_map), + virtserconf->ports_map, + get_ports_map_size(virtserial.config->max_nr_ports)); + + /* Hot-add ports */ + for (i = virtserial.config->nr_active_ports; + i < virtserconf->nr_active_ports; i++) { + port_nr = virtserial_get_hot_add_port(virtserconf); + if (port_nr == VIRTIO_SERIAL_BAD_ID) + continue; + ret = virtserial_add_port(port_nr); + if (!ret) + virtserial.config->nr_active_ports++; + } + kfree(virtserconf); +} + +static int virtserial_probe(struct virtio_device *vdev) +{ + struct virtqueue *vqs[2]; + const char *vq_names[] = { "input", "output" }; + vq_callback_t *vq_callbacks[] = { rx_intr, tx_intr }; + u32 i, map; + int ret, map_i; + u32 max_nr_ports; + + vdev->config->get(vdev, offsetof(struct virtio_serial_config, + max_nr_ports), + &max_nr_ports, + sizeof(max_nr_ports)); + virtserial.config = kmalloc(sizeof(struct virtio_serial_config) + + get_ports_map_size(max_nr_ports), + GFP_KERNEL); + if (!virtserial.config) + return -ENOMEM; + virtserial.config->max_nr_ports = max_nr_ports; + + vdev->config->get(vdev, offsetof(struct virtio_serial_config, + nr_active_ports), + &virtserial.config->nr_active_ports, + sizeof(virtserial.config->nr_active_ports)); + vdev->config->get(vdev, + offsetof(struct virtio_serial_config, ports_map), + virtserial.config->ports_map, + get_ports_map_size(max_nr_ports)); + + virtserial.vdev = vdev; + + ret = vdev->config->find_vqs(vdev, 2, vqs, vq_callbacks, vq_names); + if (ret) + goto fail; + + virtserial.in_vq = vqs[0]; + virtserial.out_vq = vqs[1]; + + INIT_LIST_HEAD(&virtserial.port_head); + INIT_LIST_HEAD(&virtserial.unused_buf); + + map_i = 0; + map = virtserial.config->ports_map[map_i]; + for (i = 0; i < virtserial.config->nr_active_ports; i++) { + u32 port_nr; + + port_nr = virtserial_find_next_port(&map, &map_i); + if (unlikely(port_nr == VIRTIO_SERIAL_BAD_ID)) + continue; + + virtserial_add_port(port_nr); + } + INIT_WORK(&virtserial.rx_work, &virtio_serial_rx_work_handler); + INIT_WORK(&virtserial.tx_work, &virtio_serial_tx_work_handler); + INIT_WORK(&virtserial.queue_work, &virtio_serial_queue_work_handler); + INIT_WORK(&virtserial.config_work, &virtio_serial_config_work_handler); + + /* Allocate pages to fill the receive queue */ + schedule_work(&virtserial.queue_work); + + return 0; +fail: + return ret; +} + + +static void virtserial_remove_port_data(struct virtio_serial_port *port) +{ + struct virtio_serial_port_buffer *buf, *buf2; + + device_destroy(virtserial.class, port->dev->devt); + unregister_chrdev_region(port->dev->devt, 1); + cdev_del(&port->cdev); + + /* Remove the buffers in which we have unconsumed data */ + list_for_each_entry_safe(buf, buf2, &port->readbuf_head, next) { + list_del(&buf->next); + kfree(buf->buf); + kfree(buf); + } +} + +static void virtserial_remove(struct virtio_device *vdev) +{ + struct virtio_serial_port *port, *port2; + struct virtio_serial_port_buffer *buf, *buf2; + char *buff; + int len; + + unregister_chrdev(major, "virtio-serial"); + class_destroy(virtserial.class); + + cancel_work_sync(&virtserial.rx_work); + + /* Free up the buffers in the 'received' queue */ + while ((buff = virtserial.in_vq->vq_ops->get_buf(virtserial.in_vq, &len))) + kfree(buff); + + vdev->config->del_vqs(vdev); + + /* Free up the buffers that were unused */ + list_for_each_entry_safe(buf, buf2, &virtserial.unused_buf, next) { + list_del(&buf->next); + kfree(buf->buf); + kfree(buf); + } + list_for_each_entry_safe(port, port2, &virtserial.port_head, next) { + list_del(&port->next); + virtserial_remove_port_data(port); + kfree(port); + } + kfree(virtserial.config); +} + +static struct virtio_device_id id_table[] = { + { VIRTIO_ID_SERIAL, VIRTIO_DEV_ANY_ID }, + { 0 }, +}; + +static struct virtio_driver virtio_serial = { + // .feature_table = virtserial_features, + // .feature_table_size = ARRAY_SIZE(virtserial_features), + .driver.name = KBUILD_MODNAME, + .driver.owner = THIS_MODULE, + .id_table = id_table, + .probe = virtserial_probe, + .remove = virtserial_remove, + .config_changed = config_intr, +}; + +static int __init init(void) +{ + int ret; + + virtserial.class = class_create(THIS_MODULE, "virtio-serial"); + if (IS_ERR(virtserial.class)) { + pr_err("Error creating virtio-serial class\n"); + ret = PTR_ERR(virtserial.class); + return ret; + } + ret = register_virtio_driver(&virtio_serial); + if (ret) { + class_destroy(virtserial.class); + return ret; + } + return 0; +} + +static void __exit fini(void) +{ + unregister_virtio_driver(&virtio_serial); +} +module_init(init); +module_exit(fini); + +MODULE_DEVICE_TABLE(virtio, id_table); +MODULE_DESCRIPTION("Virtio serial driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/virtio_serial.h b/include/linux/virtio_serial.h new file mode 100644 index 0000000..89b639b --- /dev/null +++ b/include/linux/virtio_serial.h @@ -0,0 +1,24 @@ +#ifndef _LINUX_VIRTIO_SERIAL_H +#define _LINUX_VIRTIO_SERIAL_H +#include +#include + +/* Guest kernel - Host interface */ + +/* The ID for virtio serial */ +#define VIRTIO_ID_SERIAL 7 + +#define VIRTIO_SERIAL_BAD_ID (~(u32)0) + +struct virtio_serial_config { + __u32 max_nr_ports; + __u32 nr_active_ports; + __u32 ports_map[0 /* (max_nr_ports + 31) / 32 */]; +}; + +#ifdef __KERNEL__ + +/* Guest kernel - Guest userspace interface */ + +#endif /* __KERNEL__ */ +#endif /* _LINUX_VIRTIO_SERIAL_H */