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

Pull networking fixes from David Miller:
 "A decent batch of fixes here. I'd say about half are for problems that
  have existed for a while, and half are for new regressions added in
  the 4.20 merge window.

   1) Fix 10G SFP phy module detection in mvpp2, from Baruch Siach.

   2) Revert bogus emac driver change, from Benjamin Herrenschmidt.

   3) Handle BPF exported data structure with pointers when building
      32-bit userland, from Daniel Borkmann.

   4) Memory leak fix in act_police, from Davide Caratti.

   5) Check RX checksum offload in RX descriptors properly in aquantia
      driver, from Dmitry Bogdanov.

   6) SKB unlink fix in various spots, from Edward Cree.

   7) ndo_dflt_fdb_dump() only works with ethernet, enforce this, from
      Eric Dumazet.

   8) Fix FID leak in mlxsw driver, from Ido Schimmel.

   9) IOTLB locking fix in vhost, from Jean-Philippe Brucker.

  10) Fix SKB truesize accounting in ipv4/ipv6/netfilter frag memory
      limits otherwise namespace exit can hang. From Jiri Wiesner.

  11) Address block parsing length fixes in x25 from Martin Schiller.

  12) IRQ and ring accounting fixes in bnxt_en, from Michael Chan.

  13) For tun interfaces, only iface delete works with rtnl ops, enforce
      this by disallowing add. From Nicolas Dichtel.

  14) Use after free in liquidio, from Pan Bian.

  15) Fix SKB use after passing to netif_receive_skb(), from Prashant
      Bhole.

  16) Static key accounting and other fixes in XPS from Sabrina Dubroca.

  17) Partially initialized flow key passed to ip6_route_output(), from
      Shmulik Ladkani.

  18) Fix RTNL deadlock during reset in ibmvnic driver, from Thomas
      Falcon.

  19) Several small TCP fixes (off-by-one on window probe abort, NULL
      deref in tail loss probe, SNMP mis-estimations) from Yuchung
      Cheng"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (93 commits)
  net/sched: cls_flower: Reject duplicated rules also under skip_sw
  bnxt_en: Fix _bnxt_get_max_rings() for 57500 chips.
  bnxt_en: Fix NQ/CP rings accounting on the new 57500 chips.
  bnxt_en: Keep track of reserved IRQs.
  bnxt_en: Fix CNP CoS queue regression.
  net/mlx4_core: Correctly set PFC param if global pause is turned off.
  Revert "net/ibm/emac: wrong bit is used for STA control"
  neighbour: Avoid writing before skb->head in neigh_hh_output()
  ipv6: Check available headroom in ip6_xmit() even without options
  tcp: lack of available data can also cause TSO defer
  ipv6: sr: properly initialize flowi6 prior passing to ip6_route_output
  mlxsw: spectrum_switchdev: Fix VLAN device deletion via ioctl
  mlxsw: spectrum_router: Relax GRE decap matching check
  mlxsw: spectrum_switchdev: Avoid leaking FID's reference count
  mlxsw: spectrum_nve: Remove easily triggerable warnings
  ipv4: ipv6: netfilter: Adjust the frag mem limit when truesize changes
  sctp: frag_point sanity check
  tcp: fix NULL ref in tail loss probe
  tcp: Do not underestimate rwnd_limited
  net: use skb_list_del_init() to remove from RX sublists
  ...

1 files changed, 32 insertions, 13 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 3f510cad0b3e..d1676d8a6ed7 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1904,7 +1904,9 @@ static int tso_fragment(struct sock *sk, enum tcp_queue tcp_queue,
  * This algorithm is from John Heffner.
  */
 static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
-                                 bool *is_cwnd_limited, u32 max_segs)
+                                 bool *is_cwnd_limited,
+                                 bool *is_rwnd_limited,
+                                 u32 max_segs)
 {
         const struct inet_connection_sock *icsk = inet_csk(sk);
         u32 age, send_win, cong_win, limit, in_flight;
@@ -1912,9 +1914,6 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
         struct sk_buff *head;
         int win_divisor;
 
-        if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
-                goto send_now;
-
         if (icsk->icsk_ca_state >= TCP_CA_Recovery)
                 goto send_now;
 
@@ -1973,10 +1972,27 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
         if (age < (tp->srtt_us >> 4))
                 goto send_now;
 
-        /* Ok, it looks like it is advisable to defer. */
+        /* Ok, it looks like it is advisable to defer.
+         * Three cases are tracked :
+         * 1) We are cwnd-limited
+         * 2) We are rwnd-limited
+         * 3) We are application limited.
+         */
+        if (cong_win < send_win) {
+                if (cong_win <= skb->len) {
+                        *is_cwnd_limited = true;
+                        return true;
+                }
+        } else {
+                if (send_win <= skb->len) {
+                        *is_rwnd_limited = true;
+                        return true;
+                }
+        }
 
-        if (cong_win < send_win && cong_win <= skb->len)
-                *is_cwnd_limited = true;
+        /* If this packet won't get more data, do not wait. */
+        if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN)
+                goto send_now;
 
         return true;
 
@@ -2356,7 +2372,7 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
                 } else {
                         if (!push_one &&
                             tcp_tso_should_defer(sk, skb, &is_cwnd_limited,
-                                                 max_segs))
+                                                 &is_rwnd_limited, max_segs))
                                 break;
                 }
 
@@ -2494,15 +2510,18 @@ void tcp_send_loss_probe(struct sock *sk)
                 goto rearm_timer;
         }
         skb = skb_rb_last(&sk->tcp_rtx_queue);
+        if (unlikely(!skb)) {
+                WARN_ONCE(tp->packets_out,
+                          "invalid inflight: %u state %u cwnd %u mss %d\n",
+                          tp->packets_out, sk->sk_state, tp->snd_cwnd, mss);
+                inet_csk(sk)->icsk_pending = 0;
+                return;
+        }
 
         /* At most one outstanding TLP retransmission. */
         if (tp->tlp_high_seq)
                 goto rearm_timer;
 
-        /* Retransmit last segment. */
-        if (WARN_ON(!skb))
-                goto rearm_timer;
-
         if (skb_still_in_host_queue(sk, skb))
                 goto rearm_timer;
 
@@ -2920,7 +2939,7 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs)
                 TCP_SKB_CB(skb)->sacked |= TCPCB_EVER_RETRANS;
                 trace_tcp_retransmit_skb(sk, skb);
         } else if (err != -EBUSY) {
-                NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL);
+                NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL, segs);
         }
         return err;
 }