From patchwork Thu Oct 8 18:58:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 35520 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 354F0B7B68 for ; Fri, 9 Oct 2009 06:41:03 +1100 (EST) Received: from localhost ([127.0.0.1]:34436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvyrE-0005jn-H5 for incoming@patchwork.ozlabs.org; Thu, 08 Oct 2009 15:41:00 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvyEW-0006Qd-VE for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:01:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvyEM-0006KQ-Pt for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:56 -0400 Received: from [199.232.76.173] (port=52374 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvyEM-0006Jn-0p for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:50 -0400 Received: from mx20.gnu.org ([199.232.41.8]:44898) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MvyEJ-00075Q-Nt for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvyEH-0007Vw-Ec for qemu-devel@nongnu.org; Thu, 08 Oct 2009 15:00:45 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n98J0hSa023288 for ; Thu, 8 Oct 2009 15:00:43 -0400 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n98J0FRF008875; Thu, 8 Oct 2009 15:00:40 -0400 Received: by blaa.localdomain (Postfix, from userid 500) id A0B0E517A9; Thu, 8 Oct 2009 19:58:33 +0100 (IST) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Thu, 8 Oct 2009 19:58:32 +0100 Message-Id: <1255028312-28180-17-git-send-email-markmc@redhat.com> In-Reply-To: <1255028312-28180-1-git-send-email-markmc@redhat.com> References: <1255028312-28180-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 16/16] net: add queue for peer-to-peer packet forwarding 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 Now that we have re-factored the packet queue code, we can re-use it for peer-to-peer also. Signed-off-by: Mark McLoughlin --- net.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- net.h | 1 + 2 files changed, 99 insertions(+), 13 deletions(-) diff --git a/net.c b/net.c index 2c7b2ef..ef40199 100644 --- a/net.c +++ b/net.c @@ -301,6 +301,15 @@ static char *assign_name(VLANClientState *vc1, const char *model) return qemu_strdup(buf); } +static ssize_t qemu_deliver_packet(VLANClientState *sender, + const uint8_t *data, + size_t size, + void *opaque); +static ssize_t qemu_deliver_packet_iov(VLANClientState *sender, + const struct iovec *iov, + int iovcnt, + void *opaque); + VLANClientState *qemu_new_vlan_client(VLANState *vlan, VLANClientState *peer, const char *model, @@ -336,6 +345,10 @@ VLANClientState *qemu_new_vlan_client(VLANState *vlan, peer->peer = vc; } QTAILQ_INSERT_TAIL(&non_vlan_clients, vc, next); + + vc->send_queue = qemu_new_net_queue(qemu_deliver_packet, + qemu_deliver_packet_iov, + vc); } return vc; @@ -346,6 +359,9 @@ void qemu_del_vlan_client(VLANClientState *vc) if (vc->vlan) { QTAILQ_REMOVE(&vc->vlan->clients, vc, next); } else { + if (vc->send_queue) { + qemu_del_net_queue(vc->send_queue); + } QTAILQ_REMOVE(&non_vlan_clients, vc, next); if (vc->peer) { vc->peer->peer = NULL; @@ -405,6 +421,15 @@ int qemu_can_send_packet(VLANClientState *sender) VLANState *vlan = sender->vlan; VLANClientState *vc; + if (sender->peer) { + if (!sender->peer->can_receive || + sender->peer->can_receive(sender->peer)) { + return 1; + } else { + return 0; + } + } + if (!sender->vlan) { return 1; } @@ -422,6 +447,20 @@ int qemu_can_send_packet(VLANClientState *sender) return 0; } +static ssize_t qemu_deliver_packet(VLANClientState *sender, + const uint8_t *data, + size_t size, + void *opaque) +{ + VLANClientState *vc = opaque; + + if (vc->link_down) { + return size; + } + + return vc->receive(vc, data, size); +} + static ssize_t qemu_vlan_deliver_packet(VLANClientState *sender, const uint8_t *buf, size_t size, @@ -453,35 +492,56 @@ static ssize_t qemu_vlan_deliver_packet(VLANClientState *sender, void qemu_purge_queued_packets(VLANClientState *vc) { - if (!vc->vlan) + NetQueue *queue; + + if (!vc->peer && !vc->vlan) { return; + } - qemu_net_queue_purge(vc->vlan->send_queue, vc); + if (vc->peer) { + queue = vc->peer->send_queue; + } else { + queue = vc->vlan->send_queue; + } + + qemu_net_queue_purge(queue, vc); } void qemu_flush_queued_packets(VLANClientState *vc) { - if (!vc->vlan) - return; + NetQueue *queue; - qemu_net_queue_flush(vc->vlan->send_queue); + if (vc->vlan) { + queue = vc->vlan->send_queue; + } else { + queue = vc->send_queue; + } + + qemu_net_queue_flush(queue); } ssize_t qemu_send_packet_async(VLANClientState *sender, const uint8_t *buf, int size, NetPacketSent *sent_cb) { - if (sender->link_down || !sender->vlan) { - return size; - } + NetQueue *queue; #ifdef DEBUG_NET printf("qemu_send_packet_async:\n"); hex_dump(stdout, buf, size); #endif - return qemu_net_queue_send(sender->vlan->send_queue, - sender, buf, size, sent_cb); + if (sender->link_down || (!sender->peer && !sender->vlan)) { + return size; + } + + if (sender->peer) { + queue = sender->peer->send_queue; + } else { + queue = sender->vlan->send_queue; + } + + return qemu_net_queue_send(queue, sender, buf, size, sent_cb); } void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size) @@ -517,6 +577,24 @@ static ssize_t calc_iov_length(const struct iovec *iov, int iovcnt) return offset; } +static ssize_t qemu_deliver_packet_iov(VLANClientState *sender, + const struct iovec *iov, + int iovcnt, + void *opaque) +{ + VLANClientState *vc = opaque; + + if (vc->link_down) { + return calc_iov_length(iov, iovcnt); + } + + if (vc->receive_iov) { + return vc->receive_iov(vc, iov, iovcnt); + } else { + return vc_sendv_compat(vc, iov, iovcnt); + } +} + static ssize_t qemu_vlan_deliver_packet_iov(VLANClientState *sender, const struct iovec *iov, int iovcnt, @@ -554,12 +632,19 @@ ssize_t qemu_sendv_packet_async(VLANClientState *sender, const struct iovec *iov, int iovcnt, NetPacketSent *sent_cb) { - if (sender->link_down || !sender->vlan) { + NetQueue *queue; + + if (sender->link_down || (!sender->peer && !sender->vlan)) { return calc_iov_length(iov, iovcnt); } - return qemu_net_queue_send_iov(sender->vlan->send_queue, - sender, iov, iovcnt, sent_cb); + if (sender->peer) { + queue = sender->peer->send_queue; + } else { + queue = sender->vlan->send_queue; + } + + return qemu_net_queue_send_iov(queue, sender, iov, iovcnt, sent_cb); } ssize_t diff --git a/net.h b/net.h index e79f524..439de2a 100644 --- a/net.h +++ b/net.h @@ -28,6 +28,7 @@ struct VLANClientState { QTAILQ_ENTRY(VLANClientState) next; struct VLANState *vlan; VLANClientState *peer; + NetQueue *send_queue; char *model; char *name; char info_str[256];