Accepting request 557319 from home:dmolkentin:branches:Base:System

- Fix task limit in emergency.service (same as in dracut-emergency.service) (bsc#1052840)
- 95fcoe: Allow bnc2x driver more time to complete DCB negotiation (bsc#1052840)
  * adds 0549-fcoe-up-Increase-sleeptime-to-13s.patch
- 95fcoe: add timeout initqueue entries (bsc#1052840)
  * adds 0550-95fcoe-add-timeout-initqueue-entries.patch

OBS-URL: https://build.opensuse.org/request/show/557319
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=329

0548-95fcoe-Switch-back-to-using-fipvlan-for-bnx2fc.patch

@@ -0,0 +1,41 @@
+From 9353f7e22da71f16a070cb27c139817ba04879c5 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 17 Aug 2017 10:54:22 +0200
+Subject: [PATCH 1/3] 95fcoe: Switch back to using fipvlan for bnx2fc
+
+bnx2fc doesn't _actually_ need fcoemon, so fipvlan is sufficient
+to start the FCoE connection.
+And, in fact, fcoemon is started for every interface, causing
+subsequent invocations to fail with
+
+fcoemon[1157]: error 98 address already in use
+
+and fcoemon tearing down the connection.
+
+References: bsc#1052840
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/95fcoe/fcoe-up.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
+index 74bdf819..261bf70c 100755
+--- a/modules.d/95fcoe/fcoe-up.sh
++++ b/modules.d/95fcoe/fcoe-up.sh
+@@ -57,7 +57,11 @@ if [ "$netdriver" = "bnx2x" ]; then
+     udevadm settle --timeout=30
+     # Sleep for 3 s to allow dcb negotiation
+     sleep 3
+-elif [ "$dcb" = "dcb" ]; then
++    fipvlan "$netif" -c -s
++    need_shutdown
++    exit
++fi
++if [ "$dcb" = "dcb" ]; then
+     # wait for lldpad to be ready
+     i=0
+     while [ $i -lt 60 ]; do
+-- 
+2.13.6
+

0549-fcoe-up-Increase-sleeptime-to-13s.patch

@@ -0,0 +1,34 @@
+From be4084fa2c097cd4b0ca870501e1a9628141de07 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Thu, 12 Oct 2017 13:38:11 +0200
+Subject: [PATCH 2/3] fcoe-up: Increase sleeptime to 13s
+
+The bnx2 driver requires some time to complete DCB negotiation,
+so we should rather increase the sleep time to avoid FCoE not
+being able to start correctly.
+
+References: bsc#1052840
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/95fcoe/fcoe-up.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
+index 261bf70c..21947447 100755
+--- a/modules.d/95fcoe/fcoe-up.sh
++++ b/modules.d/95fcoe/fcoe-up.sh
+@@ -55,8 +55,8 @@ if [ "$netdriver" = "bnx2x" ]; then
+     # If driver is bnx2x, do not use /sys/module/fcoe/parameters/create but fipvlan
+     modprobe 8021q
+     udevadm settle --timeout=30
+-    # Sleep for 3 s to allow dcb negotiation
+-    sleep 3
++    # Sleep for 13 s to allow dcb negotiation
++    sleep 13
+     fipvlan "$netif" -c -s
+     need_shutdown
+     exit
+-- 
+2.13.6
+

0550-95fcoe-add-timeout-initqueue-entries.patch

@@ -0,0 +1,35 @@
+From 853356a0d72e5c1a3cc69b9eb09dff66f6e20647 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <hare@suse.de>
+Date: Wed, 13 Sep 2017 09:42:01 +0200
+Subject: [PATCH] 95fcoe: add timeout initqueue entries
+
+Occasionally the FCoE connection might be reset after fipvlan was
+called, causing the FCoE connection to be dropped and boot to fail.
+For these cases we should be adding a timeout entry for the
+initqueue to have a failsave mechanism to re-run fipvlan in
+these cases.
+
+References: bsc#1052840
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ modules.d/95fcoe/fcoe-genrules.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/modules.d/95fcoe/fcoe-genrules.sh b/modules.d/95fcoe/fcoe-genrules.sh
+index 5b16cb0d..445a09c2 100755
+--- a/modules.d/95fcoe/fcoe-genrules.sh
++++ b/modules.d/95fcoe/fcoe-genrules.sh
+@@ -8,7 +8,9 @@
+ {
+     if [ -n "$fcoe_mac" ] ; then
+         printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="/sbin/initqueue --onetime --unique --name fcoe-up-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s %s"\n' "$fcoe_mac" "$fcoe_dcb" "$fcoe_mode"
++        printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="/sbin/initqueue --onetime --timeout --unique --name fcoe-timeout-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s %s"\n' "$fcoe_mac" "$fcoe_dcb" "$fcoe_mode"
+     else
+         printf 'ACTION=="add", SUBSYSTEM=="net", NAME=="%s", RUN+="/sbin/initqueue --onetime --unique --name fcoe-up-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s %s"\n' "$fcoe_interface" "$fcoe_dcb" "$fcoe_mode"
++        printf 'ACTION=="add", SUBSYSTEM=="net", NAME=="%s", RUN+="/sbin/initqueue --onetime --timeout --unique --name fcoe-timeout-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s %s"\n' "$fcoe_interface" "$fcoe_dcb" "$fcoe_mode"
+     fi
+ } >> /etc/udev/rules.d/92-fcoe.rules
+-- 
+2.13.6
+

dracut.changes

@@ -1,9 +1,15 @@
 -------------------------------------------------------------------
 Thu Dec 14 12:33:59 UTC 2017 - daniel.molkentin@suse.com
 
-- Fix task limit in emergency.service (same as in dracut-emergency.service) (bsc#1019938)
+- Fix task limit in emergency.service (same as in dracut-emergency.service) (bsc#1052840)
   * adds 0547-Fix-task-limit-in-emergency.service-the-same-change-.patch
 
+- 95fcoe: Allow bnc2x driver more time to complete DCB negotiation (bsc#1052840)
+  * adds 0549-fcoe-up-Increase-sleeptime-to-13s.patch
+
+- 95fcoe: add timeout initqueue entries (bsc#1052840)
+  * adds 0550-95fcoe-add-timeout-initqueue-entries.patch
+
 -------------------------------------------------------------------
 Wed Dec 13 17:07:10 UTC 2017 - daniel.molkentin@suse.com
 

dracut.spec

@@ -232,6 +232,9 @@ Patch544:       0544-40network-Make-ip-dhcp-work.patch
 Patch545:       0545-Add-early-microcode-support-for-AMD-family-16h.patch
 Patch546:       0546-Support-Microcode-Updates-for-AMD-CPU-Family-0x17.patch
 Patch547:       0547-Fix-task-limit-in-emergency.service-the-same-change-.patch
+Patch548:       0548-95fcoe-Switch-back-to-using-fipvlan-for-bnx2fc.patch
+Patch549:       0549-fcoe-up-Increase-sleeptime-to-13s.patch
+Patch550:       0550-95fcoe-add-timeout-initqueue-entries.patch
 
 BuildRequires:  asciidoc
 BuildRequires:  bash
@@ -499,6 +502,9 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh
 %patch545 -p1
 %patch546 -p1
 %patch547 -p1
+%patch548 -p1
+%patch549 -p1
+%patch550 -p1
 
 %build
 %configure\