From patchwork Wed Jun 19 15:14:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikos Dragazis X-Patchwork-Id: 54959 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 922201C3A9; Wed, 19 Jun 2019 17:15:50 +0200 (CEST) Received: from mx0.arrikto.com (mx0.arrikto.com [212.71.252.59]) by dpdk.org (Postfix) with ESMTP id 3FB581C386 for ; Wed, 19 Jun 2019 17:15:38 +0200 (CEST) Received: from troi.prod.arr (mail.arr [10.99.0.5]) by mx0.arrikto.com (Postfix) with ESMTP id 0D37B182009; Wed, 19 Jun 2019 18:15:38 +0300 (EEST) Received: from localhost.localdomain (unknown [10.89.50.133]) by troi.prod.arr (Postfix) with ESMTPSA id 8A62C2B2; Wed, 19 Jun 2019 18:15:37 +0300 (EEST) From: Nikos Dragazis To: dev@dpdk.org Cc: Maxime Coquelin , Tiwei Bie , Zhihong Wang , Stefan Hajnoczi , Wei Wang , Stojaczyk Dariusz , Vangelis Koukis Date: Wed, 19 Jun 2019 18:14:30 +0300 Message-Id: <1560957293-17294-6-git-send-email-ndragazis@arrikto.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560957293-17294-1-git-send-email-ndragazis@arrikto.com> References: <1560957293-17294-1-git-send-email-ndragazis@arrikto.com> Subject: [dpdk-dev] [PATCH 05/28] vhost: move start server/client calls 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stefan Hajnoczi 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/socket.c | 5 +---- lib/librte_vhost/trans_af_unix.c | 16 ++++++++++++++-- lib/librte_vhost/vhost.h | 16 +++++++++++++--- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 3b5608c..df6d707 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -564,8 +564,5 @@ rte_vhost_driver_start(const char *path) } } - 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 f23bb9c..93d11f7 100644 --- a/lib/librte_vhost/trans_af_unix.c +++ b/lib/librte_vhost/trans_af_unix.c @@ -22,6 +22,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); /* @@ -280,7 +282,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 *af_vsocket = @@ -438,7 +440,7 @@ vhost_user_reconnect_init(void) return ret; } -int +static int vhost_user_start_client(struct vhost_user_socket *vsocket) { struct af_unix_socket *af_vsocket = @@ -529,6 +531,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) { @@ -541,5 +552,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, }; diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 40b5c25..c74753b 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -324,6 +324,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 and event idx have already been checked * so this function just needs to perform the notification. @@ -458,9 +471,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);