From nobody Thu May 2 17:22:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490818970993205.4718087144439; Wed, 29 Mar 2017 13:22:50 -0700 (PDT) Received: from localhost ([::1]:60781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctK7F-0000sw-J1 for importer@patchew.org; Wed, 29 Mar 2017 16:22:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctK4q-0007uy-HC for qemu-devel@nongnu.org; Wed, 29 Mar 2017 16:20:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctK4m-00023A-GA for qemu-devel@nongnu.org; Wed, 29 Mar 2017 16:20:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48762) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctK4m-00022m-7o for qemu-devel@nongnu.org; Wed, 29 Mar 2017 16:20:16 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86002C04D313 for ; Wed, 29 Mar 2017 20:20:14 +0000 (UTC) Received: from flash.redhat.com (ovpn-122-114.rdu2.redhat.com [10.10.122.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1705518992; Wed, 29 Mar 2017 20:20:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 86002C04D313 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=vyasevic@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 86002C04D313 From: Vladislav Yasevich To: qemu-devel@nongnu.org Date: Wed, 29 Mar 2017 16:19:50 -0400 Message-Id: <1490818790-3100-1-git-send-email-vyasevic@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 29 Mar 2017 20:20:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] virtio-net: consolidate guest announcement with qemu_announce_self X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vladislav Yasevich , dgilbert@redhat.com, gveitmic@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" virtio announcements seem to run on its own timer with it's own repetition loop and are invoked separately from qemu_announce_self. This patch consolidates announcements into a single location and allows other nics to provide it's own announcement capabilities, if necessary. This is also usefull in support of exposing qemu_announce_self through qmp/hmp. Signed-off-by: Vladislav Yasevich --- hw/net/virtio-net.c | 30 ++++++++---------------------- include/hw/virtio/virtio-net.h | 2 -- include/net/net.h | 2 ++ migration/savevm.c | 6 ++++++ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index c321680..6e9ce4f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -110,14 +110,16 @@ static bool virtio_net_started(VirtIONet *n, uint8_t = status) (n->status & VIRTIO_NET_S_LINK_UP) && vdev->vm_running; } =20 -static void virtio_net_announce_timer(void *opaque) +static void virtio_net_announce(NetClientState *nc) { - VirtIONet *n =3D opaque; + VirtIONet *n =3D qemu_get_nic_opaque(nc); VirtIODevice *vdev =3D VIRTIO_DEVICE(n); =20 - n->announce_counter--; - n->status |=3D VIRTIO_NET_S_ANNOUNCE; - virtio_notify_config(vdev); + if (virtio_vdev_has_feature(vdev, VIRTIO_NET_F_GUEST_ANNOUNCE) && + virtio_vdev_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ)) { + n->status |=3D VIRTIO_NET_S_ANNOUNCE; + virtio_notify_config(vdev); + } } =20 static void virtio_net_vhost_status(VirtIONet *n, uint8_t status) @@ -427,8 +429,6 @@ static void virtio_net_reset(VirtIODevice *vdev) n->nobcast =3D 0; /* multiqueue is disabled by default */ n->curr_queues =3D 1; - timer_del(n->announce_timer); - n->announce_counter =3D 0; n->status &=3D ~VIRTIO_NET_S_ANNOUNCE; =20 /* Flush any MAC and VLAN filter table state */ @@ -868,11 +868,6 @@ static int virtio_net_handle_announce(VirtIONet *n, ui= nt8_t cmd, if (cmd =3D=3D VIRTIO_NET_CTRL_ANNOUNCE_ACK && n->status & VIRTIO_NET_S_ANNOUNCE) { n->status &=3D ~VIRTIO_NET_S_ANNOUNCE; - if (n->announce_counter) { - timer_mod(n->announce_timer, - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + - self_announce_delay(n->announce_counter)); - } return VIRTIO_NET_OK; } else { return VIRTIO_NET_ERR; @@ -1609,12 +1604,6 @@ static int virtio_net_post_load_device(void *opaque,= int version_id) qemu_get_subqueue(n->nic, i)->link_down =3D link_down; } =20 - if (virtio_vdev_has_feature(vdev, VIRTIO_NET_F_GUEST_ANNOUNCE) && - virtio_vdev_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ)) { - n->announce_counter =3D SELF_ANNOUNCE_ROUNDS; - timer_mod(n->announce_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)= ); - } - return 0; } =20 @@ -1829,6 +1818,7 @@ static NetClientInfo net_virtio_info =3D { .receive =3D virtio_net_receive, .link_status_changed =3D virtio_net_set_link_status, .query_rx_filter =3D virtio_net_query_rxfilter, + .announce =3D virtio_net_announce, }; =20 static bool virtio_net_guest_notifier_pending(VirtIODevice *vdev, int idx) @@ -1934,8 +1924,6 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) qemu_macaddr_default_if_unset(&n->nic_conf.macaddr); memcpy(&n->mac[0], &n->nic_conf.macaddr, sizeof(n->mac)); n->status =3D VIRTIO_NET_S_LINK_UP; - n->announce_timer =3D timer_new_ms(QEMU_CLOCK_VIRTUAL, - virtio_net_announce_timer, n); =20 if (n->netclient_type) { /* @@ -1997,8 +1985,6 @@ static void virtio_net_device_unrealize(DeviceState *= dev, Error **errp) virtio_net_del_queue(n, i); } =20 - timer_del(n->announce_timer); - timer_free(n->announce_timer); g_free(n->vqs); qemu_del_nic(n->nic); virtio_cleanup(vdev); diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index 1eec9a2..0c597f4 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -94,8 +94,6 @@ typedef struct VirtIONet { char *netclient_name; char *netclient_type; uint64_t curr_guest_offloads; - QEMUTimer *announce_timer; - int announce_counter; bool needs_vnet_hdr_swap; } VirtIONet; =20 diff --git a/include/net/net.h b/include/net/net.h index 99b28d5..598f523 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -64,6 +64,7 @@ typedef int (SetVnetLE)(NetClientState *, bool); typedef int (SetVnetBE)(NetClientState *, bool); typedef struct SocketReadState SocketReadState; typedef void (SocketReadStateFinalize)(SocketReadState *rs); +typedef void (NetAnnounce)(NetClientState *); =20 typedef struct NetClientInfo { NetClientDriver type; @@ -84,6 +85,7 @@ typedef struct NetClientInfo { SetVnetHdrLen *set_vnet_hdr_len; SetVnetLE *set_vnet_le; SetVnetBE *set_vnet_be; + NetAnnounce *announce; } NetClientInfo; =20 struct NetClientState { diff --git a/migration/savevm.c b/migration/savevm.c index 3b19a4a..5c1d8dc 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -113,9 +113,15 @@ static void qemu_announce_self_iter(NICState *nic, voi= d *opaque) int len; =20 trace_qemu_announce_self_iter(qemu_ether_ntoa(&nic->conf->macaddr)); + len =3D announce_self_create(buf, nic->conf->macaddr.a); =20 qemu_send_packet_raw(qemu_get_queue(nic), buf, len); + + /* if the NIC provides it's own announcement support, use it as well */ + if (nic->ncs->info->announce) { + nic->ncs->info->announce(nic->ncs); + } } =20 =20 --=20 2.7.4