mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
9e1530b2a3
* Refreshed patches. * Removed patches: - target/linux/ar71xx/patches-4.9/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch superseded by upstream - target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch superseded by upstream - target/linux/brcm63xx/patches-4.9/001-4.11-01-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch accepted upstream - target/linux/brcm63xx/patches-4.9/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch accepted upstream - target/linux/brcm63xx/patches-4.9/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch accepted upstream - target/linux/generic/pending-4.9/900-gen_stats-fix-netlink-stats-padding.patch * New backported patch to address ext4 breakage, introduced in 4.9.112: - backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch Also add ARM64_SSBD symbol to ARM64 targets still running kernel 4.9 Thanks to Koen Vandeputte for pointing out the need to add the ARM64_SSBD symbol, and the ext4 patch. Compile-tested on: ar71xx Run-tested on: ar71xx Signed-off-by: Stijn Segers <foss@volatilesystems.org>
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From 12a59abc22d6664f7d3944f625ceefee92de8820 Mon Sep 17 00:00:00 2001
|
|
From: Eric Dumazet <edumazet@google.com>
|
|
Date: Sat, 3 Dec 2016 11:14:55 -0800
|
|
Subject: [PATCH 06/10] tcp: tcp_mtu_probe() is likely to exit early
|
|
|
|
Adding a likely() in tcp_mtu_probe() moves its code which used to
|
|
be inlined in front of tcp_write_xmit()
|
|
|
|
We still have a cache line miss to access icsk->icsk_mtup.enabled,
|
|
we will probably have to reorganize fields to help data locality.
|
|
|
|
Signed-off-by: Eric Dumazet <edumazet@google.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
net/ipv4/tcp_output.c | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/net/ipv4/tcp_output.c
|
|
+++ b/net/ipv4/tcp_output.c
|
|
@@ -1960,26 +1960,26 @@ static bool tcp_can_coalesce_send_queue_
|
|
*/
|
|
static int tcp_mtu_probe(struct sock *sk)
|
|
{
|
|
- struct tcp_sock *tp = tcp_sk(sk);
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
+ struct tcp_sock *tp = tcp_sk(sk);
|
|
struct sk_buff *skb, *nskb, *next;
|
|
struct net *net = sock_net(sk);
|
|
- int len;
|
|
int probe_size;
|
|
int size_needed;
|
|
- int copy;
|
|
+ int copy, len;
|
|
int mss_now;
|
|
int interval;
|
|
|
|
/* Not currently probing/verifying,
|
|
* not in recovery,
|
|
* have enough cwnd, and
|
|
- * not SACKing (the variable headers throw things off) */
|
|
- if (!icsk->icsk_mtup.enabled ||
|
|
- icsk->icsk_mtup.probe_size ||
|
|
- inet_csk(sk)->icsk_ca_state != TCP_CA_Open ||
|
|
- tp->snd_cwnd < 11 ||
|
|
- tp->rx_opt.num_sacks || tp->rx_opt.dsack)
|
|
+ * not SACKing (the variable headers throw things off)
|
|
+ */
|
|
+ if (likely(!icsk->icsk_mtup.enabled ||
|
|
+ icsk->icsk_mtup.probe_size ||
|
|
+ inet_csk(sk)->icsk_ca_state != TCP_CA_Open ||
|
|
+ tp->snd_cwnd < 11 ||
|
|
+ tp->rx_opt.num_sacks || tp->rx_opt.dsack))
|
|
return -1;
|
|
|
|
/* Use binary search for probe_size between tcp_mss_base,
|