From patchwork Wed Apr 17 08:41:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?0KPRiNC60L7QsiDQlNCw0L3QuNC40Ls=?= X-Patchwork-Id: 139447 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A4CD743E91; Wed, 17 Apr 2024 10:41:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3ED82402AE; Wed, 17 Apr 2024 10:41:02 +0200 (CEST) Received: from mx4.mts.ru (mx4.mts.ru [213.87.44.6]) by mails.dpdk.org (Postfix) with ESMTP id EA8AF4029E for ; Wed, 17 Apr 2024 10:41:00 +0200 (CEST) Received: from mx-d3.msk.mts.ru (unknown [10.73.8.92]) by mx4.mts.ru (Postfix) with ESMTP id 95C90150B6; Wed, 17 Apr 2024 11:41:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx4.mts.ru 95C90150B6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mts.ru; s=mail; t=1713343260; bh=dPFArNqjARBOquaxiw9dNHowe8vmhwZsLC0ZsQvUB4Y=; h=From:To:CC:Subject:Date:From; b=o20mwKqAsOwa9NqOr77kosc8QHEjGpDTTOlqI24dtr38ykouBlcEztrqK+xmqxvvf i/4xKcHfBf5sYjaVsgDa4dbXwgVDg7E/kIjosnl6rGROh0GTVOCH1yAPkBkzkBUdqZ W5DNTOcWFgKHE9SMh3pEw7dtOv0L9rC/DVc/oDEo= Received: from 0001EX19MBX12.msk.mts.ru (0001EX19MBX12.msk.mts.ru [10.73.8.12]) by mx-d3.msk.mts.ru (Postfix) with ESMTP id 4VKDrr43wKzHK; Wed, 17 Apr 2024 11:41:00 +0300 (MSK) Received: from 0001EX19MBX15.msk.mts.ru (10.73.16.232) by 0001EX19MBX12.msk.mts.ru (10.73.8.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.25; Wed, 17 Apr 2024 11:41:00 +0300 Received: from 0001EX19MBX15.msk.mts.ru ([10.73.16.232]) by 0001EX19MBX15.msk.mts.ru ([10.73.16.232]) with mapi id 15.02.1258.025; Wed, 17 Apr 2024 11:41:00 +0300 From: =?koi8-r?b?9dvLz9cg5MHOycnM?= To: "dev@dpdk.org" CC: =?koi8-r?b?9dvLz9cg5MHOycnM?= , Maxime Coquelin , Chenbo Xia Subject: [PATCH] lib/vhost: add flag for async connection in client mode Thread-Topic: [PATCH] lib/vhost: add flag for async connection in client mode Thread-Index: AQHakKL5sdq+ztNlzEa7THXkpTenIg== Date: Wed, 17 Apr 2024 08:41:00 +0000 Message-ID: <20240417083835.164456-1-udav@mts.ru> Accept-Language: ru-RU, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.34.1 x-originating-ip: [10.75.216.12] MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch introduces a new flag RTE_VHOST_USER_ASYNC_CONNECT, which in combination with the flag RTE_VHOST_USER_CLIENT makes rte_vhost_driver_start connect asynchronously to the vhost server. Signed-off-by: Daniil Ushkov --- lib/vhost/rte_vhost.h | 1 + lib/vhost/socket.c | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h index db92f05344..b0434c4b8d 100644 --- a/lib/vhost/rte_vhost.h +++ b/lib/vhost/rte_vhost.h @@ -41,6 +41,7 @@ extern "C" { #define RTE_VHOST_USER_ASYNC_COPY (1ULL << 7) #define RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS (1ULL << 8) #define RTE_VHOST_USER_NET_STATS_ENABLE (1ULL << 9) +#define RTE_VHOST_USER_ASYNC_CONNECT (1ULL << 10) /* Features. */ #ifndef VIRTIO_NET_F_GUEST_ANNOUNCE diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index 96b3ab5595..38c400f173 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -45,6 +45,7 @@ struct vhost_user_socket { bool async_copy; bool net_compliant_ol_flags; bool stats_enabled; + bool async_connect; /* * The "supported_features" indicates the feature bits the @@ -533,21 +534,23 @@ vhost_user_start_client(struct vhost_user_socket *vsocket) const char *path = vsocket->path; struct vhost_user_reconnect *reconn; - ret = vhost_user_connect_nonblock(vsocket->path, fd, (struct sockaddr *)&vsocket->un, - sizeof(vsocket->un)); - if (ret == 0) { - vhost_user_add_connection(fd, vsocket); - return 0; - } + if (!vsocket->async_connect || !vsocket->reconnect) { + ret = vhost_user_connect_nonblock(vsocket->path, fd, (struct sockaddr *)&vsocket->un, + sizeof(vsocket->un)); + if (ret == 0) { + vhost_user_add_connection(fd, vsocket); + return 0; + } - VHOST_CONFIG_LOG(path, WARNING, "failed to connect: %s", strerror(errno)); + VHOST_CONFIG_LOG(path, WARNING, "failed to connect: %s", strerror(errno)); - if (ret == -2 || !vsocket->reconnect) { - close(fd); - return -1; - } + if (ret == -2 || !vsocket->reconnect) { + close(fd); + return -1; + } - VHOST_CONFIG_LOG(path, INFO, "reconnecting..."); + VHOST_CONFIG_LOG(path, INFO, "reconnecting..."); + } reconn = malloc(sizeof(*reconn)); if (reconn == NULL) { VHOST_CONFIG_LOG(path, ERR, "failed to allocate memory for reconnect"); @@ -930,6 +933,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->async_copy = flags & RTE_VHOST_USER_ASYNC_COPY; vsocket->net_compliant_ol_flags = flags & RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS; vsocket->stats_enabled = flags & RTE_VHOST_USER_NET_STATS_ENABLE; + vsocket->async_connect = flags & RTE_VHOST_USER_ASYNC_CONNECT; if (vsocket->is_vduse) vsocket->iommu_support = true; else