commit 62453ea639c17dd62b90ea49f4a14443e308aa4e
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat May 7 11:58:12 2016 +0200
- up to 4.1.23
kernel-small_fixes.patch | 71 ------------------------------------------------
kernel.spec | 4 +--
2 files changed, 2 insertions(+), 73 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 67dd186..9aeaf90 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
%define rel 1
%define basever 4.1
-%define postver .22
+%define postver .23
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -120,7 +120,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
# Source0-md5: fe9dc0f6729f36400ea81aa41d614c37
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5: 80315d8d9868a266d04b5e70f8f2c6cc
+# Patch0-md5: 210e32093b85a5357c8adae809203e84
%endif
Source1: kernel.sysconfig
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index daeccab..68d235c 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -27,77 +27,6 @@
fi
done
-From 30927520dbae297182990bb21d08762bcc35ce1d Mon Sep 17 00:00:00 2001
-From: Eric Dumazet <[email protected]>
-Date: Wed, 9 Sep 2015 21:55:07 -0700
-Subject: [PATCH] tcp_cubic: better follow cubic curve after idle period
-
-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.
-
-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 <[email protected]>
-Signed-off-by: Eric Dumazet <[email protected]>
-Signed-off-by: Yuchung Cheng <[email protected]>
-Signed-off-by: Neal Cardwell <[email protected]>
-Cc: Stephen Hemminger <[email protected]>
-Cc: Sangtae Ha <[email protected]>
-Cc: Lawrence Brakmo <[email protected]>
-Signed-off-by: David S. Miller <[email protected]>
----
- 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;
- }
-
-+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",
-
From 7a29ac474a47eb8cf212b45917683ae89d6fa13b Mon Sep 17 00:00:00 2001
From: Chris Mason <[email protected]>
Date: Tue, 10 Nov 2015 10:10:34 +1100
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/62453ea639c17dd62b90ea49f4a14443e308aa4e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
