[arch-commits] Commit in linux-hardened/trunk (3 files)
Daniel Micay
thestinger at archlinux.org
Sun Aug 20 18:38:03 UTC 2017
Date: Sunday, August 20, 2017 @ 18:38:03
Author: thestinger
Revision: 252778
upgpkg: linux-hardened 4.12.8.b-1
Added:
linux-hardened/trunk/bonding-ratelimit-failed-speed-duplex-update-warning.patch
linux-hardened/trunk/bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch
Modified:
linux-hardened/trunk/PKGBUILD
------------------------------------------------------------+
PKGBUILD | 11 +
bonding-ratelimit-failed-speed-duplex-update-warning.patch | 47 +++++++
bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch | 68 +++++++++++
3 files changed, 124 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-08-20 18:30:56 UTC (rev 252777)
+++ PKGBUILD 2017-08-20 18:38:03 UTC (rev 252778)
@@ -6,7 +6,7 @@
pkgbase=linux-hardened
_srcname=linux-4.12
_pkgver=4.12.8
-pkgver=$_pkgver.a
+pkgver=$_pkgver.b
pkgrel=1
arch=('x86_64')
url="https://github.com/copperhead/linux-hardened"
@@ -19,6 +19,8 @@
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${_pkgver}.sign"
"https://github.com/thestinger/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.patch"
"https://github.com/thestinger/$pkgbase/releases/download/$pkgver/$pkgbase-$pkgver.patch.sig"
+ 'bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch'
+ 'bonding-ratelimit-failed-speed-duplex-update-warning.patch'
# the main kernel config files
'config.x86_64'
# pacman hook for initramfs regeneration
@@ -31,8 +33,10 @@
'SKIP'
'32b860911a3bafd5cd5bc813a427c90fad6eafdf607fa64e1b763b16ab605636'
'SKIP'
- '4f307faffaec34eb6c887a29288f754c32f726e56c64091d3fb262e3d1115cad'
+ 'cfdbdac73388d19579961812bbca29126b59aed8e22570564fefeed39784ea0e'
'SKIP'
+ '48e0505438bb4ccc7a0e050a896122b490e8f1b1446aa3833841a9d4d7853d68'
+ 'fc606711a922638d5cc4358f47f69f554d9e6eab1cec91f0b49f00911f399722'
'270eacb615e4a9306a6dd0f272763ae14f5d6e685b63cdeebd59d687fcfc241f'
'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -57,6 +61,9 @@
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+ # https://bugzilla.kernel.org/show_bug.cgi?id=196547
+ patch -Np1 -i ../bonding-ratelimit-failed-speed-duplex-update-warning.patch
+ patch -Np1 -i ../bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch
cat "${srcdir}/config.${CARCH}" > ./.config
if [ "${_kernelname}" != "" ]; then
Added: bonding-ratelimit-failed-speed-duplex-update-warning.patch
===================================================================
--- bonding-ratelimit-failed-speed-duplex-update-warning.patch (rev 0)
+++ bonding-ratelimit-failed-speed-duplex-update-warning.patch 2017-08-20 18:38:03 UTC (rev 252778)
@@ -0,0 +1,47 @@
+From 11e9d7829dd08dbafb24517fe922f11c3a8a9dc2 Mon Sep 17 00:00:00 2001
+From: Andreas Born <futur.andy at googlemail.com>
+Date: Sat, 12 Aug 2017 00:36:55 +0200
+Subject: [PATCH] bonding: ratelimit failed speed/duplex update warning
+
+bond_miimon_commit() handles the UP transition for each slave of a bond
+in the case of MII. It is triggered 10 times per second for the default
+MII Polling interval of 100ms. For device drivers that do not implement
+__ethtool_get_link_ksettings() the call to bond_update_speed_duplex()
+fails persistently while the MII status could remain UP. That is, in
+this and other cases where the speed/duplex update keeps failing over a
+longer period of time while the MII state is UP, a warning is printed
+every MII polling interval.
+
+To address these excessive warnings net_ratelimit() should be used.
+Printing a warning once would not be sufficient since the call to
+bond_update_speed_duplex() could recover to succeed and fail again
+later. In that case there would be no new indication what went wrong.
+
+Fixes: b5bf0f5b16b9c (bonding: correctly update link status during mii-commit phase)
+Signed-off-by: Andreas Born <futur.andy at googlemail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/bonding/bond_main.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
+index 85bb272d2a34..fc63992ab0e0 100644
+--- a/drivers/net/bonding/bond_main.c
++++ b/drivers/net/bonding/bond_main.c
+@@ -2144,9 +2144,10 @@ static void bond_miimon_commit(struct bonding *bond)
+ if (bond_update_speed_duplex(slave) &&
+ bond_needs_speed_duplex(bond)) {
+ slave->link = BOND_LINK_DOWN;
+- netdev_warn(bond->dev,
+- "failed to get link speed/duplex for %s\n",
+- slave->dev->name);
++ if (net_ratelimit())
++ netdev_warn(bond->dev,
++ "failed to get link speed/duplex for %s\n",
++ slave->dev->name);
+ continue;
+ }
+ bond_set_slave_link_state(slave, BOND_LINK_UP,
+--
+2.14.1
+
Added: bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch
===================================================================
--- bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch (rev 0)
+++ bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch 2017-08-20 18:38:03 UTC (rev 252778)
@@ -0,0 +1,68 @@
+From ad729bc9acfb7c47112964b4877ef5404578ed13 Mon Sep 17 00:00:00 2001
+From: Andreas Born <futur.andy at googlemail.com>
+Date: Thu, 10 Aug 2017 06:41:44 +0200
+Subject: [PATCH] bonding: require speed/duplex only for 802.3ad, alb and tlb
+
+The patch c4adfc822bf5 ("bonding: make speed, duplex setting consistent
+with link state") puts the link state to down if
+bond_update_speed_duplex() cannot retrieve speed and duplex settings.
+Assumably the patch was written with 802.3ad mode in mind which relies
+on link speed/duplex settings. For other modes like active-backup these
+settings are not required. Thus, only for these other modes, this patch
+reintroduces support for slaves that do not support reporting speed or
+duplex such as wireless devices. This fixes the regression reported in
+bug 196547 (https://bugzilla.kernel.org/show_bug.cgi?id=196547).
+
+Fixes: c4adfc822bf5 ("bonding: make speed, duplex setting consistent
+with link state")
+Signed-off-by: Andreas Born <futur.andy at googlemail.com>
+Acked-by: Mahesh Bandewar <maheshb at google.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/bonding/bond_main.c | 6 ++++--
+ include/net/bonding.h | 5 +++++
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
+index 9bee6c1c70cc..85bb272d2a34 100644
+--- a/drivers/net/bonding/bond_main.c
++++ b/drivers/net/bonding/bond_main.c
+@@ -1569,7 +1569,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
+ new_slave->delay = 0;
+ new_slave->link_failure_count = 0;
+
+- if (bond_update_speed_duplex(new_slave))
++ if (bond_update_speed_duplex(new_slave) &&
++ bond_needs_speed_duplex(bond))
+ new_slave->link = BOND_LINK_DOWN;
+
+ new_slave->last_rx = jiffies -
+@@ -2140,7 +2141,8 @@ static void bond_miimon_commit(struct bonding *bond)
+ continue;
+
+ case BOND_LINK_UP:
+- if (bond_update_speed_duplex(slave)) {
++ if (bond_update_speed_duplex(slave) &&
++ bond_needs_speed_duplex(bond)) {
+ slave->link = BOND_LINK_DOWN;
+ netdev_warn(bond->dev,
+ "failed to get link speed/duplex for %s\n",
+diff --git a/include/net/bonding.h b/include/net/bonding.h
+index b00508d22e0a..b2e68657a216 100644
+--- a/include/net/bonding.h
++++ b/include/net/bonding.h
+@@ -277,6 +277,11 @@ static inline bool bond_is_lb(const struct bonding *bond)
+ BOND_MODE(bond) == BOND_MODE_ALB;
+ }
+
++static inline bool bond_needs_speed_duplex(const struct bonding *bond)
++{
++ return BOND_MODE(bond) == BOND_MODE_8023AD || bond_is_lb(bond);
++}
++
+ static inline bool bond_is_nondyn_tlb(const struct bonding *bond)
+ {
+ return (BOND_MODE(bond) == BOND_MODE_TLB) &&
+--
+2.14.1
+
More information about the arch-commits
mailing list