---- linux-2.6.15.6/drivers/input/joystick/iforce/iforce-serio.c 2006-03-05 19:07:54.000000000 +0000
-+++ linux-2.6.15.6.iforce/drivers/input/joystick/iforce/iforce-serio.c 2006-04-29 23:17:59.000000000 +0000
-@@ -175,6 +175,12 @@
- .id = SERIO_ANY,
- .extra = SERIO_ANY,
- },
-+ {
-+ .type = SERIO_RS232,
-+ .proto = 0x1f, // Trust ForceFeedback Race Master
-+ .id = SERIO_ANY,
-+ .extra = SERIO_ANY,
-+ },
- { 0 }
- };
-
---- linux-2.6.27/arch/powerpc/include/asm/io.h~ 2006-06-18 01:49:35.000000000 +0000
-+++ linux-2.6.27/arch/powerpc/include/asm/io.h 2006-06-22 02:44:19.000000000 +0000
-@@ -445,6 +445,10 @@
- #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
- #define page_to_bus(page) (page_to_phys(page) + PCI_DRAM_OFFSET)
-
-+#define isa_virt_to_bus virt_to_phys
-+#define isa_page_to_bus page_to_phys
-+#define isa_bus_to_virt phys_to_virt
-+
- /* Enforce in-order execution of data I/O.
- * No distinction between read/write on PPC; use eieio for all three.
- */
---- linux-2.6.27/arch/powerpc/include/asm/suspend.h 2007-07-09 01:32:17.000000000 +0200
-+++ linux-2.6.27/arch/powerpc/include/asm/suspend.h 2007-08-28 23:26:16.629658848 +0200
-@@ -6,4 +6,7 @@
- void save_processor_state(void);
- void restore_processor_state(void);
-
-+#define suspend2_faulted (0)
-+#define clear_suspend2_fault() do { } while(0)
-+
- #endif /* __ASM_POWERPC_SUSPEND_H */
---- linux-2.6.26/arch/powerpc/kernel/swsusp.c 2008-09-29 00:01:56.000000000 +0200
-+++ linux-2.6.26/arch/powerpc/kernel/swsusp.c 2008-09-29 00:01:42.000000000 +0200
-@@ -9,6 +9,7 @@
- * 2 of the License, or (at your option) any later version.
- */
-
-+#include <linux/module.h>
- #include <linux/sched.h>
- #include <asm/suspend.h>
- #include <asm/system.h>
-@@ -30,6 +31,7 @@
- #endif
-
- }
-+EXPORT_SYMBOL(save_processor_state);
-
- void restore_processor_state(void)
- {
-
---- linux-2.6.32/drivers/infiniband/Kconfig~ 2009-12-05 00:26:03.663774916 +0100
-+++ linux-2.6.32/drivers/infiniband/Kconfig 2009-12-05 00:26:05.914179759 +0100
-@@ -37,7 +37,6 @@
- config INFINIBAND_ADDR_TRANS
- bool
- depends on INET
-- depends on !(INFINIBAND = y && IPV6 = m)
- default y
-
- source "drivers/infiniband/hw/mthca/Kconfig"
--- linux-2.6.33/scripts/mod/modpost.c~ 2010-02-24 19:52:17.000000000 +0100
+++ linux-2.6.33/scripts/mod/modpost.c 2010-03-07 14:26:47.242168558 +0100
@@ -15,7 +15,8 @@
#include "../../include/linux/license.h"
/* Some toolchains use a `_' prefix for all user symbols. */
-From 799c10559d60f159ab2232203f222f18fa3c4a5f Mon Sep 17 00:00:00 2001
-From: Linus Torvalds <torvalds@linux-foundation.org>
-Date: Fri, 15 Oct 2010 11:09:28 -0700
-Subject: [PATCH] De-pessimize rds_page_copy_user
-Don't try to "optimize" rds_page_copy_user() by using kmap_atomic() and
-the unsafe atomic user mode accessor functions. It's actually slower
-than the straightforward code on any reasonable modern CPU.
+--- linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh~ 2011-07-22 04:17:23.000000000 +0200
++++ linux-3.0/scripts/kconfig/lxdialog/check-lxdialog.sh 2011-08-25 21:26:04.799150642 +0200
+@@ -9,6 +9,12 @@
+ $cc -print-file-name=lib${lib}.${ext} | grep -q /
+ if [ $? -eq 0 ]; then
+ echo "-l${lib}"
++ for libt in tinfow tinfo ; do
++ $cc -print-file-name=lib${libt}.${ext} | grep -q /
++ if [ $? -eq 0 ]; then
++ echo "-l${libt}"
++ fi
++ done
+ 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
-Back when the code was written (although probably not by the time it was
-actually merged, though), 32-bit x86 may have been the dominant
-architecture. And there kmap_atomic() can be a lot faster than kmap()
-(unless you have very good locality, in which case the virtual address
-caching by kmap() can overcome all the downsides).
+Jana Iyengar found an interesting issue on CUBIC :
-But these days, x86-64 may not be more populous, but it's getting there
-(and if you care about performance, it's definitely already there -
-you'd have upgraded your CPU's already in the last few years). And on
-x86-64, the non-kmap_atomic() version is faster, simply because the code
-is simpler and doesn't have the "re-try page fault" case.
+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.
-People with old hardware are not likely to care about RDS anyway, and
-the optimization for the 32-bit case is simply buggy, since it doesn't
-verify the user addresses properly.
+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.
-Reported-by: Dan Rosenberg <drosenberg@vsecurity.com>
-Acked-by: Andrew Morton <akpm@linux-foundation.org>
-Cc: stable@kernel.org
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+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/rds/page.c | 27 +++++++--------------------
- 1 files changed, 7 insertions(+), 20 deletions(-)
+ net/ipv4/tcp_cubic.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
-diff --git a/net/rds/page.c b/net/rds/page.c
-index 595a952..1dfbfea 100644
---- a/net/rds/page.c
-+++ b/net/rds/page.c
-@@ -57,30 +57,17 @@ int rds_page_copy_user(struct page *page, unsigned long offset,
- unsigned long ret;
- void *addr;
-
-- if (to_user)
-+ addr = kmap(page);
-+ if (to_user) {
- rds_stats_add(s_copy_to_user, bytes);
-- else
-+ ret = copy_to_user(ptr, addr + offset, bytes);
-+ } else {
- rds_stats_add(s_copy_from_user, bytes);
--
-- addr = kmap_atomic(page, KM_USER0);
-- if (to_user)
-- ret = __copy_to_user_inatomic(ptr, addr + offset, bytes);
-- else
-- ret = __copy_from_user_inatomic(addr + offset, ptr, bytes);
-- kunmap_atomic(addr, KM_USER0);
--
-- if (ret) {
-- addr = kmap(page);
-- if (to_user)
-- ret = copy_to_user(ptr, addr + offset, bytes);
-- else
-- ret = copy_from_user(addr + offset, ptr, bytes);
-- kunmap(page);
-- if (ret)
-- return -EFAULT;
-+ ret = copy_from_user(addr + offset, ptr, bytes);
- }
-+ kunmap(page);
-
-- return 0;
-+ return ret ? -EFAULT : 0;
+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;
}
- EXPORT_SYMBOL_GPL(rds_page_copy_user);
---
-1.7.3.1
-
++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",
projects / packages / kernel.git / blobdiff