VSOCK: call sk->sk_data_ready() on accept()
authorStefan Hajnoczi <stefanha@redhat.com>
Wed, 4 Nov 2015 12:58:42 +0000 (12:58 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Nov 2015 03:03:10 +0000 (22:03 -0500)
When a listen socket enqueues a connection for userspace to accept(),
the sk->sk_data_ready() callback should be invoked.  In-kernel socket
users rely on this callback to detect when incoming connections are
available.

Currently the sk->sk_state_change() callback is invoked by
vmci_transport.c.  This happens to work for userspace applications since
sk->sk_state_change = sock_def_wakeup() and sk->sk_data_ready =
sock_def_readable() both wake up the accept() waiter.  In-kernel socket
users, on the other hand, fail to detect incoming connections.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/vmw_vsock/vmci_transport.c

index 400d87294de3f72ca343814525fcec67564d0b47..0a369bb440e77e03262ae48a7e3519db35c87835 100644 (file)
@@ -1234,7 +1234,7 @@ vmci_transport_recv_connecting_server(struct sock *listener,
        /* Callers of accept() will be be waiting on the listening socket, not
         * the pending socket.
         */
-       listener->sk_state_change(listener);
+       listener->sk_data_ready(listener);
 
        return 0;