From patchwork Fri Jul 16 09:04:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 59086 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 435E9B707E for ; Fri, 16 Jul 2010 19:11:50 +1000 (EST) Received: from localhost ([127.0.0.1]:42297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZgxO-0006aX-QE for incoming@patchwork.ozlabs.org; Fri, 16 Jul 2010 05:11:46 -0400 Received: from [140.186.70.92] (port=53908 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZgvn-0006ZN-GW for qemu-devel@nongnu.org; Fri, 16 Jul 2010 05:10:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZgvl-00055V-Qi for qemu-devel@nongnu.org; Fri, 16 Jul 2010 05:10:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27388) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZgvl-00055Q-Jh for qemu-devel@nongnu.org; Fri, 16 Jul 2010 05:10:05 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6G9A4Z2002013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Jul 2010 05:10:04 -0400 Received: from redhat.com (vpn1-5-95.ams2.redhat.com [10.36.5.95]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o6G9A1vP021713; Fri, 16 Jul 2010 05:10:02 -0400 Date: Fri, 16 Jul 2010 12:04:47 +0300 From: "Michael S. Tsirkin" To: kvm@vger.kernel.org, qemu-devel@nongnu.org, dlstevens@us.ibm.com Message-ID: <9128effb66d125b57962be19b1f94de694b2a8a0.1279270823.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent User-Agent: Mutt/1.5.20 (2009-12-10) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH RFC 3/3] vhost_net: mergeable buffers support 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 use the new tap APIs to set header length Signed-off-by: Michael S. Tsirkin --- hw/vhost_net.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/hw/vhost_net.c b/hw/vhost_net.c index 606aa0c..1693090 100644 --- a/hw/vhost_net.c +++ b/hw/vhost_net.c @@ -51,7 +51,9 @@ unsigned vhost_net_get_features(struct vhost_net *net, unsigned features) if (!(net->dev.features & (1 << VIRTIO_RING_F_INDIRECT_DESC))) { features &= ~(1 << VIRTIO_RING_F_INDIRECT_DESC); } - features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF); + if (!(net->dev.features & (1 << VIRTIO_NET_F_MRG_RXBUF))) { + features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF); + } return features; } @@ -64,6 +66,9 @@ void vhost_net_ack_features(struct vhost_net *net, unsigned features) if (features & (1 << VIRTIO_RING_F_INDIRECT_DESC)) { net->dev.acked_features |= (1 << VIRTIO_RING_F_INDIRECT_DESC); } + if (features & (1 << VIRTIO_NET_F_MRG_RXBUF)) { + net->dev.acked_features |= (1 << VIRTIO_NET_F_MRG_RXBUF); + } } static int vhost_net_get_fd(VLANClientState *backend) @@ -98,6 +103,10 @@ struct vhost_net *vhost_net_init(VLANClientState *backend, int devfd) if (r < 0) { goto fail; } + if (!tap_has_vnet_hdr_len(backend, + sizeof(struct virtio_net_hdr_mrg_rxbuf))) { + net->dev.features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF); + } if (~net->dev.features & net->dev.backend_features) { fprintf(stderr, "vhost lacks feature mask %" PRIu64 " for backend\n", (uint64_t)(~net->dev.features & net->dev.backend_features)); @@ -118,6 +127,9 @@ int vhost_net_start(struct vhost_net *net, { struct vhost_vring_file file = { }; int r; + if (net->dev.acked_features & VIRTIO_NET_F_MRG_RXBUF) { + tap_set_vnet_hdr_len(net->backend, sizeof(virtio_net_hdr_mrg_rxbuf)); + } net->dev.nvqs = 2; net->dev.vqs = net->vqs; @@ -145,6 +157,9 @@ fail: } net->vc->info->poll(net->vc, true); vhost_dev_stop(&net->dev, dev); + if (net->dev.acked_features & VIRTIO_NET_F_MRG_RXBUF) { + tap_set_vnet_hdr_len(net->backend, sizeof(virtio_net_hdr)); + } return r; } @@ -159,11 +174,17 @@ void vhost_net_stop(struct vhost_net *net, } net->vc->info->poll(net->vc, true); vhost_dev_stop(&net->dev, dev); + if (net->dev.acked_features & VIRTIO_NET_F_MRG_RXBUF) { + tap_set_vnet_hdr_len(net->backend, sizeof(virtio_net_hdr)); + } } void vhost_net_cleanup(struct vhost_net *net) { vhost_dev_cleanup(&net->dev); + if (net->dev.acked_features & VIRTIO_NET_F_MRG_RXBUF) { + tap_set_vnet_hdr_len(net->backend, sizeof(virtio_net_hdr)); + } qemu_free(net); } #else