From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 291971B31B for ; Fri, 19 Jan 2018 14:45:44 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8472F8F87F; Fri, 19 Jan 2018 13:45:43 +0000 (UTC) Received: from localhost (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 129537FD56; Fri, 19 Jan 2018 13:45:33 +0000 (UTC) From: Stefan Hajnoczi To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, Yuanhan Liu , wei.w.wang@intel.com, mst@redhat.com, zhiyong.yang@intel.com, jasowang@redhat.com, Stefan Hajnoczi Date: Fri, 19 Jan 2018 13:44:25 +0000 Message-Id: <20180119134444.24927-6-stefanha@redhat.com> In-Reply-To: <20180119134444.24927-1-stefanha@redhat.com> References: <20180119134444.24927-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 19 Jan 2018 13:45:43 +0000 (UTC) Subject: [dpdk-dev] [RFC 05/24] vhost: move start_server/client() calls to trans_af_unix.c X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jan 2018 13:45:44 -0000 Introduce a vhost_transport_ops->socket_start() interface so the transport can begin establishing vhost-user connections. This is part of the AF_UNIX transport refactoring and removes AF_UNIX code from vhost.h and socket.c. Signed-off-by: Stefan Hajnoczi --- lib/librte_vhost/vhost.h | 16 +++++++++++++--- lib/librte_vhost/socket.c | 5 +---- lib/librte_vhost/trans_af_unix.c | 16 ++++++++++++++-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 3aefe6597..7cbef04ab 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -236,6 +236,19 @@ struct vhost_transport_ops { */ void (*socket_cleanup)(struct vhost_user_socket *vsocket); + /** + * Start establishing vhost-user connections. This function is + * asynchronous and connections may be established after it has + * returned. Call vhost_user_add_connection() to register new + * connections. + * + * @param vsocket + * vhost socket + * @return + * 0 on success, -1 on failure + */ + int (*socket_start)(struct vhost_user_socket *vsocket); + /** * Notify the guest that used descriptors have been added to the vring. * The VRING_AVAIL_F_NO_INTERRUPT flag has already been checked so this @@ -346,9 +359,6 @@ struct vhost_user { extern struct vhost_user vhost_user; -int vhost_user_start_server(struct vhost_user_socket *vsocket); -int vhost_user_start_client(struct vhost_user_socket *vsocket); - extern pthread_t reconn_tid; int vhost_user_reconnect_init(void); diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 78f847ccc..f8a96ab5f 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -318,8 +318,5 @@ rte_vhost_driver_start(const char *path) "failed to create fdset handling thread"); } - if (vsocket->is_server) - return vhost_user_start_server(vsocket); - else - return vhost_user_start_client(vsocket); + return vsocket->trans_ops->socket_start(vsocket); } diff --git a/lib/librte_vhost/trans_af_unix.c b/lib/librte_vhost/trans_af_unix.c index cc8d7ccdc..6c22093a4 100644 --- a/lib/librte_vhost/trans_af_unix.c +++ b/lib/librte_vhost/trans_af_unix.c @@ -51,6 +51,8 @@ struct af_unix_socket { }; static int create_unix_socket(struct vhost_user_socket *vsocket); +static int vhost_user_start_server(struct vhost_user_socket *vsocket); +static int vhost_user_start_client(struct vhost_user_socket *vsocket); static void vhost_user_read_cb(int connfd, void *dat, int *remove); /* return bytes# of read on success or negative val on failure. */ @@ -276,7 +278,7 @@ create_unix_socket(struct vhost_user_socket *vsocket) return 0; } -int +static int vhost_user_start_server(struct vhost_user_socket *vsocket) { struct af_unix_socket *s = @@ -433,7 +435,7 @@ vhost_user_reconnect_init(void) return ret; } -int +static int vhost_user_start_client(struct vhost_user_socket *vsocket) { struct af_unix_socket *s = @@ -523,6 +525,15 @@ af_unix_socket_cleanup(struct vhost_user_socket *vsocket) } } +static int +af_unix_socket_start(struct vhost_user_socket *vsocket) +{ + if (vsocket->is_server) + return vhost_user_start_server(vsocket); + else + return vhost_user_start_client(vsocket); +} + static int af_unix_vring_call(struct virtio_net *dev __rte_unused, struct vhost_virtqueue *vq) @@ -536,5 +547,6 @@ const struct vhost_transport_ops af_unix_trans_ops = { .socket_size = sizeof(struct af_unix_socket), .socket_init = af_unix_socket_init, .socket_cleanup = af_unix_socket_cleanup, + .socket_start = af_unix_socket_start, .vring_call = af_unix_vring_call, }; -- 2.14.3