support multiple bonding interfaces

PATCH Applied Baoquan He 3 participants 6 messages Apr 8, 2013 – Apr 9, 2013 3 messages not in the archive

lore

Share & tools

lore

Baoquan He

author

2013-04-08 09:47 UTC #0 lore raw

v2 cover support multiple bonding interfaces

Hi Harald,

I tested your patch - "network: support multiple bonding interfaces", and it works very well on f19 on my local PC.

The 2/2 patch is used to add a script file to wait the logical interface up during initqueue, like bond, bridge and vlan. I just tested bond case, it works.

Please help review it when convenient.

Baoquan He (2):
network: support multiple bonding interfaces
Wait for logical interface to be up

 modules.d/40network/ifup.sh         |   15 ++++++++++-----
 modules.d/40network/net-genrules.sh |   20 ++++++++++++++++----
 modules.d/40network/parse-bond.sh   |    6 +++---
 modules.d/40network/parse-bridge.sh |    6 ------
 modules.d/45ifcfg/write-ifcfg.sh    |    9 +++++----
 5 files changed, 34 insertions(+), 22 deletions(-)

Baoquan He

author

2013-04-08 09:47 UTC #2 lore raw

PATCH v2 1/2 network: support multiple bonding interfaces

In reply to a message not in the archive

From: Harald Hoyer <[email protected]>

Currently dracut only support 1 bond, namyly bond0 by default. However multiple bonds configuration may be needed. For example in kdump, in 1st kernel, more than one bonds may be configured, and bondX other than bond0 is used as output interface to remote host which will store dump core. This patch can solve this problem, to write real bond information to initramfs, 2nd kdump kernel will use it to create the relevant bondX interface.

Tested-by Baoquan He <[email protected]>

Signed-off-by Baoquan He <[email protected]>

---
 modules.d/40network/ifup.sh         |   15 ++++++++++-----
 modules.d/40network/net-genrules.sh |    9 ++++++---
 modules.d/40network/parse-bond.sh   |    6 +++---
 modules.d/40network/parse-bridge.sh |    6 ------
 modules.d/45ifcfg/write-ifcfg.sh    |    9 +++++----
 5 files changed, 24 insertions(+), 21 deletions(-)

modules.d/40network/ifup.sh +10 -5

index 582278f..dccd174 100755
@@ -21,14 +21,18 @@ use_bridge='false'
 use_vlan='false'
 
 # enslave this interface to bond?
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
+for i in /tmp/bond.*.info; do
+    [ -e "$i" ] || continue
+    unset bondslaves
+    unset bondname
+    . "$i"
     for slave in $bondslaves ; do
         if [ "$netif" = "$slave" ] ; then
             netif=$bondname
+            break 2
         fi
     done
-fi
+done
 
 if [ -e /tmp/team.info ]; then
     . /tmp/team.info

@@ -134,11 +138,12 @@ if [ "$netif" = "lo" ] ; then
 fi
 
 # start bond if needed
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
+if [ -e /tmp/bond.${netif}.info ]; then
+    . /tmp/bond.${netif}.info
 
     if [ "$netif" = "$bondname" ] && [ ! -e /tmp/net.$bondname.up ] ; then # We are master bond device
         modprobe bonding
+        echo "+$netif" >  /sys/class/net/bonding_masters
         ip link set $netif down
 
         # Stolen from ifup-eth

modules.d/40network/net-genrules.sh +6 -3

index f4652b9..05fa5f3 100755
@@ -28,11 +28,14 @@ fi
     fi
 
     # bond: attempt only the defined interface (override bridge defines)
-    if [ -e /tmp/bond.info ]; then
-        . /tmp/bond.info
+    for i in /tmp/bond.*.info; do
+        [ -e "$i" ] || continue
+        unset bondslaves
+        unset bondname
+        . "$i"
         # It is enough to fire up only one
         IFACES="$IFACES ${bondslaves%% *}"
-    fi
+    done
 
     if [ -e /tmp/team.info ]; then
         . /tmp/team.info

modules.d/40network/parse-bond.sh +3 -3

index 983eb3a..25c51b8 100755
@@ -54,8 +54,8 @@ if getarg bond >/dev/null; then
     fi
     # Make it suitable for initscripts export
     bondoptions=$(str_replace "$bondoptions" ";" ",")
-    echo "bondname=$bondname" > /tmp/bond.info
-    echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.info
-    echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.info
+    echo "bondname=$bondname" > /tmp/bond.${bondname}.info
+    echo "bondslaves=\"$bondslaves\"" >> /tmp/bond.${bondname}.info
+    echo "bondoptions=\"$bondoptions\"" >> /tmp/bond.${bondname}.info
     return
 fi

modules.d/40network/parse-bridge.sh +0 -6

index 1f027bb..8c305c0 100755
@@ -37,12 +37,6 @@ parsebridge() {
 unset bridgename ethnames
 
 iface=eth0
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
-    if [ -n "$bondname" ] ; then
-        iface=$bondname
-    fi
-fi
 
 # Parse bridge for bridgename and ethnames
 if bridge="$(getarg bridge)"; then

modules.d/45ifcfg/write-ifcfg.sh +5 -4

index f7a476c..16da5e4 100755
@@ -9,10 +9,6 @@ udevadm settle --timeout=30
 
 read IFACES < /tmp/net.ifaces
 
-if [ -e /tmp/bond.info ]; then
-    . /tmp/bond.info
-fi
-
 if [ -e /tmp/bridge.info ]; then
     . /tmp/bridge.info
 fi

@@ -89,6 +85,11 @@ for netif in $IFACES ; do
     # bridge?
     unset bridge
     unset bond
+    unset bondslaves
+    unset bondname
+    unset bondoptions
+    [ -e /tmp/bond.${netif}.info ] && . /tmp/bond.${netif}.info
+
     uuid=$(cat /proc/sys/kernel/random/uuid)
     if [ "$netif" = "$bridgename" ]; then
         bridge=yes

Signature · 1 line

1.7.1

Baoquan He

author

2013-04-08 09:47 UTC #5 lore raw

PATCH v2 2/2 Wait for logical interface to be up

In reply to a message not in the archive

If bootdev is logical interface like bond, bridge or vlan, we need wait them up.

Signed-off-by Baoquan He <[email protected]>

---
 modules.d/40network/net-genrules.sh |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

modules.d/40network/net-genrules.sh +10 -1

index 05fa5f3..be2f811 100755
@@ -25,6 +25,7 @@ fi
     if [ -e /tmp/bridge.info ]; then
         . /tmp/bridge.info
         IFACES="$IFACES ${ethnames%% *}"
+        MASTER_IFACES="$MASTER_IFACES $bridgename"
     fi
 
     # bond: attempt only the defined interface (override bridge defines)

@@ -35,16 +36,19 @@ fi
         . "$i"
         # It is enough to fire up only one
         IFACES="$IFACES ${bondslaves%% *}"
+        MASTER_IFACES="$MASTER_IFACES ${bondname}"
     done
 
     if [ -e /tmp/team.info ]; then
         . /tmp/team.info
         IFACES="$IFACES ${teamslaves}"
+        MASTER_IFACES="$MASTER_IFACES ${teammaster}"
     fi
 
     if [ -e /tmp/vlan.info ]; then
         . /tmp/vlan.info
         IFACES="$IFACES $phydevice"
+        MASTER_IFACES="$MASTER_IFACES ${vlanname}"
     fi
 
     if [ -z "$IFACES" ]; then

@@ -56,7 +60,7 @@ fi
     fi
 
     ifup='/sbin/ifup $env{INTERFACE}'
-    [ -z "$netroot" ] && ifup="$ifup -m"
+    [ -z "$netroot" ] && ifup="$ifup -m" 
 
     # BOOTIF says everything, use only that one
     BOOTIF=$(getarg 'BOOTIF=')

@@ -74,6 +78,11 @@ fi
             fi
         done
 
+        for iface in $MASTER_IFACES; do
+            if [ "$bootdev" = "$iface" ]; then
+                echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
+            fi
+        done
     # Default: We don't know the interface to use, handle all
     # Fixme: waiting for the interface as well.
     else

Signature · 1 line

1.7.1

Dave Young

2013-04-09 03:04 UTC #7 lore raw

Re: [PATCH v2 2/2] Wait for logical interface to be up

In reply to a message not in the archive

Quoted 41 lines · Baoquan He

If bootdev is logical interface like bond, bridge or vlan, we need wait them up.

Signed-off-by Baoquan He <[email protected]>

---
 modules.d/40network/net-genrules.sh |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

modules.d/40network/net-genrules.sh +4 -0

index 05fa5f3..be2f811 100755
@@ -25,6 +25,7 @@ fi
     if [ -e /tmp/bridge.info ]; then
         . /tmp/bridge.info
         IFACES="$IFACES ${ethnames%% *}"
+        MASTER_IFACES="$MASTER_IFACES $bridgename"
     fi
 
     # bond: attempt only the defined interface (override bridge defines)

@@ -35,16 +36,19 @@ fi
         . "$i"
         # It is enough to fire up only one
         IFACES="$IFACES ${bondslaves%% *}"
+        MASTER_IFACES="$MASTER_IFACES ${bondname}"
     done
 
     if [ -e /tmp/team.info ]; then
         . /tmp/team.info
         IFACES="$IFACES ${teamslaves}"
+        MASTER_IFACES="$MASTER_IFACES ${teammaster}"
     fi
 
     if [ -e /tmp/vlan.info ]; then
         . /tmp/vlan.info
         IFACES="$IFACES $phydevice"
+        MASTER_IFACES="$MASTER_IFACES ${vlanname}"
     fi
 
     if [ -z "$IFACES" ]; then

modules.d/40network/net-genrules.sh fi · line 63

Quoted 5 lines

modules.d/40network/net-genrules.sh +1 -1

@@ -56,7 +60,7 @@ fi
     fi
 
     ifup='/sbin/ifup $env{INTERFACE}'
-    [ -z "$netroot" ] && ifup="$ifup -m"
+    [ -z "$netroot" ] && ifup="$ifup -m"

Please remove change in above line.., otherwise these two patches looks good to me.

Quoted 16 lines

modules.d/40network/net-genrules.sh +5 -0

     # BOOTIF says everything, use only that one
     BOOTIF=$(getarg 'BOOTIF=')

@@ -74,6 +78,11 @@ fi
             fi
         done
 
+        for iface in $MASTER_IFACES; do
+            if [ "$bootdev" = "$iface" ]; then
+                echo "[ -f /tmp/setup_net_${iface}.ok ]" >$hookdir/initqueue/finished/wait-$iface.sh
+            fi
+        done
     # Default: We don't know the interface to use, handle all
     # Fixme: waiting for the interface as well.
     else

Signature · 2 lines

Thanks
Dave

Harald Hoyer

Applied

2013-04-09 08:53 UTC #4 lore raw

Re: [PATCH v2 1/2] network: support multiple bonding interfaces

In reply to a message not in the archive

Am 08.04.2013 11:47, schrieb Baoquan He:

Quoted 11 lines

From: Harald Hoyer <[email protected]>
Currently dracut only support 1 bond, namyly bond0 by default. However multiple bonds configuration may be needed. For example in kdump, in 1st kernel, more than one bonds may be configured, and bondX other than bond0 is used as output interface to remote host which will store dump core. This patch can solve this problem, to write real bond information to initramfs, 2nd kdump kernel will use it to create the relevant bondX interface.
Tested-by Baoquan He <[email protected]>
Signed-off-by Baoquan He <[email protected]>

Quoted 8 lines

---
 modules.d/40network/ifup.sh         |   15 ++++++++++-----
 modules.d/40network/net-genrules.sh |    9 ++++++---
 modules.d/40network/parse-bond.sh   |    6 +++---
 modules.d/40network/parse-bridge.sh |    6 ------
 modules.d/45ifcfg/write-ifcfg.sh    |    9 +++++----
 5 files changed, 24 insertions(+), 21 deletions(-)

applied

Harald Hoyer

Applied

2013-04-09 08:54 UTC #8 lore raw

Re: [PATCH v2 2/2] Wait for logical interface to be up

In reply to a message not in the archive

Am 08.04.2013 11:47, schrieb Baoquan He:

Quoted 8 lines

If bootdev is logical interface like bond, bridge or vlan, we need wait them up.
Signed-off-by Baoquan He <[email protected]>
---
 modules.d/40network/net-genrules.sh |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

applied