From patchwork Wed Mar 28 05:40:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 149146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DB995B6EE7 for ; Wed, 28 Mar 2012 17:03:53 +1100 (EST) Received: from localhost ([::1]:40072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SClhR-0004ej-78 for incoming@patchwork.ozlabs.org; Wed, 28 Mar 2012 01:45:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SClh9-0004GB-Ce for qemu-devel@nongnu.org; Wed, 28 Mar 2012 01:45:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SClh7-0005Ml-6t for qemu-devel@nongnu.org; Wed, 28 Mar 2012 01:45:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SClh6-0005Mf-V7 for qemu-devel@nongnu.org; Wed, 28 Mar 2012 01:45:17 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2S5jDOr023835 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 28 Mar 2012 01:45:14 -0400 Received: from amd-6168-8-1.englab.nay.redhat.com (amd-6168-8-1.englab.nay.redhat.com [10.66.104.52]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2S5jA1p010559; Wed, 28 Mar 2012 01:45:11 -0400 To: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, quintela@redhat.com, rusty@rustcorp.com.au, qemu-devel@nongnu.org, mst@redhat.com, pbonzini@redhat.com From: Jason Wang Date: Wed, 28 Mar 2012 13:40:31 +0800 Message-ID: <20120328054030.34135.13546.stgit@amd-6168-8-1.englab.nay.redhat.com> In-Reply-To: <20120328053356.34135.42669.stgit@amd-6168-8-1.englab.nay.redhat.com> References: <20120328053356.34135.42669.stgit@amd-6168-8-1.englab.nay.redhat.com> User-Agent: StGit/0.16-1-g60c4 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [V6 PATCH 3/4] virtio-net: notify guest to annouce itself X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It's hard to track all mac addresses and their usage (vlan, bondings, ipv6) in qemu to send proper gratuitous packet. The better choice is to let guest to send them. So, this patch introduces a new rw config status bit of virtio-net, VIRTIO_NET_S_ANNOUNCE which is used to notify guest to announce presence of its link through config update interrupt. When gust have done the announcement, it should ack the notification through VIRTIO_NET_CTRL_ANNOUNCE_ACK cmd. This feature is negotiated by a new feature bit VIRTIO_NET_F_ANNOUNCE. Signed-off-by: Jason Wang --- hw/virtio-net.c | 29 +++++++++++++++++++++++++++++ hw/virtio-net.h | 14 ++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index bc5e3a8..039b7fd 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -404,6 +404,17 @@ static int virtio_net_handle_vlan_table(VirtIONet *n, uint8_t cmd, return VIRTIO_NET_OK; } +static int virtio_net_handle_announce(VirtIONet *n, uint8_t cmd, + VirtQueueElement *elem) +{ + if (cmd == VIRTIO_NET_CTRL_ANNOUNCE_ACK) { + n->status &= ~VIRTIO_NET_S_ANNOUNCE; + return VIRTIO_NET_OK; + } else { + return VIRTIO_NET_ERR; + } +} + static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) { VirtIONet *n = to_virtio_net(vdev); @@ -432,6 +443,8 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) status = virtio_net_handle_mac(n, ctrl.cmd, &elem); else if (ctrl.class == VIRTIO_NET_CTRL_VLAN) status = virtio_net_handle_vlan_table(n, ctrl.cmd, &elem); + else if (ctrl.class == VIRTIO_NET_CTRL_ANNOUNCE) + status = virtio_net_handle_announce(n, ctrl.cmd, &elem); stb_p(elem.in_sg[elem.in_num - 1].iov_base, status); @@ -983,6 +996,21 @@ static void virtio_net_cleanup(VLANClientState *nc) n->nic = NULL; } +static int virtio_net_announce(VLANClientState *nc) +{ + VirtIONet *n = DO_UPCAST(NICState, nc, nc)->opaque; + + if (n->vdev.guest_features & (0x1 << VIRTIO_NET_F_GUEST_ANNOUNCE) + && n->vdev.guest_features & (0x1 << VIRTIO_NET_F_CTRL_VQ) + && virtio_net_started(n, n->vdev.status)) { + n->status |= VIRTIO_NET_S_ANNOUNCE; + virtio_notify_config(&n->vdev); + return 0; + } + + return -1; +} + static NetClientInfo net_virtio_info = { .type = NET_CLIENT_TYPE_NIC, .size = sizeof(NICState), @@ -990,6 +1018,7 @@ static NetClientInfo net_virtio_info = { .receive = virtio_net_receive, .cleanup = virtio_net_cleanup, .link_status_changed = virtio_net_set_link_status, + .announce = virtio_net_announce, }; VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, diff --git a/hw/virtio-net.h b/hw/virtio-net.h index 4468741..9e45786 100644 --- a/hw/virtio-net.h +++ b/hw/virtio-net.h @@ -44,8 +44,10 @@ #define VIRTIO_NET_F_CTRL_RX 18 /* Control channel RX mode support */ #define VIRTIO_NET_F_CTRL_VLAN 19 /* Control channel VLAN filtering */ #define VIRTIO_NET_F_CTRL_RX_EXTRA 20 /* Extra RX mode control support */ +#define VIRTIO_NET_F_GUEST_ANNOUNCE 21 /* Guest can announce itself */ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ +#define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */ #define TX_TIMER_INTERVAL 150000 /* 150 us */ @@ -167,6 +169,17 @@ struct virtio_net_ctrl_mac { #define VIRTIO_NET_CTRL_VLAN_ADD 0 #define VIRTIO_NET_CTRL_VLAN_DEL 1 +/* + * Control link announce acknowledgement + * + * The command VIRTIO_NET_CTRL_ANNOUNCE_ACK is used to indicate that + * driver has recevied the notification and device would clear the + * VIRTIO_NET_S_ANNOUNCE bit in the status filed after it received + * this command. + */ +#define VIRTIO_NET_CTRL_ANNOUNCE 3 + #define VIRTIO_NET_CTRL_ANNOUNCE_ACK 0 + #define DEFINE_VIRTIO_NET_FEATURES(_state, _field) \ DEFINE_VIRTIO_COMMON_FEATURES(_state, _field), \ DEFINE_PROP_BIT("csum", _state, _field, VIRTIO_NET_F_CSUM, true), \ @@ -176,6 +189,7 @@ struct virtio_net_ctrl_mac { DEFINE_PROP_BIT("guest_tso6", _state, _field, VIRTIO_NET_F_GUEST_TSO6, true), \ DEFINE_PROP_BIT("guest_ecn", _state, _field, VIRTIO_NET_F_GUEST_ECN, true), \ DEFINE_PROP_BIT("guest_ufo", _state, _field, VIRTIO_NET_F_GUEST_UFO, true), \ + DEFINE_PROP_BIT("guest_announce", _state, _field, VIRTIO_NET_F_GUEST_ANNOUNCE, true), \ DEFINE_PROP_BIT("host_tso4", _state, _field, VIRTIO_NET_F_HOST_TSO4, true), \ DEFINE_PROP_BIT("host_tso6", _state, _field, VIRTIO_NET_F_HOST_TSO6, true), \ DEFINE_PROP_BIT("host_ecn", _state, _field, VIRTIO_NET_F_HOST_ECN, true), \