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

Pull networking fixes from David Miller:

 1) Fix leak of unqueued fragments in ipv6 nf_defrag, from Guillaume
    Nault.

 2) Don't access the DDM interface unless the transceiver implements it
    in bnx2x, from Mauro S. M. Rodrigues.

 3) Don't double fetch 'len' from userspace in sock_getsockopt(), from
    JingYi Hou.

 4) Sign extension overflow in lio_core, from Colin Ian King.

 5) Various netem bug fixes wrt. corrupted packets from Jakub Kicinski.

 6) Fix epollout hang in hvsock, from Sunil Muthuswamy.

 7) Fix regression in default fib6_type, from David Ahern.

 8) Handle memory limits in tcp_fragment more appropriately, from Eric
    Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (24 commits)
  tcp: refine memory limit test in tcp_fragment()
  inet: clear num_timeout reqsk_alloc()
  net: mvpp2: debugfs: Add pmap to fs dump
  ipv6: Default fib6_type to RTN_UNICAST when not set
  net: hns3: Fix inconsistent indenting
  net/af_iucv: always register net_device notifier
  net/af_iucv: build proper skbs for HiperTransport
  net/af_iucv: remove GFP_DMA restriction for HiperTransport
  net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()
  hvsock: fix epollout hang from race condition
  net/udp_gso: Allow TX timestamp with UDP GSO
  net: netem: fix use after free and double free with packet corruption
  net: netem: fix backlog accounting for corrupted GSO frames
  net: lio_core: fix potential sign-extension overflow on large shift
  tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb
  ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL
  ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL
  tun: wake up waitqueues after IFF_UP is set
  net: remove duplicate fetch in sock_getsockopt
  tipc: fix issues with early FAILOVER_MSG from peer
  ...

1 files changed, 8 insertions, 31 deletions

diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
index fb2df6e068fa..62dcdf082349 100644
--- a/net/vmw_vsock/hyperv_transport.c
+++ b/net/vmw_vsock/hyperv_transport.c
@@ -211,18 +211,6 @@ static void hvs_set_channel_pending_send_size(struct vmbus_channel *chan)
         set_channel_pending_send_size(chan,
                                       HVS_PKT_LEN(HVS_SEND_BUF_SIZE));
 
-        /* See hvs_stream_has_space(): we must make sure the host has seen
-         * the new pending send size, before we can re-check the writable
-         * bytes.
-         */
-        virt_mb();
-}
-
-static void hvs_clear_channel_pending_send_size(struct vmbus_channel *chan)
-{
-        set_channel_pending_send_size(chan, 0);
-
-        /* Ditto */
         virt_mb();
 }
 
@@ -292,9 +280,6 @@ static void hvs_channel_cb(void *ctx)
         if (hvs_channel_readable(chan))
                 sk->sk_data_ready(sk);
 
-        /* See hvs_stream_has_space(): when we reach here, the writable bytes
-         * may be already less than HVS_PKT_LEN(HVS_SEND_BUF_SIZE).
-         */
         if (hv_get_bytes_to_write(&chan->outbound) > 0)
                 sk->sk_write_space(sk);
 }
@@ -395,6 +380,13 @@ static void hvs_open_connection(struct vmbus_channel *chan)
         set_per_channel_state(chan, conn_from_host ? new : sk);
         vmbus_set_chn_rescind_callback(chan, hvs_close_connection);
 
+        /* Set the pending send size to max packet size to always get
+         * notifications from the host when there is enough writable space.
+         * The host is optimized to send notifications only when the pending
+         * size boundary is crossed, and not always.
+         */
+        hvs_set_channel_pending_send_size(chan);
+
         if (conn_from_host) {
                 new->sk_state = TCP_ESTABLISHED;
                 sk->sk_ack_backlog++;
@@ -688,23 +680,8 @@ static s64 hvs_stream_has_data(struct vsock_sock *vsk)
 static s64 hvs_stream_has_space(struct vsock_sock *vsk)
 {
         struct hvsock *hvs = vsk->trans;
-        struct vmbus_channel *chan = hvs->chan;
-        s64 ret;
-
-        ret = hvs_channel_writable_bytes(chan);
-        if (ret > 0)  {
-                hvs_clear_channel_pending_send_size(chan);
-        } else {
-                /* See hvs_channel_cb() */
-                hvs_set_channel_pending_send_size(chan);
-
-                /* Re-check the writable bytes to avoid race */
-                ret = hvs_channel_writable_bytes(chan);
-                if (ret > 0)
-                        hvs_clear_channel_pending_send_size(chan);
-        }
 
-        return ret;
+        return hvs_channel_writable_bytes(hvs->chan);
 }
 
 static u64 hvs_stream_rcvhiwat(struct vsock_sock *vsk)