From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9CA23A0A02; Fri, 15 Jan 2021 12:14:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EB1D1140FD1; Fri, 15 Jan 2021 12:13:59 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 89B22140FBB for ; Fri, 15 Jan 2021 12:13:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610709238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O/N7c8aQG4gZ2hy+xiZHFoPazXbK9tSMgsNaimH/E1g=; b=LYHpCqONUuOFpT7VrdHEGxj/LnDaKu65LNpXnRRJUPLyaqYUyZRrS4wtVl920zYOLyNCTp ocrNhISqfjFy2i0dDYcREvz4zkn0GL6AkulbxjC6ngyJgFId7tno6U72sQIa3aPlOJ9fhE yudtpZ9rmunpe+pCVBtabDdyWfVg8pc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-S_skM66uPTitKgVnUs9vrA-1; Fri, 15 Jan 2021 06:13:56 -0500 X-MC-Unique: S_skM66uPTitKgVnUs9vrA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 160DF190B2A2; Fri, 15 Jan 2021 11:13:55 +0000 (UTC) Received: from [10.36.110.24] (unknown [10.36.110.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F3AC722C0; Fri, 15 Jan 2021 11:13:50 +0000 (UTC) To: "Xia, Chenbo" , "dev@dpdk.org" , "olivier.matz@6wind.com" , "amorenoz@redhat.com" , "david.marchand@redhat.com" References: <20201220211405.313012-1-maxime.coquelin@redhat.com> <20201220211405.313012-36-maxime.coquelin@redhat.com> From: Maxime Coquelin Message-ID: Date: Fri, 15 Jan 2021 12:13:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH 35/40] net/virtio: make server mode blocking 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 Sender: "dev" On 1/7/21 4:20 AM, Xia, Chenbo wrote: > Hi Maxime, > >> -----Original Message----- >> From: Maxime Coquelin >> Sent: Monday, December 21, 2020 5:14 AM >> To: dev@dpdk.org; Xia, Chenbo ; olivier.matz@6wind.com; >> amorenoz@redhat.com; david.marchand@redhat.com >> Cc: Maxime Coquelin >> Subject: [PATCH 35/40] net/virtio: make server mode blocking >> >> This patch makes the Vhost-user backend server mode >> blocking at init, waiting for the client connection. >> >> The goal is to make the driver more reliable, as without >> waiting for client connection, the Virtio driver has to >> assume the Vhost-user backend will support all the >> features it has advertized, which could lead to undefined >> behaviour. >> >> For example, without this patch, if the user enables packed >> ring Virtio feature but the backend does not support it, >> the ring initialized by the driver will not be compatible >> with the backend. >> >> Signed-off-by: Maxime Coquelin >> --- >> drivers/net/virtio/virtio_user/vhost_user.c | 9 +- >> .../net/virtio/virtio_user/virtio_user_dev.c | 118 +++++++----------- >> drivers/net/virtio/virtio_user_ethdev.c | 5 - >> 3 files changed, 54 insertions(+), 78 deletions(-) >> >> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c >> b/drivers/net/virtio/virtio_user/vhost_user.c >> index a57106a468..94a33326ae 100644 >> --- a/drivers/net/virtio/virtio_user/vhost_user.c >> +++ b/drivers/net/virtio/virtio_user/vhost_user.c >> @@ -677,6 +677,14 @@ virtio_user_start_server(struct virtio_user_dev *dev, >> struct sockaddr_un *un) >> if (ret < 0) >> return -1; >> >> + PMD_DRV_LOG(NOTICE, "(%s) waiting for client connection...", dev->path); >> + dev->vhostfd = accept(fd, NULL, NULL); >> + if (dev->vhostfd < 0) { >> + PMD_DRV_LOG(ERR, "Failed to accept initial client connection (%s)", >> + strerror(errno)); >> + return -1; >> + } >> + >> flag = fcntl(fd, F_GETFL); >> if (fcntl(fd, F_SETFL, flag | O_NONBLOCK) < 0) { >> PMD_DRV_LOG(ERR, "fcntl failed, %s", strerror(errno)); >> @@ -721,7 +729,6 @@ vhost_user_setup(struct virtio_user_dev *dev) >> close(fd); >> return -1; >> } >> - dev->vhostfd = -1; >> } else { >> if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) { >> PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno)); >> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c >> b/drivers/net/virtio/virtio_user/virtio_user_dev.c >> index b92b7f7aae..19d59d401e 100644 >> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c >> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c >> @@ -144,10 +144,6 @@ virtio_user_dev_set_features(struct virtio_user_dev *dev) >> >> pthread_mutex_lock(&dev->mutex); >> >> - if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER && >> - dev->vhostfd < 0) >> - goto error; >> - >> /* Step 0: tell vhost to create queues */ >> if (virtio_user_queue_setup(dev, virtio_user_create_queue) < 0) >> goto error; >> @@ -190,11 +186,6 @@ virtio_user_start_device(struct virtio_user_dev *dev) >> rte_mcfg_mem_read_lock(); >> pthread_mutex_lock(&dev->mutex); >> >> - /* Vhost-user client not connected yet, will start later */ >> - if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER && >> - dev->vhostfd < 0) >> - goto out; >> - >> /* Step 2: share memory regions */ >> ret = dev->ops->set_memory_table(dev); >> if (ret < 0) >> @@ -213,7 +204,7 @@ virtio_user_start_device(struct virtio_user_dev *dev) >> goto error; >> >> dev->started = true; >> -out: >> + >> pthread_mutex_unlock(&dev->mutex); >> rte_mcfg_mem_read_unlock(); >> >> @@ -421,36 +412,36 @@ virtio_user_dev_setup(struct virtio_user_dev *dev) >> PMD_DRV_LOG(ERR, "Server mode only supports vhost-user!"); >> return -1; >> } >> + } >> + >> + if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER) { >> dev->ops = &virtio_ops_user; >> - } else { >> - if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER) { >> - dev->ops = &virtio_ops_user; >> - } else if (dev->backend_type == >> - VIRTIO_USER_BACKEND_VHOST_KERNEL) { >> - dev->ops = &virtio_ops_kernel; >> - >> - dev->vhostfds = malloc(dev->max_queue_pairs * >> - sizeof(int)); >> - dev->tapfds = malloc(dev->max_queue_pairs * >> - sizeof(int)); >> - if (!dev->vhostfds || !dev->tapfds) { >> - PMD_INIT_LOG(ERR, "(%s) Failed to allocate FDs", dev- >>> path); >> - return -1; > > If tapfds failed on malloc, this will lead to vhostfds not freed? > > And, should we free the fds when errors happen later in this function? Certainly, but that it is not the purpose of this patch. It is being moved to vhost-kernel in later patch, I'll check there if it is freed properly. Thanks, Maxime > Thanks! > Chenbo > >> - } >> - >> - for (q = 0; q < dev->max_queue_pairs; ++q) { >> - dev->vhostfds[q] = -1; >> - dev->tapfds[q] = -1; >> - } >> - } else if (dev->backend_type == >> - VIRTIO_USER_BACKEND_VHOST_VDPA) { >> - dev->ops = &virtio_ops_vdpa; >> - } else { >> - PMD_DRV_LOG(ERR, "(%s) Unknown backend type", dev->path);