From: Paul Durrant <paul@xen.org>
To: xen-devel@lists.xenproject.org
Cc: Paul Durrant <pdurrant@amazon.com>,
Ian Jackson <ian.jackson@eu.citrix.com>, Wei Liu <wl@xen.org>
Subject: [PATCH 1/4] tools/hotplug: add remove_from_bridge() and improve debug output
Date: Thu, 30 Jul 2020 20:48:55 +0100 [thread overview]
Message-ID: <20200730194858.28523-2-paul@xen.org> (raw)
In-Reply-To: <20200730194858.28523-1-paul@xen.org>
From: Paul Durrant <pdurrant@amazon.com>
This patch adds a remove_from_bridge() function into xen-network-common.sh
to partner with the existing add_to_bridge() function. The code in
add_to_bridge() is also slightly re-arranged to avoid duplication calls of
'ip link'.
Both add_to_bridge() and remove_from_bridge() will check if their bridge
manipulation operations are necessary and emit a log message if they are not.
NOTE: A call to remove_from_bridge() will be added by a subsequent patch.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wl@xen.org>
---
tools/hotplug/Linux/xen-network-common.sh | 37 ++++++++++++++++++-----
1 file changed, 29 insertions(+), 8 deletions(-)
diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh
index 8dd3a62068..37e71cfa9c 100644
--- a/tools/hotplug/Linux/xen-network-common.sh
+++ b/tools/hotplug/Linux/xen-network-common.sh
@@ -126,19 +126,40 @@ add_to_bridge () {
local bridge=$1
local dev=$2
- # Don't add $dev to $bridge if it's already on a bridge.
- if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
- ip link set dev ${dev} up || true
- return
- fi
- if which brctl >&/dev/null; then
- brctl addif ${bridge} ${dev}
+ # Don't add $dev to $bridge if it's already on the bridge.
+ if [ ! -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
+ log debug "adding $dev to bridge $bridge"
+ if which brctl >&/dev/null; then
+ brctl addif ${bridge} ${dev}
+ else
+ ip link set ${dev} master ${bridge}
+ fi
else
- ip link set ${dev} master ${bridge}
+ log debug "$dev already on bridge $bridge"
fi
+
ip link set dev ${dev} up
}
+remove_from_bridge () {
+ local bridge=$1
+ local dev=$2
+
+ ip link set dev ${dev} down || :
+
+ # Don't remove $dev from $bridge if it's not on the bridge.
+ if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then
+ log debug "removing $dev from bridge $bridge"
+ if which brctl >&/dev/null; then
+ brctl delif ${bridge} ${dev}
+ else
+ ip link set ${dev} nomaster
+ fi
+ else
+ log debug "$dev not on bridge $bridge"
+ fi
+}
+
# Usage: set_mtu bridge dev
set_mtu () {
local bridge=$1
--
2.20.1
next prev parent reply other threads:[~2020-07-30 19:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 19:48 [PATCH 0/4] tools: propagate bridge MTU to vif frontends Paul Durrant
2020-07-30 19:48 ` Paul Durrant [this message]
2020-07-30 19:48 ` [PATCH 2/4] tools/hotplug: combine add/online and remove/offline in vif-bridge Paul Durrant
2020-07-30 19:48 ` [PATCH 3/4] public/io/netif: specify MTU override node Paul Durrant
2020-08-03 5:08 ` Jürgen Groß
2020-08-03 8:14 ` Durrant, Paul
2020-07-30 19:48 ` [PATCH 4/4] tools/hotplug: modify set_mtu() to inform the frontend via xenstore Paul Durrant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730194858.28523-2-paul@xen.org \
--to=paul@xen.org \
--cc=ian.jackson@eu.citrix.com \
--cc=pdurrant@amazon.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).