From nobody Thu Mar 28 21:52:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560192610; cv=none; d=zoho.com; s=zohoarc; b=YJhHmGTAFy/ncCkpTJ+di3GitrzZt7yW/vxVzSsXqHZ3XykD/VO/jzRuHFXi4plZpleYlKnx1JyETwtzlrarx8S0rfW4DLQ7p8Mhl9XbGPVg7wo3CRuy6rwsWhwWeF/l+j9jiWFgEi+xsgogE7tCQg73TV6bq5NOMZsqIZCCY2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560192610; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=aGKv3Zx5lOpJezbm5bSCH3cZWNP3zTTKiKaK1RDRXWc=; b=H7OPlhdlAe07GeoJ5E5dnsIMU5fcH+I3/mDDSJyFtX3v2+UHwP5LEgkHYiINezJrth3l4nQSSRdGlApKfR/wpVqKPpZYHjR0qJ1m99aKRInCN/oBco70Yc0CS5WR43Cl2GHzYrckX3dP95Flz76wdh2HC5uRb0oJSd5AgXKvX2I= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 156019261079126.629861139308673; Mon, 10 Jun 2019 11:50:10 -0700 (PDT) Received: from localhost ([::1]:48944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPMq-0001lD-Ps for importer@patchew.org; Mon, 10 Jun 2019 14:50:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44654) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPHC-0007LL-NR for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haPH9-00022m-Ek for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48528) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1haPH8-00021k-L5 for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BB43D3001E7E for ; Mon, 10 Jun 2019 18:44:09 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-16.ams2.redhat.com [10.36.117.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9341860BF1; Mon, 10 Jun 2019 18:44:08 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, jasowang@redhat.com, eblake@redhat.com, armbru@redhat.com, laine@redhat.com Date: Mon, 10 Jun 2019 19:43:59 +0100 Message-Id: <20190610184402.7090-2-dgilbert@redhat.com> In-Reply-To: <20190610184402.7090-1-dgilbert@redhat.com> References: <20190610184402.7090-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 10 Jun 2019 18:44:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/4] net/announce: Allow optional list of interfaces X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Allow the caller to restrict the set of interfaces that announces are sent on. The default is still to send on all interfaces. e.g. { "execute": "announce-self", "arguments": { "initial": 50, "max": 550, "= rounds": 5, "step": 50, "interfaces": ["vn2","vn1"] } } This doesn't affect the behaviour of migraiton announcments. Note: There's still only one timer for the qmp command, so that performing an 'announce-self' on one list of interfaces followed by another 'announce-self' on another list will stop the announces on the existing set. Signed-off-by: Dr. David Alan Gilbert --- include/net/announce.h | 2 +- net/announce.c | 39 ++++++++++++++++++++++++++++++++------- net/trace-events | 2 +- qapi/net.json | 11 ++++++++--- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/include/net/announce.h b/include/net/announce.h index 892d302b65..3ebffe517e 100644 --- a/include/net/announce.h +++ b/include/net/announce.h @@ -23,7 +23,7 @@ struct AnnounceTimer { /* Returns: update the timer to the next time point */ int64_t qemu_announce_timer_step(AnnounceTimer *timer); =20 -/* Delete the underlying timer */ +/* Delete the underlying timer and other data */ void qemu_announce_timer_del(AnnounceTimer *timer); =20 /* diff --git a/net/announce.c b/net/announce.c index 91e9a6e267..1ce42b571d 100644 --- a/net/announce.c +++ b/net/announce.c @@ -38,6 +38,8 @@ void qemu_announce_timer_del(AnnounceTimer *timer) timer_free(timer->tm); timer->tm =3D NULL; } + qapi_free_strList(timer->params.interfaces); + timer->params.interfaces =3D NULL; } =20 /* @@ -96,24 +98,47 @@ static int announce_self_create(uint8_t *buf, =20 static void qemu_announce_self_iter(NICState *nic, void *opaque) { + AnnounceTimer *timer =3D opaque; uint8_t buf[60]; int len; + bool skip; + + if (timer->params.has_interfaces) { + strList *entry =3D timer->params.interfaces; + /* Skip unless we find our name in the requested list */ + skip =3D true; + + while (entry) { + if (!strcmp(entry->value, nic->ncs->name)) { + /* Found us */ + skip =3D false; + break; + } + entry =3D entry->next; + } + } else { + skip =3D false; + } + + trace_qemu_announce_self_iter(nic->ncs->name, + qemu_ether_ntoa(&nic->conf->macaddr), sk= ip); =20 - trace_qemu_announce_self_iter(qemu_ether_ntoa(&nic->conf->macaddr)); - len =3D announce_self_create(buf, nic->conf->macaddr.a); + if (!skip) { + len =3D announce_self_create(buf, nic->conf->macaddr.a); =20 - qemu_send_packet_raw(qemu_get_queue(nic), buf, len); + qemu_send_packet_raw(qemu_get_queue(nic), buf, len); =20 - /* if the NIC provides it's own announcement support, use it as well */ - if (nic->ncs->info->announce) { - nic->ncs->info->announce(nic->ncs); + /* if the NIC provides it's own announcement support, use it as we= ll */ + if (nic->ncs->info->announce) { + nic->ncs->info->announce(nic->ncs); + } } } static void qemu_announce_self_once(void *opaque) { AnnounceTimer *timer =3D (AnnounceTimer *)opaque; =20 - qemu_foreach_nic(qemu_announce_self_iter, NULL); + qemu_foreach_nic(qemu_announce_self_iter, timer); =20 if (--timer->round) { qemu_announce_timer_step(timer); diff --git a/net/trace-events b/net/trace-events index a7937f3f3a..875ef2a0f3 100644 --- a/net/trace-events +++ b/net/trace-events @@ -1,7 +1,7 @@ # See docs/devel/tracing.txt for syntax documentation. =20 # announce.c -qemu_announce_self_iter(const char *mac) "%s" +qemu_announce_self_iter(const char *name, const char *mac, int skip) "%s:%= s skip: %d" =20 # vhost-user.c vhost_user_event(const char *chr, int event) "chr: %s got event: %d" diff --git a/qapi/net.json b/qapi/net.json index 5f7bff1637..ee9bf2c5f5 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -699,6 +699,9 @@ # # @step: Delay increase (in ms) after each self-announcement attempt # +# @interfaces: An optional list of interface names, which restrict the +# announcment to the listed interfaces. (Since 4.1) +# # Since: 4.0 ## =20 @@ -706,7 +709,8 @@ 'data': { 'initial': 'int', 'max': 'int', 'rounds': 'int', - 'step': 'int' } } + 'step': 'int', + '*interfaces': ['str'] } } =20 ## # @announce-self: @@ -718,9 +722,10 @@ # # Example: # -# -> { "execute": "announce-self" +# -> { "execute": "announce-self", # "arguments": { -# "initial": 50, "max": 550, "rounds": 10, "step": 50 } } +# "initial": 50, "max": 550, "rounds": 10, "step": 50, +# "interfaces": ["vn2","vn3"] } } # <- { "return": {} } # # Since: 4.0 --=20 2.21.0 From nobody Thu Mar 28 21:52:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560192548; cv=none; d=zoho.com; s=zohoarc; b=k3gU62UoMZg6ZGNVfZN7DBCmA35mWIGtVkcZMOsy87ZS/+7x1xI2LQD8ZhiRKg7shZS/LaUkBXtJLwBPW4VTi2xvVow766PL85PDeW7pcggWjuNhPEgX6TcWYRdu2aeQpebknjbpNdNpQtQlD/b6hBSgi96xrOlcgY5ddCyB8jw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560192548; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=/LutmIEGQiNBhEmb88F5TBMP0LkVDA3lDxmwmEH9ElI=; b=Qr0Ag3tfd2xjR3c4XxccEEEc8vKb56skR7ANZnNhldq9dmfx4+fHDCu9c0hwXWcaEa4I9Xvp/8evS69SnL2zMQdXM6C9ouioCKvJIVLNF5SzDIURTBHnJJcASigyhDLSCFuN7gBOsi/6VBO0cxLLl+Td1tpiiNMrvoqqpprk8DA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560192548732887.8635447462491; Mon, 10 Jun 2019 11:49:08 -0700 (PDT) Received: from localhost ([::1]:48942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPLt-0001TH-Ku for importer@patchew.org; Mon, 10 Jun 2019 14:49:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44671) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPHI-0007Lo-F0 for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haPHC-00025n-Oe for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45832) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1haPHB-00022h-7v for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3BC32821F1 for ; Mon, 10 Jun 2019 18:44:11 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-16.ams2.redhat.com [10.36.117.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11BB960BF1; Mon, 10 Jun 2019 18:44:09 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, jasowang@redhat.com, eblake@redhat.com, armbru@redhat.com, laine@redhat.com Date: Mon, 10 Jun 2019 19:44:00 +0100 Message-Id: <20190610184402.7090-3-dgilbert@redhat.com> In-Reply-To: <20190610184402.7090-1-dgilbert@redhat.com> References: <20190610184402.7090-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 10 Jun 2019 18:44:11 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/4] net/announce: Add HMP optional interface list X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Add the optional interface list to the HMP command. i.e. All interfaces announce_self Just the named interfaces: announce_self vn1,vn2 Signed-off-by: Dr. David Alan Gilbert --- hmp-commands.hx | 6 ++++-- hmp.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 3dc421cb6a..1b63372713 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -955,8 +955,8 @@ ETEXI =20 { .name =3D "announce_self", - .args_type =3D "", - .params =3D "", + .args_type =3D "interfaces:s?", + .params =3D "[interfaces]", .help =3D "Trigger GARP/RARP announcements", .cmd =3D hmp_announce_self, }, @@ -967,6 +967,8 @@ STEXI Trigger a round of GARP/RARP broadcasts; this is useful for explicitly upd= ating the network infrastructure after a reconfiguration or some forms of migration. The timings of the round are set by the migration announce parameters. +An optional comma separated @var{interfaces} list restricts the announce t= o the +named set of interfaces. ETEXI =20 { diff --git a/hmp.c b/hmp.c index d4460992b6..52efb4a4fa 100644 --- a/hmp.c +++ b/hmp.c @@ -27,6 +27,7 @@ #include "monitor/monitor.h" #include "monitor/qdev.h" #include "qapi/error.h" +#include "qapi/clone-visitor.h" #include "qapi/opts-visitor.h" #include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-commands-block.h" @@ -38,6 +39,7 @@ #include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-tpm.h" #include "qapi/qapi-commands-ui.h" +#include "qapi/qapi-visit-net.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/string-input-visitor.h" @@ -67,6 +69,32 @@ static void hmp_handle_error(Monitor *mon, Error **errp) } } =20 +/* + * Produce a strList from a comma separated list. + * A NULL or empty input string return NULL. + */ +static strList *strList_from_comma_list(const char *in) +{ + strList *res =3D NULL; + strList **hook =3D &res; + + while (in && in[0]) { + char *comma =3D strchr(in, ','); + *hook =3D g_new0(strList, 1); + + if (comma) { + (*hook)->value =3D g_strndup(in, comma - in); + in =3D comma + 1; /* skip the , */ + } else { + (*hook)->value =3D g_strdup(in); + in =3D NULL; + } + hook =3D &(*hook)->next; + } + + return res; +} + void hmp_info_name(Monitor *mon, const QDict *qdict) { NameInfo *info; @@ -1640,7 +1668,15 @@ void hmp_info_snapshots(Monitor *mon, const QDict *q= dict) =20 void hmp_announce_self(Monitor *mon, const QDict *qdict) { - qmp_announce_self(migrate_announce_params(), NULL); + const char *interfaces_str =3D qdict_get_try_str(qdict, "interfaces"); + AnnounceParameters *params =3D QAPI_CLONE(AnnounceParameters, + migrate_announce_params()); + + qapi_free_strList(params->interfaces); + params->interfaces =3D strList_from_comma_list(interfaces_str); + params->has_interfaces =3D params->interfaces !=3D NULL; + qmp_announce_self(params, NULL); + qapi_free_AnnounceParameters(params); } =20 void hmp_migrate_cancel(Monitor *mon, const QDict *qdict) --=20 2.21.0 From nobody Thu Mar 28 21:52:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560192725; cv=none; d=zoho.com; s=zohoarc; b=IYxFkvTX3PWuLLJMfqcDGKhQ8et9Caa00sUBGvpic0Y3jVMqd6M8fe1UoPzcVaqlldb1rNfSPRZ/Ea6bmQjxPdZFxfJUUUR/7m6/1H4rvKoQRwZGCW2vl14oA4QMGUxz28iwLBVzoBXgkeE2D/1ep/2BZd44KuOBsQicKHeJW3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560192725; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=CLQyECk+YERA5QKu8DJhylaWlK32tYyCiDlTEAHCDkU=; b=VqsRjckLdKd2BgK3fPSr2jGXAPS3nsuoHYd3N76PwBP8JLu8cANPcERHu1WMS1bcinXcggP5wqkJNA3rJMsV4HUMJF9br1phygCY3teL5yxFdH7uWqzZaVDZMTBwPD+8qQVajIikvnQqdmuYsK4L0yDJbKZfVoDhNCDodIxxFU0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560192725508444.8927503898916; Mon, 10 Jun 2019 11:52:05 -0700 (PDT) Received: from localhost ([::1]:48998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPOm-0004Hz-K3 for importer@patchew.org; Mon, 10 Jun 2019 14:52:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44719) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPHP-0007OT-Ul for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haPHM-0002D1-7M for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40992) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1haPHI-00026x-F0 for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B2AD881E19 for ; Mon, 10 Jun 2019 18:44:12 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-16.ams2.redhat.com [10.36.117.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86F2760BF1; Mon, 10 Jun 2019 18:44:11 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, jasowang@redhat.com, eblake@redhat.com, armbru@redhat.com, laine@redhat.com Date: Mon, 10 Jun 2019 19:44:01 +0100 Message-Id: <20190610184402.7090-4-dgilbert@redhat.com> In-Reply-To: <20190610184402.7090-1-dgilbert@redhat.com> References: <20190610184402.7090-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 10 Jun 2019 18:44:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 3/4] net/announce: Add optional ID X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Previously there was a single instance of the timer used by monitor triggered announces, that's OK, but when combined with the previous change that lets you have announces for subsets of interfaces it's a bit restrictive if you want to do different things to different interfaces. Add an 'id' field to the announce, and maintain a list of the timers based on id. This allows you to for example: a) Start an announce going on interface eth0 for a long time b) Start an announce going on interface eth1 for a long time c) Kill the announce on eth0 while leaving eth1 going. Signed-off-by: Dr. David Alan Gilbert --- hw/net/virtio-net.c | 4 ++-- include/net/announce.h | 8 +++++-- net/announce.c | 46 ++++++++++++++++++++++++++++++++++------- net/trace-events | 3 ++- qapi/net.json | 9 ++++++-- tests/virtio-net-test.c | 2 +- 6 files changed, 57 insertions(+), 15 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ffe0872fff..120248bbf6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2359,7 +2359,7 @@ static int virtio_net_post_load_device(void *opaque, = int version_id) timer_mod(n->announce_timer.tm, qemu_clock_get_ms(n->announce_timer.type)); } else { - qemu_announce_timer_del(&n->announce_timer); + qemu_announce_timer_del(&n->announce_timer, false); } } =20 @@ -2783,7 +2783,7 @@ static void virtio_net_device_unrealize(DeviceState *= dev, Error **errp) virtio_net_del_queue(n, i); } =20 - qemu_announce_timer_del(&n->announce_timer); + qemu_announce_timer_del(&n->announce_timer, false); g_free(n->vqs); qemu_del_nic(n->nic); virtio_net_rsc_cleanup(n); diff --git a/include/net/announce.h b/include/net/announce.h index 3ebffe517e..9cf7a4f835 100644 --- a/include/net/announce.h +++ b/include/net/announce.h @@ -23,8 +23,12 @@ struct AnnounceTimer { /* Returns: update the timer to the next time point */ int64_t qemu_announce_timer_step(AnnounceTimer *timer); =20 -/* Delete the underlying timer and other data */ -void qemu_announce_timer_del(AnnounceTimer *timer); +/* + * Delete the underlying timer and other datas + * If 'free_named' true and the timer is a named timer, then remove + * it from the list of named timers and free the AnnounceTimer itself. + */ +void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named); =20 /* * Under BQL/main thread diff --git a/net/announce.c b/net/announce.c index 1ce42b571d..4d4e2c22a1 100644 --- a/net/announce.c +++ b/net/announce.c @@ -15,6 +15,8 @@ #include "qapi/qapi-commands-net.h" #include "trace.h" =20 +static GData *named_timers; + int64_t qemu_announce_timer_step(AnnounceTimer *timer) { int64_t step; @@ -31,8 +33,13 @@ int64_t qemu_announce_timer_step(AnnounceTimer *timer) return step; } =20 -void qemu_announce_timer_del(AnnounceTimer *timer) +/* + * If 'free_named' is true, then remove the timer from the list + * and free the timer itself. + */ +void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named) { + bool free_timer =3D false; if (timer->tm) { timer_del(timer->tm); timer_free(timer->tm); @@ -40,6 +47,18 @@ void qemu_announce_timer_del(AnnounceTimer *timer) } qapi_free_strList(timer->params.interfaces); timer->params.interfaces =3D NULL; + if (free_named && timer->params.has_id) { + free_timer =3D timer =3D=3D + g_datalist_get_data(&named_timers, timer->params.id); + g_datalist_remove_data(&named_timers, timer->params.id); + } + trace_qemu_announce_timer_del(free_named, free_timer, timer->params.id= ); + g_free(timer->params.id); + timer->params.id =3D NULL; + + if (free_timer) { + g_free(timer); + } } =20 /* @@ -56,7 +75,7 @@ void qemu_announce_timer_reset(AnnounceTimer *timer, * We're under the BQL, so the current timer can't * be firing, so we should be able to delete it. */ - qemu_announce_timer_del(timer); + qemu_announce_timer_del(timer, false); =20 QAPI_CLONE_MEMBERS(AnnounceParameters, &timer->params, params); timer->round =3D params->rounds; @@ -120,7 +139,8 @@ static void qemu_announce_self_iter(NICState *nic, void= *opaque) skip =3D false; } =20 - trace_qemu_announce_self_iter(nic->ncs->name, + trace_qemu_announce_self_iter(timer->params.has_id ? timer->params.id = : "_", + nic->ncs->name, qemu_ether_ntoa(&nic->conf->macaddr), sk= ip); =20 if (!skip) { @@ -143,7 +163,7 @@ static void qemu_announce_self_once(void *opaque) if (--timer->round) { qemu_announce_timer_step(timer); } else { - qemu_announce_timer_del(timer); + qemu_announce_timer_del(timer, true); } } =20 @@ -154,12 +174,24 @@ void qemu_announce_self(AnnounceTimer *timer, Announc= eParameters *params) if (params->rounds) { qemu_announce_self_once(timer); } else { - qemu_announce_timer_del(timer); + qemu_announce_timer_del(timer, true); } } =20 void qmp_announce_self(AnnounceParameters *params, Error **errp) { - static AnnounceTimer announce_timer; - qemu_announce_self(&announce_timer, params); + AnnounceTimer *named_timer; + if (!params->has_id) { + params->id =3D g_strdup(""); + params->has_id =3D true; + } + + named_timer =3D g_datalist_get_data(&named_timers, params->id); + + if (!named_timer) { + named_timer =3D g_new0(AnnounceTimer, 1); + g_datalist_set_data(&named_timers, params->id, named_timer); + } + + qemu_announce_self(named_timer, params); } diff --git a/net/trace-events b/net/trace-events index 875ef2a0f3..ac57056497 100644 --- a/net/trace-events +++ b/net/trace-events @@ -1,7 +1,8 @@ # See docs/devel/tracing.txt for syntax documentation. =20 # announce.c -qemu_announce_self_iter(const char *name, const char *mac, int skip) "%s:%= s skip: %d" +qemu_announce_self_iter(const char *id, const char *name, const char *mac,= int skip) "%s:%s:%s skip: %d" +qemu_announce_timer_del(bool free_named, bool free_timer, char *id) "free = named: %d free timer: %d id: %s" =20 # vhost-user.c vhost_user_event(const char *chr, int event) "chr: %s got event: %d" diff --git a/qapi/net.json b/qapi/net.json index ee9bf2c5f5..9da9b5bbc5 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -702,6 +702,10 @@ # @interfaces: An optional list of interface names, which restrict the # announcment to the listed interfaces. (Since 4.1) # +# @id: A name to be used to identify an instance of announce-timers +# and to allow it to modified later. Not for use as +# part of the migration paramters. (Since 4.1) +# # Since: 4.0 ## =20 @@ -710,7 +714,8 @@ 'max': 'int', 'rounds': 'int', 'step': 'int', - '*interfaces': ['str'] } } + '*interfaces': ['str'], + '*id' : 'str' } } =20 ## # @announce-self: @@ -725,7 +730,7 @@ # -> { "execute": "announce-self", # "arguments": { # "initial": 50, "max": 550, "rounds": 10, "step": 50, -# "interfaces": ["vn2","vn3"] } } +# "interfaces": ["vn2","vn3"], "id": "bob" } } # <- { "return": {} } # # Since: 4.0 diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 163126cf07..7184e2bff4 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -186,7 +186,7 @@ static void announce_self(void *obj, void *data, QGuest= Allocator *t_alloc) rsp =3D qmp("{ 'execute' : 'announce-self', " " 'arguments': {" " 'initial': 50, 'max': 550," - " 'rounds': 10, 'step': 50 } }"); + " 'rounds': 10, 'step': 50, 'id': 'bob' } }"); assert(!qdict_haskey(rsp, "error")); qobject_unref(rsp); =20 --=20 2.21.0 From nobody Thu Mar 28 21:52:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560192802; cv=none; d=zoho.com; s=zohoarc; b=eea9U2ZPVyR9YziX16MNo1mhtUmpUZb9TJgVVDLT373m6xQksQafIljBAHyUtaDv6bsNA4NISYrHZpt9rBObt0RAHGsER+KTe2nvTIMhwbHie9Ec/cAMKcQw12bjpPipUpX6kYhwxQ9ExPvA1mpwOiELbz339amCs6rPNY0rGfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560192802; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=23wwr8zN6cZfOQ2O1aTgtw1pywasN44JJOA2KKFx4jE=; b=KtS4JtJt65uaTwRDIzu0M0R2+fX2NOn1m7ZcyxN8O7J+TNztWEUfZ9Z4cn8Ll33Tzj02PBNX33Q3jFSjSJcVwubG5TDHDHH1e4qcSc+4eJ9hql4tbud/O4N430pEvpIwbj+zP3ql87Ds0WMBdzX1bpj22YWaEQnnyu3KCzzAPBk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560192802452269.13207375788306; Mon, 10 Jun 2019 11:53:22 -0700 (PDT) Received: from localhost ([::1]:49010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPQ1-0005FN-Ho for importer@patchew.org; Mon, 10 Jun 2019 14:53:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44696) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haPHM-0007Nd-7t for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haPHI-00028R-Fs for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52028) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1haPHE-00025I-QT for qemu-devel@nongnu.org; Mon, 10 Jun 2019 14:44:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2ECE73087BA9 for ; Mon, 10 Jun 2019 18:44:14 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-16.ams2.redhat.com [10.36.117.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0513460BF1; Mon, 10 Jun 2019 18:44:12 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, jasowang@redhat.com, eblake@redhat.com, armbru@redhat.com, laine@redhat.com Date: Mon, 10 Jun 2019 19:44:02 +0100 Message-Id: <20190610184402.7090-5-dgilbert@redhat.com> In-Reply-To: <20190610184402.7090-1-dgilbert@redhat.com> References: <20190610184402.7090-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 10 Jun 2019 18:44:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 4/4] net/announce: Add HMP optional ID X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Add the optional ID to the HMP command. e.g. # start an announce for a long time on eth1 migrate_set_parameter announce-rounds 1000 announce_self "eth1" e1 # start an announce on eth2 announce_self "eth2" e2 # Change e1 to be announcing on eth1 and eth3 announce_self "eth1,eth3" e1 # Cancel e1 migrate_set_parameter announce-rounds 0 announce_self "" e1 Signed-off-by: Dr. David Alan Gilbert --- hmp-commands.hx | 7 ++++--- hmp.c | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 1b63372713..7ba8543cc3 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -955,8 +955,8 @@ ETEXI =20 { .name =3D "announce_self", - .args_type =3D "interfaces:s?", - .params =3D "[interfaces]", + .args_type =3D "interfaces:s?,id:s?", + .params =3D "[interfaces] [id]", .help =3D "Trigger GARP/RARP announcements", .cmd =3D hmp_announce_self, }, @@ -968,7 +968,8 @@ Trigger a round of GARP/RARP broadcasts; this is useful= for explicitly updating network infrastructure after a reconfiguration or some forms of migration. The timings of the round are set by the migration announce parameters. An optional comma separated @var{interfaces} list restricts the announce t= o the -named set of interfaces. +named set of interfaces. An optional @var{id} can be used to start a separ= ate announce +timer and to change the parameters of it later. ETEXI =20 { diff --git a/hmp.c b/hmp.c index 52efb4a4fa..fd498ca0a8 100644 --- a/hmp.c +++ b/hmp.c @@ -1669,12 +1669,15 @@ void hmp_info_snapshots(Monitor *mon, const QDict *= qdict) void hmp_announce_self(Monitor *mon, const QDict *qdict) { const char *interfaces_str =3D qdict_get_try_str(qdict, "interfaces"); + const char *id =3D qdict_get_try_str(qdict, "id"); AnnounceParameters *params =3D QAPI_CLONE(AnnounceParameters, migrate_announce_params()); =20 qapi_free_strList(params->interfaces); params->interfaces =3D strList_from_comma_list(interfaces_str); params->has_interfaces =3D params->interfaces !=3D NULL; + params->id =3D g_strdup(id); + params->has_id =3D !!params->id; qmp_announce_self(params, NULL); qapi_free_AnnounceParameters(params); } --=20 2.21.0