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 8efb88340e29293e05f6b498b60596884c05a8a8
-Author: J. Bruce Fields <bfields@redhat.com>
-Date: Mon Jul 8 13:44:45 2013 -0400
+Jana Iyengar found an interesting issue on CUBIC :
+
+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.
- svcrpc: fix failures to handle -1 uid's
-
- As of f025adf191924e3a75ce80e130afcd2485b53bb8 "sunrpc: Properly decode
- kuids and kgids in RPC_AUTH_UNIX credentials" any rpc containing a -1
- (0xffff) uid or gid would fail with a badcred error.
-
- Commit afe3c3fd5392b2f0066930abc5dbd3f4b14a0f13 "svcrpc: fix failures to
- handle -1 uid's and gid's" fixed part of the problem, but overlooked the
- gid upcall--the kernel can request supplementary gid's for the -1 uid,
- but mountd's attempt write a response will get -EINVAL.
-
- Symptoms were nfsd failing to reply to the first attempt to use a newly
- negotiated krb5 context.
-
- Reported-by: Sven Geggus <lists@fuchsschwanzdomain.de>
- Tested-by: Sven Geggus <lists@fuchsschwanzdomain.de>
- Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+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.
-diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
-index a98853d..621ca7b 100644
---- a/net/sunrpc/svcauth_unix.c
-+++ b/net/sunrpc/svcauth_unix.c
-@@ -493,8 +493,6 @@ static int unix_gid_parse(struct cache_detail *cd,
- if (rv)
- return -EINVAL;
- uid = make_kuid(&init_user_ns, id);
-- if (!uid_valid(uid))
-- return -EINVAL;
- ug.uid = uid;
+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;
+ }
- expiry = get_expiry(&mesg);
++static void bictcp_cwnd_event(struct sock *sk, enum tcp_ca_event event)
++{
++ if (event == CA_EVENT_TX_START) {
++ s32 delta = tcp_time_stamp - tcp_sk(sk)->lsndtime;
++ struct bictcp *ca = inet_csk_ca(sk);
++
++ /* 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;
++ }
++}
++
+ /* 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",