vsock: add vsock_create_connected() called by transports

All transports call __vsock_create() with the same parameters,
most of them depending on the parent socket. In order to simplify
the VSOCK core APIs exposed to the transports, this patch adds
the vsock_create_connected() callable from transports to create
a new socket when a connection request is received.
We also unexported the __vsock_create().

Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
index 4b5d16840fd4d930775e09760a66bb9f3d901c3b..fa1570dc9f5c70adaf7ab5942d98c70af1e1b2af 100644 (file)
--- a/include/net/af_vsock.h
+++ b/include/net/af_vsock.h
@@ -76,10 +76,7 @@ struct vsock_sock {
 
 s64 vsock_stream_has_data(struct vsock_sock *vsk);
 s64 vsock_stream_has_space(struct vsock_sock *vsk);
-struct sock *__vsock_create(struct net *net,
-                           struct socket *sock,
-                           struct sock *parent,
-                           gfp_t priority, unsigned short type, int kern);
+struct sock *vsock_create_connected(struct sock *parent);
 
 /**** TRANSPORT ****/
 

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 11b88094e3b2890e0150a31a7ad9b5b24a1195e8..7c11ac1bc5427019cf632020cf5ac98dd31bb66d 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -567,12 +567,12 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr)
 
 static void vsock_connect_timeout(struct work_struct *work);
 
-struct sock *__vsock_create(struct net *net,
-                           struct socket *sock,
-                           struct sock *parent,
-                           gfp_t priority,
-                           unsigned short type,
-                           int kern)
+static struct sock *__vsock_create(struct net *net,
+                                  struct socket *sock,
+                                  struct sock *parent,
+                                  gfp_t priority,
+                                  unsigned short type,
+                                  int kern)
 {
        struct sock *sk;
        struct vsock_sock *psk;
@@ -639,7 +639,6 @@ struct sock *__vsock_create(struct net *net,
 
        return sk;
 }
-EXPORT_SYMBOL_GPL(__vsock_create);
 
 static void __vsock_release(struct sock *sk, int level)
 {
@@ -703,6 +702,13 @@ static int vsock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
        return err;
 }
 
+struct sock *vsock_create_connected(struct sock *parent)
+{
+       return __vsock_create(sock_net(parent), NULL, parent, GFP_KERNEL,
+                             parent->sk_type, 0);
+}
+EXPORT_SYMBOL_GPL(vsock_create_connected);
+
 s64 vsock_stream_has_data(struct vsock_sock *vsk)
 {
        return vsk->transport->stream_has_data(vsk);

diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
index ab947561543ef3ac32908960dadc61ab746af749..7d0a972a14280a305c4e5d3878a7119b3c008ebc 100644 (file)
--- a/net/vmw_vsock/hyperv_transport.c
+++ b/net/vmw_vsock/hyperv_transport.c
@@ -360,8 +360,7 @@ static void hvs_open_connection(struct vmbus_channel *chan)
                if (sk->sk_ack_backlog >= sk->sk_max_ack_backlog)
                        goto out;
 
-               new = __vsock_create(sock_net(sk), NULL, sk, GFP_KERNEL,
-                                    sk->sk_type, 0);
+               new = vsock_create_connected(sk);
                if (!new)
                        goto out;
 

diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index d4a0bf19aa988a6952933e39880ac56c782bcdd5..b7b1a98e478e18118e1ae6a5b6a5bd7c8d80a343 100644 (file)
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -1004,8 +1004,7 @@ virtio_transport_recv_listen(struct sock *sk, struct virtio_vsock_pkt *pkt)
                return -ENOMEM;
        }
 
-       child = __vsock_create(sock_net(sk), NULL, sk, GFP_KERNEL,
-                              sk->sk_type, 0);
+       child = vsock_create_connected(sk);
        if (!child) {
                virtio_transport_reset(vsk, pkt);
                return -ENOMEM;

diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index 608bb6bd79aa5d4d06b9658de80ac632354645ce..b6c8c9cc8d7201ce705b39a0bef516cffe8e4536 100644 (file)
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1004,8 +1004,7 @@ static int vmci_transport_recv_listen(struct sock *sk,
                return -ECONNREFUSED;
        }
 
-       pending = __vsock_create(sock_net(sk), NULL, sk, GFP_KERNEL,
-                                sk->sk_type, 0);
+       pending = vsock_create_connected(sk);
        if (!pending) {
                vmci_transport_send_reset(sk, pkt);
                return -ENOMEM;