From patchwork Wed Nov 3 15:28:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 70017 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 1B5611007D2 for ; Thu, 4 Nov 2010 02:36:42 +1100 (EST) Received: from localhost ([127.0.0.1]:37169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDfOA-0004dy-OA for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2010 11:36:38 -0400 Received: from [140.186.70.92] (port=51865 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDfH1-0001Xg-KW for qemu-devel@nongnu.org; Wed, 03 Nov 2010 11:29:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDfGv-00077u-SE for qemu-devel@nongnu.org; Wed, 03 Nov 2010 11:29:14 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:59749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDfGv-00077q-Og for qemu-devel@nongnu.org; Wed, 03 Nov 2010 11:29:09 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oA3F85L1003271 for ; Wed, 3 Nov 2010 11:08:05 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oA3FSm9P1433824 for ; Wed, 3 Nov 2010 11:28:49 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oA3FSmqm007757 for ; Wed, 3 Nov 2010 11:28:48 -0400 Received: from localhost.localdomain (sig-9-76-99-21.mts.ibm.com [9.76.99.21]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oA3FSVDB005744; Wed, 3 Nov 2010 11:28:47 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 3 Nov 2010 10:28:01 -0500 Message-Id: <1288798090-7127-7-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1288798090-7127-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1288798090-7127-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: abeekhof@redhat.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, aliguori@linux.vnet.ibm.com Subject: [Qemu-devel] [RFC][RESEND][PATCH v1 06/15] virtproxy: add read handler for communication channel 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 Handle data coming in over the channel as VPPackets: Process control messages and forward data from remote client/server connections to the appropriate server/client FD on our end. Signed-off-by: Michael Roth --- virtproxy.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/virtproxy.c b/virtproxy.c index 20532c2..c9c3022 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -33,6 +33,7 @@ #define VP_SERVICE_ID_LEN 32 /* max length of service id string */ #define VP_PKT_DATA_LEN 1024 /* max proxied bytes per VPPacket */ #define VP_CONN_DATA_LEN 1024 /* max bytes conns can send at a time */ +#define VP_CHAN_DATA_LEN 4096 /* max bytes channel can send at a time */ #define VP_MAGIC 0x1F374059 /* listening fd, one for each service we're forwarding to remote end */ @@ -150,6 +151,8 @@ static QemuOptsList vp_socket_opts = { }, }; +static void vp_channel_read(void *opaque); + /* get VPConn by fd, "client" denotes whether to look for client or server */ static VPConn *get_conn(const VPDriver *drv, int fd, bool client) { @@ -230,3 +233,83 @@ static void vp_channel_accept(void *opaque) /* dont accept anymore connections until channel_fd is closed */ vp_set_fd_handler(drv->listen_fd, NULL, NULL, NULL); } + +/* read handler for communication channel + * + * de-multiplexes data coming in over the channel. for control messages + * we process them here, for data destined for a service or client we + * send it to the appropriate FD. + */ +static void vp_channel_read(void *opaque) +{ + VPDriver *drv = opaque; + VPPacket pkt; + int count, ret, buf_offset; + char buf[VP_CHAN_DATA_LEN]; + char *pkt_ptr, *buf_ptr; + + TRACE("called with opaque: %p", drv); + + count = read(drv->channel_fd, buf, sizeof(buf)); + + if (count == -1) { + LOG("read() failed: %s", strerror(errno)); + return; + } else if (count == 0) { + /* TODO: channel closed, this probably shouldn't happen for guest-side + * serial/virtio-serial connections, but need to confirm and consider + * what should happen in this case. as it stands this virtproxy instance + * is basically defunct at this point, same goes for "client" instances + * of virtproxy where the remote end has hung-up. + */ + LOG("channel connection closed"); + vp_set_fd_handler(drv->channel_fd, NULL, NULL, drv); + drv->channel_fd = -1; + if (drv->listen_fd) { + vp_set_fd_handler(drv->listen_fd, vp_channel_accept, NULL, drv); + } + /* TODO: should close/remove/delete all existing VPConns here */ + } + + if (drv->buflen + count >= sizeof(VPPacket)) { + TRACE("initial packet, drv->buflen: %d", drv->buflen); + pkt_ptr = (char *)&pkt; + memcpy(pkt_ptr, drv->buf, drv->buflen); + pkt_ptr += drv->buflen; + memcpy(pkt_ptr, buf, sizeof(VPPacket) - drv->buflen); + /* handle first packet */ + ret = vp_handle_packet(drv, &pkt); + if (ret != 0) { + LOG("error handling packet"); + } + /* handle the rest of the buffer */ + buf_offset = sizeof(VPPacket) - drv->buflen; + drv->buflen = 0; + buf_ptr = buf + buf_offset; + count -= buf_offset; + while (count > 0) { + if (count >= sizeof(VPPacket)) { + /* handle full packet */ + TRACE("additional packet, drv->buflen: %d", drv->buflen); + memcpy((void *)&pkt, buf_ptr, sizeof(VPPacket)); + ret = vp_handle_packet(drv, &pkt); + if (ret != 0) { + LOG("error handling packet"); + } + count -= sizeof(VPPacket); + buf_ptr += sizeof(VPPacket); + } else { + /* buffer the remainder */ + TRACE("buffering packet"); + memcpy(drv->buf, buf_ptr, count); + drv->buflen = count; + break; + } + } + } else { + /* haven't got a full VPPacket yet, buffer for later */ + buf_ptr = drv->buf + drv->buflen; + memcpy(buf_ptr, buf, count); + drv->buflen += count; + } +}