Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 41 insertions, 36 deletions

diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index c4c6e1969ed0..2ae8f54cb321 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -1523,9 +1523,17 @@ unsigned char *cipso_v4_optptr(const struct sk_buff *skb)
         int taglen;
 
         for (optlen = iph->ihl*4 - sizeof(struct iphdr); optlen > 0; ) {
-                if (optptr[0] == IPOPT_CIPSO)
+                switch (optptr[0]) {
+                case IPOPT_CIPSO:
                         return optptr;
-                taglen = optptr[1];
+                case IPOPT_END:
+                        return NULL;
+                case IPOPT_NOOP:
+                        taglen = 1;
+                        break;
+                default:
+                        taglen = optptr[1];
+                }
                 optlen -= taglen;
                 optptr += taglen;
         }
diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 8e0257d01200..1540db65241a 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -450,6 +450,7 @@ out_unlock:
 out:
         NAPI_GRO_CB(skb)->flush |= flush;
         skb_gro_remcsum_cleanup(skb, &grc);
+        skb->remcsum_offload = 0;
 
         return pp;
 }
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 842ed75ccb25..d73903fe8c83 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -106,6 +106,7 @@ int sysctl_tcp_invalid_ratelimit __read_mostly = HZ/2;
 #define FLAG_ORIG_SACK_ACKED    0x200 /* Never retransmitted data are (s)acked  */
 #define FLAG_SND_UNA_ADVANCED   0x400 /* Snd_una was changed (!= FLAG_DATA_ACKED) */
 #define FLAG_DSACKING_ACK       0x800 /* SACK blocks contained D-SACK info */
+#define FLAG_SET_XMIT_TIMER     0x1000 /* Set TLP or RTO timer */
 #define FLAG_SACK_RENEGING      0x2000 /* snd_una advanced to a sacked seq */
 #define FLAG_UPDATE_TS_RECENT   0x4000 /* tcp_replace_ts_recent() */
 #define FLAG_NO_CHALLENGE_ACK   0x8000 /* do not call tcp_send_challenge_ack()  */
@@ -2520,8 +2521,8 @@ static inline void tcp_end_cwnd_reduction(struct sock *sk)
                 return;
 
         /* Reset cwnd to ssthresh in CWR or Recovery (unless it's undone) */
-        if (inet_csk(sk)->icsk_ca_state == TCP_CA_CWR ||
-            (tp->undo_marker && tp->snd_ssthresh < TCP_INFINITE_SSTHRESH)) {
+        if (tp->snd_ssthresh < TCP_INFINITE_SSTHRESH &&
+            (inet_csk(sk)->icsk_ca_state == TCP_CA_CWR || tp->undo_marker)) {
                 tp->snd_cwnd = tp->snd_ssthresh;
                 tp->snd_cwnd_stamp = tcp_jiffies32;
         }
@@ -3004,10 +3005,7 @@ void tcp_rearm_rto(struct sock *sk)
                 /* Offset the time elapsed after installing regular RTO */
                 if (icsk->icsk_pending == ICSK_TIME_REO_TIMEOUT ||
                     icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) {
-                        struct sk_buff *skb = tcp_write_queue_head(sk);
-                        u64 rto_time_stamp = skb->skb_mstamp +
-                                             jiffies_to_usecs(rto);
-                        s64 delta_us = rto_time_stamp - tp->tcp_mstamp;
+                        s64 delta_us = tcp_rto_delta_us(sk);
                         /* delta_us may not be positive if the socket is locked
                          * when the retrans timer fires and is rescheduled.
                          */
@@ -3019,6 +3017,13 @@ void tcp_rearm_rto(struct sock *sk)
         }
 }
 
+/* Try to schedule a loss probe; if that doesn't work, then schedule an RTO. */
+static void tcp_set_xmit_timer(struct sock *sk)
+{
+        if (!tcp_schedule_loss_probe(sk))
+                tcp_rearm_rto(sk);
+}
+
 /* If we get here, the whole TSO packet has not been acked. */
 static u32 tcp_tso_acked(struct sock *sk, struct sk_buff *skb)
 {
@@ -3180,7 +3185,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,
                                         ca_rtt_us, sack->rate);
 
         if (flag & FLAG_ACKED) {
-                tcp_rearm_rto(sk);
+                flag |= FLAG_SET_XMIT_TIMER;  /* set TLP or RTO timer */
                 if (unlikely(icsk->icsk_mtup.probe_size &&
                              !after(tp->mtu_probe.probe_seq_end, tp->snd_una))) {
                         tcp_mtup_probe_success(sk);
@@ -3208,7 +3213,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,
                  * after when the head was last (re)transmitted. Otherwise the
                  * timeout may continue to extend in loss recovery.
                  */
-                tcp_rearm_rto(sk);
+                flag |= FLAG_SET_XMIT_TIMER;  /* set TLP or RTO timer */
         }
 
         if (icsk->icsk_ca_ops->pkts_acked) {
@@ -3575,9 +3580,6 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
         if (after(ack, tp->snd_nxt))
                 goto invalid_ack;
 
-        if (icsk->icsk_pending == ICSK_TIME_LOSS_PROBE)
-                tcp_rearm_rto(sk);
-
         if (after(ack, prior_snd_una)) {
                 flag |= FLAG_SND_UNA_ADVANCED;
                 icsk->icsk_retransmits = 0;
@@ -3626,18 +3628,20 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
         flag |= tcp_clean_rtx_queue(sk, prior_fackets, prior_snd_una, &acked,
                                     &sack_state);
 
+        if (tp->tlp_high_seq)
+                tcp_process_tlp_ack(sk, ack, flag);
+        /* If needed, reset TLP/RTO timer; RACK may later override this. */
+        if (flag & FLAG_SET_XMIT_TIMER)
+                tcp_set_xmit_timer(sk);
+
         if (tcp_ack_is_dubious(sk, flag)) {
                 is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP));
                 tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit);
         }
-        if (tp->tlp_high_seq)
-                tcp_process_tlp_ack(sk, ack, flag);
 
         if ((flag & FLAG_FORWARD_PROGRESS) || !(flag & FLAG_NOT_DUP))
                 sk_dst_confirm(sk);
 
-        if (icsk->icsk_pending == ICSK_TIME_RETRANS)
-                tcp_schedule_loss_probe(sk);
         delivered = tp->delivered - delivered;  /* freshly ACKed or SACKed */
         lost = tp->lost - lost;                 /* freshly marked lost */
         tcp_rate_gen(sk, delivered, lost, sack_state.rate);
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index d49bff51bdb7..3e0d19631534 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2375,23 +2375,14 @@ bool tcp_schedule_loss_probe(struct sock *sk)
 {
         struct inet_connection_sock *icsk = inet_csk(sk);
         struct tcp_sock *tp = tcp_sk(sk);
-        u32 timeout, tlp_time_stamp, rto_time_stamp;
+        u32 timeout, rto_delta_us;
 
-        /* No consecutive loss probes. */
-        if (WARN_ON(icsk->icsk_pending == ICSK_TIME_LOSS_PROBE)) {
-                tcp_rearm_rto(sk);
-                return false;
-        }
         /* Don't do any loss probe on a Fast Open connection before 3WHS
          * finishes.
          */
         if (tp->fastopen_rsk)
                 return false;
 
-        /* TLP is only scheduled when next timer event is RTO. */
-        if (icsk->icsk_pending != ICSK_TIME_RETRANS)
-                return false;
-
         /* Schedule a loss probe in 2*RTT for SACK capable connections
          * in Open state, that are either limited by cwnd or application.
          */
@@ -2418,14 +2409,10 @@ bool tcp_schedule_loss_probe(struct sock *sk)
                 timeout = TCP_TIMEOUT_INIT;
         }
 
-        /* If RTO is shorter, just schedule TLP in its place. */
-        tlp_time_stamp = tcp_jiffies32 + timeout;
-        rto_time_stamp = (u32)inet_csk(sk)->icsk_timeout;
-        if ((s32)(tlp_time_stamp - rto_time_stamp) > 0) {
-                s32 delta = rto_time_stamp - tcp_jiffies32;
-                if (delta > 0)
-                        timeout = delta;
-        }
+        /* If the RTO formula yields an earlier time, then use that time. */
+        rto_delta_us = tcp_rto_delta_us(sk);  /* How far in future is RTO? */
+        if (rto_delta_us > 0)
+                timeout = min_t(u32, timeout, usecs_to_jiffies(rto_delta_us));
 
         inet_csk_reset_xmit_timer(sk, ICSK_TIME_LOSS_PROBE, timeout,
                                   TCP_RTO_MAX);
@@ -3450,6 +3437,10 @@ int tcp_connect(struct sock *sk)
         int err;
 
         tcp_call_bpf(sk, BPF_SOCK_OPS_TCP_CONNECT_CB);
+
+        if (inet_csk(sk)->icsk_af_ops->rebuild_header(sk))
+                return -EHOSTUNREACH; /* Routing failure or similar. */
+
         tcp_connect_init(sk);
 
         if (unlikely(tp->repair)) {
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index f753f9d2fee3..655dd8d7f064 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -640,7 +640,8 @@ static void tcp_keepalive_timer (unsigned long data)
                 goto death;
         }
 
-        if (!sock_flag(sk, SOCK_KEEPOPEN) || sk->sk_state == TCP_CLOSE)
+        if (!sock_flag(sk, SOCK_KEEPOPEN) ||
+            ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_SYN_SENT)))
                 goto out;
 
         elapsed = keepalive_time_when(tp);