Skip to contentSkip to conversation

network announce; interface selection

PATCH Superseded Dr. David Alan Gilbert (git) 4 participants 9 messages May 23, 2019 – May 29, 2019 Networking

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

cover network announce; interface selection

From: "Dr. David Alan Gilbert" <[email protected]>

Laine asked for some extra features on the network announce support; this is the first one of them.
It allows you to send an announce on a subset of the interfaces.

Note since we've still only got one timer, if you start one announce on an interface and then you start a second announce on another interface, the first one gets cancelled even if it's part way through. [That's the other feature Laine would like, but I need to think about that a bit more.

Dr. David Alan Gilbert (2):
net/announce: Allow optional list of interfaces
net/announce: Add HMP optional interface list

 hmp-commands.hx        |  6 ++++--
 hmp.c                  | 38 +++++++++++++++++++++++++++++++++++++-
 include/net/announce.h |  2 +-
 net/announce.c         | 39 ++++++++++++++++++++++++++++++++-------
 net/trace-events       |  2 +-
 qapi/net.json          |  8 +++++---
 6 files changed, 80 insertions(+), 15 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH 1/2 net/announce: Allow optional list of interfaces

From: "Dr. David Alan Gilbert" <[email protected]>

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, "ifaces": ["vn2","vn1"] } }

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.

---
 include/net/announce.h |  2 +-
 net/announce.c         | 39 ++++++++++++++++++++++++++++++++-------
 net/trace-events       |  2 +-
 qapi/net.json          |  8 +++++---
 4 files changed, 39 insertions(+), 12 deletions(-)
include/net/announce.h +1 -1
index 892d302b65..3ebffe517e 100644
@@ -23,7 +23,7 @@ struct AnnounceTimer {
 /* Returns: update the timer to the next time point */
 int64_t qemu_announce_timer_step(AnnounceTimer *timer);
 
-/* Delete the underlying timer */
+/* Delete the underlying timer and other data */
 void qemu_announce_timer_del(AnnounceTimer *timer);
 
 /*
net/announce.c +32 -7
index 91e9a6e267..2a85a72280 100644
@@ -38,6 +38,8 @@ void qemu_announce_timer_del(AnnounceTimer *timer)
         timer_free(timer->tm);
         timer->tm = NULL;
     }
+    qapi_free_strList(timer->params.ifaces);
+    timer->params.ifaces = NULL;
 }
 
 /*
@@ -96,24 +98,47 @@ static int announce_self_create(uint8_t *buf,
 
 static void qemu_announce_self_iter(NICState *nic, void *opaque)
 {
+    AnnounceTimer *timer = opaque;
     uint8_t buf[60];
     int len;
+    bool skip;
+
+    if (timer->params.has_ifaces) {
+        strList *entry = timer->params.ifaces;
+        /* Skip unless we find our name in the requested list */
+        skip = true;
+
+        while (entry) {
+            if (!strcmp(entry->value, nic->ncs->name)) {
+                /* Found us */
+                skip = false;
+                break;
+            }
+            entry = entry->next;
+        }
+    } else {
+        skip = false;
+    }
+
+    trace_qemu_announce_self_iter(nic->ncs->name,
+                                  qemu_ether_ntoa(&nic->conf->macaddr), skip);
 
-    trace_qemu_announce_self_iter(qemu_ether_ntoa(&nic->conf->macaddr));
-    len = announce_self_create(buf, nic->conf->macaddr.a);
+    if (!skip) {
+        len = announce_self_create(buf, nic->conf->macaddr.a);
 
-    qemu_send_packet_raw(qemu_get_queue(nic), buf, len);
+        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);
+        /* if the NIC provides it's own announcement support, use it as well */
+        if (nic->ncs->info->announce) {
+            nic->ncs->info->announce(nic->ncs);
+        }
     }
 }
 static void qemu_announce_self_once(void *opaque)
 {
     AnnounceTimer *timer = (AnnounceTimer *)opaque;
 
-    qemu_foreach_nic(qemu_announce_self_iter, NULL);
+    qemu_foreach_nic(qemu_announce_self_iter, timer);
 
     if (--timer->round) {
         qemu_announce_timer_step(timer);
net/trace-events +1 -1
index a7937f3f3a..875ef2a0f3 100644
@@ -1,7 +1,7 @@
 # See docs/devel/tracing.txt for syntax documentation.
 
 # 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"
 
 # vhost-user.c
 vhost_user_event(const char *chr, int event) "chr: %s got event: %d"
qapi/net.json +5 -3
index 5f7bff1637..871cfa7405 100644
@@ -706,7 +706,8 @@
   'data': { 'initial': 'int',
             'max': 'int',
             'rounds': 'int',
-            'step': 'int' } }
+            'step': 'int',
+            '*ifaces': ['str'] } }
 
 ##
 # @announce-self:
@@ -718,9 +719,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,
+#          "ifaces": ["vn2","vn3"] } }
 # <- { "return": {} }
 #
 # Since: 4.0
Signature · 1 line
2.21.0
#2 lore raw

Re: [Qemu-devel] [PATCH 1/2] net/announce: Allow optional list of interfaces

Quoted 19 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

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, "ifaces": ["vn2","vn1"] } }

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.

---

+++ b/qapi/net.json

qapi/net.json line 710

Quoted 6 lines
qapi/net.json +2 -1
@@ -706,7 +706,8 @@
   'data': { 'initial': 'int',
             'max': 'int',
             'rounds': 'int',
-            'step': 'int' } }
+            'step': 'int',
+            '*ifaces': ['str'] } }

Missing documentation for the addition, including a '(since 4.1)' tag.

Quoted 17 lines
qapi/net.json +3 -2
 ##
 # @announce-self:
@@ -718,9 +719,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,
+#          "ifaces": ["vn2","vn3"] } }
 # <- { "return": {} }
 #
 # Since: 4.0
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
#3 lore raw

Re: [Qemu-devel] [PATCH 1/2] net/announce: Allow optional list of interfaces

Quoted 18 lines · * Eric Blake ([email protected]) wrote:
Quoted 16 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

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, "ifaces": ["vn2","vn1"] } }

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.

---

Quoted 10 lines

qapi/net.json line 710

Quoted 8 lines

+++ b/qapi/net.json

qapi/net.json +2 -1
@@ -706,7 +706,8 @@
   'data': { 'initial': 'int',
             'max': 'int',
             'rounds': 'int',
-            'step': 'int' } }
+            'step': 'int',
+            '*ifaces': ['str'] } }

Missing documentation for the addition, including a '(since 4.1)' tag.

Oops, thanks, added:

# @ifaces: An optional list of interface names, which restrict the
# announcment to the listed interfaces. (Since 4.1)
#

Dave

Quoted 23 lines
Quoted 17 lines
qapi/net.json +3 -2
 ##
 # @announce-self:
@@ -718,9 +719,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,
+#          "ifaces": ["vn2","vn3"] } }
 # <- { "return": {} }
 #
 # Since: 4.0
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#4 lore raw

Re: [Qemu-devel] [PATCH 1/2] net/announce: Allow optional list of interfaces

In reply to Dr. David Alan Gilbert (git)
Quoted 15 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

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, "ifaces": ["vn2","vn1"] } }

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.

[...]

qapi/net.json line 710

Quoted 11 lines
qapi/net.json +2 -1
index 5f7bff1637..871cfa7405 100644
@@ -706,7 +706,8 @@
   'data': { 'initial': 'int',
             'max': 'int',
             'rounds': 'int',
-            'step': 'int' } }
+            'step': 'int',
+            '*ifaces': ['str'] } }

QMP traditionally eschews abbreviations like "iface".

Quoted 16 lines
qapi/net.json +3 -2
 ##
 # @announce-self:
@@ -718,9 +719,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,
+#          "ifaces": ["vn2","vn3"] } }
 # <- { "return": {} }
 #
 # Since: 4.0
#5 lore raw

Re: [Qemu-devel] [PATCH 1/2] net/announce: Allow optional list of interfaces

Quoted 18 lines · * Markus Armbruster ([email protected]) wrote:
Quoted 15 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

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, "ifaces": ["vn2","vn1"] } }

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.

[...]

Quoted 13 lines

qapi/net.json line 710

Quoted 11 lines
qapi/net.json +2 -1
index 5f7bff1637..871cfa7405 100644
@@ -706,7 +706,8 @@
   'data': { 'initial': 'int',
             'max': 'int',
             'rounds': 'int',
-            'step': 'int' } }
+            'step': 'int',
+            '*ifaces': ['str'] } }

QMP traditionally eschews abbreviations like "iface".

OK, renamed 'interfaces'

Dave

Quoted 16 lines
Quoted 6 lines
qapi/net.json +0 -0
 ##
 # @announce-self:
@@ -718,9 +719,10 @@
 #
 # Example:

qapi/net.json line 728

Quoted 10 lines
qapi/net.json +3 -2
 #
-# -> { "execute": "announce-self"
+# -> { "execute": "announce-self",
 #      "arguments": {
-#          "initial": 50, "max": 550, "rounds": 10, "step": 50 } }
+#          "initial": 50, "max": 550, "rounds": 10, "step": 50,
+#          "ifaces": ["vn2","vn3"] } }
 # <- { "return": {} }
 #
 # Since: 4.0

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK

#6 lore raw

PATCH 2/2 net/announce: Add HMP optional interface list

In reply to Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Add the optional interface list to the HMP command.

i.e.

All interfaces
announce_self

Just the named interfaces:
announce_self vn1,vn2

---
 hmp-commands.hx |  6 ++++--
 hmp.c           | 38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)
hmp-commands.hx +4 -2
index 3dc421cb6a..a8cbcb7681 100644
@@ -955,8 +955,8 @@ ETEXI
 
     {
         .name       = "announce_self",
-        .args_type  = "",
-        .params     = "",
+        .args_type  = "ifaces:s?",
+        .params     = "[ifaces]",
         .help       = "Trigger GARP/RARP announcements",
         .cmd        = hmp_announce_self,
     },
@@ -967,6 +967,8 @@ STEXI
 Trigger a round of GARP/RARP broadcasts; this is useful for explicitly updating 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{ifaces} list restricts the announce to the named
+set of interfaces.
 ETEXI
 
     {
hmp.c +37 -1
index a9665da6ec..f9b1c1d01d 100644
@@ -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)
     }
 }
 
+/*
+ * 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 = NULL;
+    strList **hook = &res;
+
+    while (in && in[0]) {
+        char *comma = strchr(in, ',');
+        *hook = g_new0(strList, 1);
+
+        if (comma) {
+            (*hook)->value = g_strndup(in, comma - in);
+            in = comma + 1; /* skip the , */
+        } else {
+            (*hook)->value = g_strdup(in);
+            in = NULL;
+        }
+        hook = &(*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 *qdict)
 
 void hmp_announce_self(Monitor *mon, const QDict *qdict)
 {
-    qmp_announce_self(migrate_announce_params(), NULL);
+    const char *ifaces_str = qdict_get_try_str(qdict, "ifaces");
+    AnnounceParameters *params = QAPI_CLONE(AnnounceParameters,
+                                            migrate_announce_params());
+
+    qapi_free_strList(params->ifaces);
+    params->ifaces = strList_from_comma_list(ifaces_str);
+    params->has_ifaces = params->ifaces != NULL;
+    qmp_announce_self(params, NULL);
+    qapi_free_AnnounceParameters(params);
 }
 
 void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
Signature · 1 line
2.21.0
#7 lore raw
In reply to Dr. David Alan Gilbert (git)
Quoted 11 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Laine asked for some extra features on the network announce support; this is the first one of them.
It allows you to send an announce on a subset of the interfaces.

Note since we've still only got one timer, if you start one announce on an interface and then you start a second announce on another interface, the first one gets cancelled even if it's part way through. [That's the other feature Laine would like, but I need to think about that a bit more.

I have a question without trying to read/understand the code: Does the restricted interface list persist to future self-announces? (e.g. one that is internally initiated by qemu) Or does it only apply to the current new self-announce? (Hopefully the latter)

Quoted 16 lines

Dr. David Alan Gilbert (2):
net/announce: Allow optional list of interfaces net/announce: Add HMP optional interface list

  hmp-commands.hx        |  6 ++++--
  hmp.c                  | 38 +++++++++++++++++++++++++++++++++++++-
  include/net/announce.h |  2 +-
  net/announce.c         | 39 ++++++++++++++++++++++++++++++++-------
  net/trace-events       |  2 +-
  qapi/net.json          |  8 +++++---
  6 files changed, 80 insertions(+), 15 deletions(-)
#8 lore raw
Quoted 13 lines · * Laine Stump ([email protected]) wrote:
Quoted 11 lines · Dr. David Alan Gilbert (git)

From: "Dr. David Alan Gilbert" <[email protected]>

Laine asked for some extra features on the network announce support; this is the first one of them.
It allows you to send an announce on a subset of the interfaces.

Note since we've still only got one timer, if you start one announce on an interface and then you start a second announce on another interface, the first one gets cancelled even if it's part way through. [That's the other feature Laine would like, but I need to think about that a bit more.

Quoted 4 lines

I have a question without trying to read/understand the code: Does the restricted interface list persist to future self-announces? (e.g. one that is internally initiated by qemu) Or does it only apply to the current new self-announce? (Hopefully the latter)

Only to the manually triggered self-announce, not to the ones generated by migration.

Dave

Quoted 8 lines
Quoted 8 lines

Dr. David Alan Gilbert (2):
net/announce: Allow optional list of interfaces net/announce: Add HMP optional interface list

Quoted 9 lines
Quoted 8 lines
  hmp-commands.hx        |  6 ++++--
  hmp.c                  | 38 +++++++++++++++++++++++++++++++++++++-
  include/net/announce.h |  2 +-
  net/announce.c         | 39 ++++++++++++++++++++++++++++++++-------
  net/trace-events       |  2 +-
  qapi/net.json          |  8 +++++---
  6 files changed, 80 insertions(+), 15 deletions(-)

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK