From: Greg Kroah-Hartman Date: Wed, 27 Feb 2019 14:27:36 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.9.162~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=328e01ddd09139372ac764e92b6f8879a3b78ef9;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: mac80211-change-default-tx_sk_pacing_shift-to-7.patch --- diff --git a/queue-4.19/mac80211-change-default-tx_sk_pacing_shift-to-7.patch b/queue-4.19/mac80211-change-default-tx_sk_pacing_shift-to-7.patch new file mode 100644 index 00000000000..b539fd0a20b --- /dev/null +++ b/queue-4.19/mac80211-change-default-tx_sk_pacing_shift-to-7.patch @@ -0,0 +1,48 @@ +From 5c14a4d05f68415af9e41a4e667d1748d41d1baf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= +Date: Thu, 21 Feb 2019 18:29:36 +0100 +Subject: mac80211: Change default tx_sk_pacing_shift to 7 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Toke Høiland-Jørgensen + +commit 5c14a4d05f68415af9e41a4e667d1748d41d1baf upstream. + +When we did the original tests for the optimal value of sk_pacing_shift, we +came up with 6 ms of buffering as the default. Sadly, 6 is not a power of +two, so when picking the shift value I erred on the size of less buffering +and picked 4 ms instead of 8. This was probably wrong; those 2 ms of extra +buffering makes a larger difference than I thought. + +So, change the default pacing shift to 7, which corresponds to 8 ms of +buffering. The point of diminishing returns really kicks in after 8 ms, and +so having this as a default should cut down on the need for extensive +per-device testing and overrides needed in the drivers. + +Cc: stable@vger.kernel.org +Signed-off-by: Toke Høiland-Jørgensen +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman + + +--- + net/mac80211/tx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -3614,10 +3614,10 @@ void __ieee80211_subif_start_xmit(struct + /* We need a bit of data queued to build aggregates properly, so + * instruct the TCP stack to allow more than a single ms of data + * to be queued in the stack. The value is a bit-shift of 1 +- * second, so 8 is ~4ms of queued data. Only affects local TCP ++ * second, so 7 is ~8ms of queued data. Only affects local TCP + * sockets. + */ +- sk_pacing_shift_update(skb->sk, 8); ++ sk_pacing_shift_update(skb->sk, 7); + + fast_tx = rcu_dereference(sta->fast_tx); + diff --git a/queue-4.19/series b/queue-4.19/series index a37d2a56e16..2cf9d059e2e 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1,3 +1,4 @@ irq-matrix-split-out-the-cpu-selection-code-into-a-h.patch irq-matrix-spread-managed-interrupts-on-allocation.patch genirq-matrix-improve-target-cpu-selection-for-manag.patch +mac80211-change-default-tx_sk_pacing_shift-to-7.patch