exit
fi
done
+From 30927520dbae297182990bb21d08762bcc35ce1d Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 9 Sep 2015 21:55:07 -0700
+Subject: [PATCH] tcp_cubic: better follow cubic curve after idle period
-diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 7a0c800..ec5ebbb 100644
---- a/drivers/net/ethernet/realtek/r8169.c
-+++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -6927,6 +6927,14 @@ rtl_init_one(struct pci_dev *pdev, const
- for (i = 0; i < ETH_ALEN; i++)
- dev->dev_addr[i] = RTL_R8(MAC0 + i);
-
-+ if (!is_valid_ether_addr(dev->dev_addr)) {
-+ /* Report it and use a random ethernet address instead */
-+ netdev_err(dev, "Invalid MAC address: %pM\n", dev->dev_addr);
-+ random_ether_addr(dev->dev_addr);
-+ netdev_info(dev, "Using random MAC address: %pM\n",
-+ dev->dev_addr);
-+ }
-+
- SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
- dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
-
-commit 03bbcb2e7e292838bb0244f5a7816d194c911d62
-Author: Neil Horman <nhorman@tuxdriver.com>
-Date: Tue Apr 16 16:38:32 2013 -0400
+Jana Iyengar found an interesting issue on CUBIC :
- iommu/vt-d: add quirk for broken interrupt remapping on 55XX chipsets
-
- A few years back intel published a spec update:
- http://www.intel.com/content/dam/doc/specification-update/5520-and-5500-chipset-ioh-specification-update.pdf
-
- For the 5520 and 5500 chipsets which contained an errata (specificially errata
- 53), which noted that these chipsets can't properly do interrupt remapping, and
- as a result the recommend that interrupt remapping be disabled in bios. While
- many vendors have a bios update to do exactly that, not all do, and of course
- not all users update their bios to a level that corrects the problem. As a
- result, occasionally interrupts can arrive at a cpu even after affinity for that
- interrupt has be moved, leading to lost or spurrious interrupts (usually
- characterized by the message:
- kernel: do_IRQ: 7.71 No irq handler for vector (irq -1)
-
- There have been several incidents recently of people seeing this error, and
- investigation has shown that they have system for which their BIOS level is such
- that this feature was not properly turned off. As such, it would be good to
- give them a reminder that their systems are vulnurable to this problem. For
- details of those that reported the problem, please see:
- https://bugzilla.redhat.com/show_bug.cgi?id=887006
-
- [ Joerg: Removed CONFIG_IRQ_REMAP ifdef from early-quirks.c ]
-
- Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
- CC: Prarit Bhargava <prarit@redhat.com>
- CC: Don Zickus <dzickus@redhat.com>
- CC: Don Dutile <ddutile@redhat.com>
- CC: Bjorn Helgaas <bhelgaas@google.com>
- CC: Asit Mallick <asit.k.mallick@intel.com>
- CC: David Woodhouse <dwmw2@infradead.org>
- CC: linux-pci@vger.kernel.org
- CC: Joerg Roedel <joro@8bytes.org>
- CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
- CC: Arkadiusz Miśkiewicz <arekm@maven.pl>
- Signed-off-by: Joerg Roedel <joro@8bytes.org>
+The epoch is only updated/reset initially and when experiencing losses.
+The delta "t" of now - epoch_start can be arbitrary large after app idle
+as well as the bic_target. Consequentially the slope (inverse of
+ca->cnt) would be really large, and eventually ca->cnt would be
+lower-bounded in the end to 2 to have delayed-ACK slow-start behavior.
-diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
-index 95fd352..aca6aa2 100644
---- a/arch/x86/include/asm/irq_remapping.h
-+++ b/arch/x86/include/asm/irq_remapping.h
-@@ -28,6 +28,7 @@
-
- extern void setup_irq_remapping_ops(void);
- extern int irq_remapping_supported(void);
-+extern void set_irq_remapping_broken(void);
- extern int irq_remapping_prepare(void);
- extern int irq_remapping_enable(void);
- extern void irq_remapping_disable(void);
-@@ -54,6 +55,7 @@ void irq_remap_modify_chip_defaults(struct irq_chip *chip);
-
- static inline void setup_irq_remapping_ops(void) { }
- static inline int irq_remapping_supported(void) { return 0; }
-+static inline void set_irq_remapping_broken(void) { }
- static inline int irq_remapping_prepare(void) { return -ENODEV; }
- static inline int irq_remapping_enable(void) { return -ENODEV; }
- static inline void irq_remapping_disable(void) { }
-diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
-index 3755ef4..94ab6b9 100644
---- a/arch/x86/kernel/early-quirks.c
-+++ b/arch/x86/kernel/early-quirks.c
-@@ -18,6 +18,7 @@
- #include <asm/apic.h>
- #include <asm/iommu.h>
- #include <asm/gart.h>
-+#include <asm/irq_remapping.h>
-
- static void __init fix_hypertransport_config(int num, int slot, int func)
- {
-@@ -192,6 +193,21 @@ static void __init ati_bugs_contd(int num, int slot, int func)
+This particularly shows up when slow_start_after_idle is disabled
+as a dangerous cwnd inflation (1.5 x RTT) after few seconds of idle
+time.
+
+Jana initial fix was to reset epoch_start if app limited,
+but Neal pointed out it would ask the CUBIC algorithm to recalculate the
+curve so that we again start growing steeply upward from where cwnd is
+now (as CUBIC does just after a loss). Ideally we'd want the cwnd growth
+curve to be the same shape, just shifted later in time by the amount of
+the idle period.
+
+Reported-by: Jana Iyengar <jri@google.com>
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: Yuchung Cheng <ycheng@google.com>
+Signed-off-by: Neal Cardwell <ncardwell@google.com>
+Cc: Stephen Hemminger <stephen@networkplumber.org>
+Cc: Sangtae Ha <sangtae.ha@gmail.com>
+Cc: Lawrence Brakmo <lawrence@brakmo.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ net/ipv4/tcp_cubic.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
+index 28011fb1..c6ded6b 100644
+--- a/net/ipv4/tcp_cubic.c
++++ b/net/ipv4/tcp_cubic.c
+@@ -151,6 +151,21 @@ static void bictcp_init(struct sock *sk)
+ tcp_sk(sk)->snd_ssthresh = initial_ssthresh;
}
- #endif
-+static void __init intel_remapping_check(int num, int slot, int func)
++static void bictcp_cwnd_event(struct sock *sk, enum tcp_ca_event event)
+{
-+ u8 revision;
-+
-+ revision = read_pci_config_byte(num, slot, func, PCI_REVISION_ID);
-+
-+ /*
-+ * Revision 0x13 of this chipset supports irq remapping
-+ * but has an erratum that breaks its behavior, flag it as such
-+ */
-+ if (revision == 0x13)
-+ set_irq_remapping_broken();
++ if (event == CA_EVENT_TX_START) {
++ s32 delta = tcp_time_stamp - tcp_sk(sk)->lsndtime;
++ struct bictcp *ca = inet_csk_ca(sk);
+
-+}
-+
- #define QFLAG_APPLY_ONCE 0x1
- #define QFLAG_APPLIED 0x2
- #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
-@@ -221,6 +237,10 @@ static struct chipset early_qrk[] __initdata = {
- PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
- PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs_contd },
-+ { PCI_VENDOR_ID_INTEL, 0x3403, PCI_CLASS_BRIDGE_HOST,
-+ PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
-+ { PCI_VENDOR_ID_INTEL, 0x3406, PCI_CLASS_BRIDGE_HOST,
-+ PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
- {}
- };
-
-diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
-index f3b8f23..5b19b2d 100644
---- a/drivers/iommu/intel_irq_remapping.c
-+++ b/drivers/iommu/intel_irq_remapping.c
-@@ -524,6 +524,16 @@ static int __init intel_irq_remapping_supported(void)
-
- if (disable_irq_remap)
- return 0;
-+ if (irq_remap_broken) {
-+ WARN_TAINT(1, TAINT_FIRMWARE_WORKAROUND,
-+ "This system BIOS has enabled interrupt remapping\n"
-+ "on a chipset that contains an erratum making that\n"
-+ "feature unstable. To maintain system stability\n"
-+ "interrupt remapping is being disabled. Please\n"
-+ "contact your BIOS vendor for an update\n");
-+ disable_irq_remap = 1;
-+ return 0;
++ /* We were application limited (idle) for a while.
++ * Shift epoch_start to keep cwnd growth to cubic curve.
++ */
++ if (ca->epoch_start && delta > 0)
++ ca->epoch_start += delta;
++ return;
+ }
-
- if (!dmar_ir_support())
- return 0;
-diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
-index d56f8c1..3c11043 100644
---- a/drivers/iommu/irq_remapping.c
-+++ b/drivers/iommu/irq_remapping.c
-@@ -19,6 +19,7 @@
- int irq_remapping_enabled;
-
- int disable_irq_remap;
-+int irq_remap_broken;
- int disable_sourceid_checking;
- int no_x2apic_optout;
-
-@@ -211,6 +212,11 @@ void __init setup_irq_remapping_ops(void)
- #endif
- }
-
-+void set_irq_remapping_broken(void)
-+{
-+ irq_remap_broken = 1;
+}
+
- int irq_remapping_supported(void)
- {
- if (disable_irq_remap)
-diff --git a/drivers/iommu/irq_remapping.h b/drivers/iommu/irq_remapping.h
-index ecb6376..90c4dae 100644
---- a/drivers/iommu/irq_remapping.h
-+++ b/drivers/iommu/irq_remapping.h
-@@ -32,6 +32,7 @@ struct pci_dev;
- struct msi_msg;
-
- extern int disable_irq_remap;
-+extern int irq_remap_broken;
- extern int disable_sourceid_checking;
- extern int no_x2apic_optout;
- extern int irq_remapping_enabled;
-@@ -89,6 +90,7 @@ extern struct irq_remap_ops amd_iommu_irq_ops;
-
- #define irq_remapping_enabled 0
- #define disable_irq_remap 1
-+#define irq_remap_broken 0
-
- #endif /* CONFIG_IRQ_REMAP */
-
-From patchwork Mon Jun 3 08:16:21 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: ipv6: assign rt6_info to inet6_ifaddr in init_loopback
-Date: Sun, 02 Jun 2013 22:16:21 -0000
-From: Gao feng <gaofeng@cn.fujitsu.com>
-X-Patchwork-Id: 248198
-Message-Id: <1370247381-3091-1-git-send-email-gaofeng@cn.fujitsu.com>
-To: davem@davemloft.net, yoshfuji@linux-ipv6.org
-Cc: netdev@vger.kernel.org, jasowang@redhat.com,
- kumaran.4353@gmail.com, Maruthi.Thotad@ap.sony.com,
- Gao feng <gaofeng@cn.fujitsu.com>
-
-Commit 25fb6ca4ed9cad72f14f61629b68dc03c0d9713f
-"net IPv6 : Fix broken IPv6 routing table after loopback down-up"
-forgot to assign rt6_info to the inet6_ifaddr.
-When disable the net device, the rt6_info which allocated
-in init_loopback will not be destroied in __ipv6_ifa_notify.
-
-This will trigger the waring message below
-[23527.916091] unregister_netdevice: waiting for tap0 to become free. Usage count = 1
-
-Reported-by: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
-Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
-
----
-net/ipv6/addrconf.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index d1b2d80..1bbf744 100644
---- a/net/ipv6/addrconf.c
-+++ b/net/ipv6/addrconf.c
-@@ -2658,8 +2658,10 @@ static void init_loopback(struct net_device *dev)
- sp_rt = addrconf_dst_alloc(idev, &sp_ifa->addr, 0);
-
- /* Failure cases are ignored */
-- if (!IS_ERR(sp_rt))
-+ if (!IS_ERR(sp_rt)) {
-+ sp_ifa->rt = sp_rt;
- ip6_ins_rt(sp_rt);
-+ }
- }
- read_unlock_bh(&idev->lock);
- }
+ /* calculate the cubic root of x using a table lookup followed by one
+ * Newton-Raphson iteration.
+ * Avg err ~= 0.195%
+@@ -450,6 +465,7 @@ static struct tcp_congestion_ops cubictcp __read_mostly = {
+ .cong_avoid = bictcp_cong_avoid,
+ .set_state = bictcp_state,
+ .undo_cwnd = bictcp_undo_cwnd,
++ .cwnd_event = bictcp_cwnd_event,
+ .pkts_acked = bictcp_acked,
+ .owner = THIS_MODULE,
+ .name = "cubic",
projects / packages / kernel.git / blobdiff