From patchwork Tue May 4 21:39:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 51695 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9927DB7D42 for ; Thu, 6 May 2010 00:40:49 +1000 (EST) Received: from localhost ([127.0.0.1]:58118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9fmI-0002Mh-3E for incoming@patchwork.ozlabs.org; Wed, 05 May 2010 10:40:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9PsG-0006h4-U1 for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:53 -0400 Received: from [140.186.70.92] (port=45147 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9PsD-0006b2-1N for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9PsA-00079D-NL for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35652) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9PsA-000797-7m for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:46 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o44LfcFu002771 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 4 May 2010 17:41:38 -0400 Received: from localhost (vpn-240-153.phx2.redhat.com [10.3.240.153]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o44Lfam5024950; Tue, 4 May 2010 17:41:36 -0400 From: Amit Shah To: qemu list Date: Wed, 5 May 2010 03:09:30 +0530 Message-Id: <1273009170-17530-7-git-send-email-amit.shah@redhat.com> In-Reply-To: <1273009170-17530-6-git-send-email-amit.shah@redhat.com> References: <1273009170-17530-1-git-send-email-amit.shah@redhat.com> <1273009170-17530-2-git-send-email-amit.shah@redhat.com> <1273009170-17530-3-git-send-email-amit.shah@redhat.com> <1273009170-17530-4-git-send-email-amit.shah@redhat.com> <1273009170-17530-5-git-send-email-amit.shah@redhat.com> <1273009170-17530-6-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , Paul Brook , Gerd Hoffmann , Juan Quintela Subject: [Qemu-devel] [PATCH v7 6/6] virtio-console: Throttle virtio-serial-bus if we can't consume any more guest data X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If the char device we're connected to is overwhelmed with data and it can't accept any more, signal to the virtio-serial-bus to stop sending us more data till we tell otherwise. If the current buffer being processed hasn't been completely written out to the char device, we have to keep it around and re-try sending it since the virtio-serial-bus code assumes we consume the entire buffer. Allow the chardev backends to return -EAGAIN; we're ready with a callback handler that will flush the remainder of the buffer. Also register with savevm so that we save/restore such a buffer across migration. Signed-off-by: Amit Shah --- hw/virtio-console.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 117 insertions(+), 3 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 862a431..b0b4351 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -13,18 +13,90 @@ #include "qemu-char.h" #include "virtio-serial.h" +typedef struct Buffer { + uint8_t *buf; + size_t rem_len; + size_t offset; +} Buffer; + typedef struct VirtConsole { VirtIOSerialPort port; CharDriverState *chr; + Buffer unflushed_buf; } VirtConsole; +static void add_unflushed_buf(VirtConsole *vcon, const uint8_t *buf, size_t len) +{ + assert(!vcon->unflushed_buf.buf); + + vcon->unflushed_buf.buf = qemu_malloc(len); + + memcpy(vcon->unflushed_buf.buf, buf, len); + vcon->unflushed_buf.rem_len = len; + vcon->unflushed_buf.offset = 0; +} + +static void free_unflushed_buf(VirtConsole *vcon) +{ + if (vcon->unflushed_buf.buf) { + qemu_free(vcon->unflushed_buf.buf); + vcon->unflushed_buf.buf = NULL; + } +} + +static ssize_t buffered_write_to_chardev(VirtConsole *vcon, const uint8_t *buf, + size_t len) +{ + size_t written; + ssize_t ret; + + written = 0; + do { + ret = qemu_chr_write_nb(vcon->chr, buf + written, len - written); + if (ret < 0) { + if (vcon->unflushed_buf.buf) { + vcon->unflushed_buf.offset += written; + vcon->unflushed_buf.rem_len -= written; + } else { + virtio_serial_throttle_port(&vcon->port, true); + add_unflushed_buf(vcon, buf + written, len - written); + } + return ret; + } + written += ret; + } while (written != len); + + return 0; +} + +/* Callback function called when the chardev can accept more data */ +static void chr_write_unblocked(void *opaque) +{ + VirtConsole *vcon = opaque; + + if (vcon->unflushed_buf.buf) { + ssize_t ret; + + ret = buffered_write_to_chardev(vcon, vcon->unflushed_buf.buf + + vcon->unflushed_buf.offset, + vcon->unflushed_buf.rem_len); + if (ret < 0) { + return; + } + free_unflushed_buf(vcon); + } + virtio_serial_throttle_port(&vcon->port, false); +} /* Callback function that's called when the guest sends us data */ static void flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len) { VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); - qemu_chr_write(vcon->chr, buf, len); + /* If a previous write was incomplete, we should've been throttled. */ + assert(!vcon->unflushed_buf.buf); + + buffered_write_to_chardev(vcon, buf, len); } /* Readiness of the guest to accept data on a port */ @@ -48,19 +120,58 @@ static void chr_event(void *opaque, int event) VirtConsole *vcon = opaque; switch (event) { - case CHR_EVENT_OPENED: { + case CHR_EVENT_OPENED: virtio_serial_open(&vcon->port); break; - } + case CHR_EVENT_CLOSED: + free_unflushed_buf(vcon); virtio_serial_close(&vcon->port); break; } } +static void virtio_console_port_save(QEMUFile *f, void *opaque) +{ + VirtConsole *vcon = opaque; + uint32_t have_buffer; + + have_buffer = vcon->unflushed_buf.buf ? true : false; + + qemu_put_be32s(f, &have_buffer); + if (have_buffer) { + qemu_put_be64s(f, &vcon->unflushed_buf.rem_len); + qemu_put_buffer(f, vcon->unflushed_buf.buf + + vcon->unflushed_buf.offset, + vcon->unflushed_buf.rem_len); + } +} + +static int virtio_console_port_load(QEMUFile *f, void *opaque, int version_id) +{ + VirtConsole *vcon = opaque; + uint32_t have_buffer; + + if (version_id > 1) { + return -EINVAL; + } + + qemu_get_be32s(f, &have_buffer); + if (have_buffer) { + qemu_get_be64s(f, &vcon->unflushed_buf.rem_len); + vcon->unflushed_buf.buf = qemu_malloc(vcon->unflushed_buf.rem_len); + vcon->unflushed_buf.offset = 0; + + qemu_get_buffer(f, vcon->unflushed_buf.buf, + vcon->unflushed_buf.rem_len); + } + return 0; +} + static const QemuChrHandlers chr_handlers = { .fd_can_read = chr_can_read, .fd_read = chr_read, + .fd_write_unblocked = chr_write_unblocked, .fd_event = chr_event, }; @@ -72,6 +183,8 @@ static int generic_port_init(VirtConsole *vcon, VirtIOSerialDevice *dev) qemu_chr_add_handlers(vcon->chr, &chr_handlers, vcon); vcon->port.info->have_data = flush_buf; } + register_savevm("virtio-console-ports", -1, 1, virtio_console_port_save, + virtio_console_port_load, vcon); return 0; } @@ -93,6 +206,7 @@ static int virtconsole_exitfn(VirtIOSerialDevice *dev) if (vcon->chr) { port->info->have_data = NULL; qemu_chr_close(vcon->chr); + free_unflushed_buf(vcon); } return 0;