9ce7aa325e
* Refreshed patches. * Patches made redundant by changes upstream: - target/linux/ramips/patches-4.14/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch * Patches accepted upstream: - target/linux/apm821xx/patches-4.14/020-0001-crypto-crypto4xx-remove-bad-list_del.patch - target/linux/apm821xx/patches-4.14/020-0011-crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_b.patch - target/linux/brcm63xx/patches-4.14/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - target/linux/brcm63xx/patches-4.14/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - target/linux/generic/backport-4.14/080-net-convert-sock.sk_wmem_alloc-from-atomic_t-to-refc.patch - target/linux/generic/pending-4.14/900-gen_stats-fix-netlink-stats-padding.patch The ext4 regression introduced in 4.14.55 has been fixed by 4.14.60 (commit f547aa20b4f61662ad3e1a2040bb3cc5778f19b0). Fixes the following CVEs: - CVE-2018-10876 - CVE-2018-10877 - CVE-2018-10879 - CVE-2018-10880 - CVE-2018-10881 - CVE-2018-10882 - CVE-2018-10883 Thanks to Stijn Tintel for the CVE list :-). Compile-tested on: ramips/mt7621, x86/64 Run-tested on: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
86 lines
2.9 KiB
Diff
86 lines
2.9 KiB
Diff
From: Eric Dumazet <edumazet@google.com>
|
||
Date: Sat, 11 Nov 2017 15:54:12 -0800
|
||
Subject: [PATCH] tcp: allow drivers to tweak TSQ logic
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
I had many reports that TSQ logic breaks wifi aggregation.
|
||
|
||
Current logic is to allow up to 1 ms of bytes to be queued into qdisc
|
||
and drivers queues.
|
||
|
||
But Wifi aggregation needs a bigger budget to allow bigger rates to
|
||
be discovered by various TCP Congestion Controls algorithms.
|
||
|
||
This patch adds an extra socket field, allowing wifi drivers to select
|
||
another log scale to derive TCP Small Queue credit from current pacing
|
||
rate.
|
||
|
||
Initial value is 10, meaning that this patch does not change current
|
||
behavior.
|
||
|
||
We expect wifi drivers to set this field to smaller values (tests have
|
||
been done with values from 6 to 9)
|
||
|
||
They would have to use following template :
|
||
|
||
if (skb->sk && skb->sk->sk_pacing_shift != MY_PACING_SHIFT)
|
||
skb->sk->sk_pacing_shift = MY_PACING_SHIFT;
|
||
|
||
Ref: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1670041
|
||
Signed-off-by: Eric Dumazet <edumazet@google.com>
|
||
Cc: Johannes Berg <johannes.berg@intel.com>
|
||
Cc: Toke Høiland-Jørgensen <toke@toke.dk>
|
||
Cc: Kir Kolyshkin <kir@openvz.org>
|
||
---
|
||
--- a/include/net/sock.h
|
||
+++ b/include/net/sock.h
|
||
@@ -267,6 +267,7 @@ struct sock_common {
|
||
* @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)
|
||
* @sk_gso_max_size: Maximum GSO segment size to build
|
||
* @sk_gso_max_segs: Maximum number of GSO segments
|
||
+ * @sk_pacing_shift: scaling factor for TCP Small Queues
|
||
* @sk_lingertime: %SO_LINGER l_linger setting
|
||
* @sk_backlog: always used with the per-socket spinlock held
|
||
* @sk_callback_lock: used with the callbacks in the end of this struct
|
||
@@ -445,6 +446,8 @@ struct sock {
|
||
sk_type : 16;
|
||
#define SK_PROTOCOL_MAX U8_MAX
|
||
u16 sk_gso_max_segs;
|
||
+#define sk_pacing_shift sk_pacing_shift /* for backport checks */
|
||
+ u8 sk_pacing_shift;
|
||
unsigned long sk_lingertime;
|
||
struct proto *sk_prot_creator;
|
||
rwlock_t sk_callback_lock;
|
||
--- a/net/core/sock.c
|
||
+++ b/net/core/sock.c
|
||
@@ -2739,6 +2739,7 @@ void sock_init_data(struct socket *sock,
|
||
|
||
sk->sk_max_pacing_rate = ~0U;
|
||
sk->sk_pacing_rate = ~0U;
|
||
+ sk->sk_pacing_shift = 10;
|
||
sk->sk_incoming_cpu = -1;
|
||
/*
|
||
* Before updating sk_refcnt, we must commit prior changes to memory
|
||
--- a/net/ipv4/tcp_output.c
|
||
+++ b/net/ipv4/tcp_output.c
|
||
@@ -1683,7 +1683,7 @@ u32 tcp_tso_autosize(const struct sock *
|
||
{
|
||
u32 bytes, segs;
|
||
|
||
- bytes = min(sk->sk_pacing_rate >> 10,
|
||
+ bytes = min(sk->sk_pacing_rate >> sk->sk_pacing_shift,
|
||
sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
|
||
|
||
/* Goal is to send at least one packet per ms,
|
||
@@ -2184,7 +2184,7 @@ static bool tcp_small_queue_check(struct
|
||
{
|
||
unsigned int limit;
|
||
|
||
- limit = max(2 * skb->truesize, sk->sk_pacing_rate >> 10);
|
||
+ limit = max(2 * skb->truesize, sk->sk_pacing_rate >> sk->sk_pacing_shift);
|
||
limit = min_t(u32, limit, sysctl_tcp_limit_output_bytes);
|
||
limit <<= factor;
|
||
|