From patchwork Fri Jan 16 21:10:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 2885 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 n0GL7u5t016100 for ; Fri, 16 Jan 2009 13:07:56 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761695AbZAPVMK (ORCPT ); Fri, 16 Jan 2009 16:12:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761905AbZAPVMK (ORCPT ); Fri, 16 Jan 2009 16:12:10 -0500 Received: from g5t0006.atlanta.hp.com ([15.192.0.43]:4303 "EHLO g5t0006.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761695AbZAPVMI (ORCPT ); Fri, 16 Jan 2009 16:12:08 -0500 Received: from g4t0018.houston.hp.com (g4t0018.houston.hp.com [16.234.32.27]) by g5t0006.atlanta.hp.com (Postfix) with ESMTP id 19352C3E5; Fri, 16 Jan 2009 21:12:08 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g4t0018.houston.hp.com (Postfix) with ESMTP id D62DF1000F; Fri, 16 Jan 2009 21:12:07 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl.fc.hp.com (Postfix) with ESMTP id 8BA0239C043; Fri, 16 Jan 2009 14:12:07 -0700 (MST) X-Virus-Scanned: Debian amavisd-new at ldl.fc.hp.com Received: from ldl.fc.hp.com ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HaHEmk0tx2-7; Fri, 16 Jan 2009 14:12:06 -0700 (MST) Received: from kvm.aw (lart.fc.hp.com [15.11.146.31]) by ldl.fc.hp.com (Postfix) with ESMTP id 0459A39C00D; Fri, 16 Jan 2009 14:12:06 -0700 (MST) From: Alex Williamson Subject: [PATCH 4/7] qemu:virtio-net: Add promiscuous and all-multicast mode bits To: kvm@vger.kernel.org Cc: qemu-devel@nongnu.org, markmc@redhat.com Date: Fri, 16 Jan 2009 14:10:15 -0700 Message-ID: <20090116211015.16725.18939.stgit@kvm.aw> In-Reply-To: <20090116210954.16725.44321.stgit@kvm.aw> References: <20090116210954.16725.44321.stgit@kvm.aw> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add a new RX_MODE control virtqueue class with commands PROMISC and ALLMULTI and usage documented in virtio-net.h allowing the guest to manipulate packet receiving options. Note, for compatibility with older guest drivers we need to default to promiscuous. Signed-off-by: Alex Williamson --- qemu/hw/virtio-net.c | 38 +++++++++++++++++++++++++++++++++++++- qemu/hw/virtio-net.h | 9 +++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/qemu/hw/virtio-net.c b/qemu/hw/virtio-net.c index 3d8cba7..d34c299 100644 --- a/qemu/hw/virtio-net.c +++ b/qemu/hw/virtio-net.c @@ -21,7 +21,7 @@ #define TAP_VNET_HDR -#define VIRTIO_NET_VM_VERSION 3 +#define VIRTIO_NET_VM_VERSION 4 #define ETH_ALEN 6 @@ -37,6 +37,8 @@ typedef struct VirtIONet QEMUTimer *tx_timer; int tx_timer_active; int mergeable_rx_bufs; + int promisc; + int allmulti; } VirtIONet; /* TODO @@ -131,8 +133,31 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features) #endif } +static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, + VirtQueueElement *elem) +{ + uint8_t *on; + + if (elem->out_num != 2 || elem->out_sg[1].iov_len != sizeof(*on)) { + fprintf(stderr, "virtio-net ctrl invalid rx mode command\n"); + exit(1); + } + + on = elem->out_sg[1].iov_base; + + if (cmd == VIRTIO_NET_CTRL_RX_MODE_PROMISC) + n->promisc = *on; + else if (cmd == VIRTIO_NET_CTRL_RX_MODE_ALLMULTI) + n->allmulti = *on; + else + return VIRTIO_NET_ERR; + + return VIRTIO_NET_OK; +} + static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) { + VirtIONet *n = to_virtio_net(vdev); struct virtio_net_ctrl_hdr *ctrl; virtio_net_ctrl_ack *status; VirtQueueElement elem; @@ -153,6 +178,9 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) status = elem.in_sg[elem.in_num - 1].iov_base; *status = VIRTIO_NET_ERR; + if (ctrl->class == VIRTIO_NET_CTRL_RX_MODE) + *status = virtio_net_handle_rx_mode(n, ctrl->cmd, &elem); + virtqueue_push(vq, &elem, sizeof(*status)); virtio_notify(vdev, vq); } @@ -435,6 +463,8 @@ static void virtio_net_save(QEMUFile *f, void *opaque) #endif qemu_put_be16(f, n->status); + qemu_put_be32(f, n->promisc); + qemu_put_be32(f, n->allmulti); } static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) @@ -459,6 +489,11 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) n->status = qemu_get_be16(f); + if (version_id >= 4) { + n->promisc = qemu_get_be32(f); + n->allmulti = qemu_get_be32(f); + } + if (n->tx_timer_active) { qemu_mod_timer(n->tx_timer, qemu_get_clock(vm_clock) + TX_TIMER_INTERVAL); @@ -498,6 +533,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n->tx_timer = qemu_new_timer(vm_clock, virtio_net_tx_timer, n); n->tx_timer_active = 0; n->mergeable_rx_bufs = 0; + n->promisc = 1; /* for compatibility */ register_savevm("virtio-net", virtio_net_id++, VIRTIO_NET_VM_VERSION, virtio_net_save, virtio_net_load, n); diff --git a/qemu/hw/virtio-net.h b/qemu/hw/virtio-net.h index 9a9641e..a4c4005 100644 --- a/qemu/hw/virtio-net.h +++ b/qemu/hw/virtio-net.h @@ -99,4 +99,13 @@ typedef uint8_t virtio_net_ctrl_ack; #define VIRTIO_NET_OK 0 #define VIRTIO_NET_ERR 1 +/* + * Control the RX mode, ie. promisucous and allmulti. PROMISC and + * ALLMULTI commands require an "out" sg entry containing a 1 byte + * state value, zero = disable, non-zero = enable. + */ +#define VIRTIO_NET_CTRL_RX_MODE 0 + #define VIRTIO_NET_CTRL_RX_MODE_PROMISC 0 + #define VIRTIO_NET_CTRL_RX_MODE_ALLMULTI 1 + #endif