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 3AA8B45BB5; Wed, 23 Oct 2024 20:57:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE1E242ECD; Wed, 23 Oct 2024 20:57:47 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5F1A2406BC for ; Wed, 23 Oct 2024 20:57:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729709866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=H4iVO+TPhQagFj8HuAqzBZgDoXKo7CR4VDO7fwZ2XRQ=; b=c43LpYaC7JuZHF3jLR54WTJjTNn1HRMxAll/KlWyUpC1tZZNzBi7NcjOdrk1y42pouFBOW OlJdblO++dfkTjmF4vN0LGWbxzvfyjQnQF2QF2SkpMbCp7ZGwmCK23/oTs7OR6LIIEkEh8 M3/NPZXNhMnupJjNfkPx0KKTAUGTJKs= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-581-4laHhxu9MPSFYRiugftrMg-1; Wed, 23 Oct 2024 14:57:42 -0400 X-MC-Unique: 4laHhxu9MPSFYRiugftrMg-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B50B71955E8C; Wed, 23 Oct 2024 18:57:41 +0000 (UTC) Received: from [10.39.208.26] (unknown [10.39.208.26]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ABAC81955F42; Wed, 23 Oct 2024 18:57:40 +0000 (UTC) Message-ID: <4480e848-fe02-4e29-940e-8f49b5809664@redhat.com> Date: Wed, 23 Oct 2024 20:57:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 3/6] vhost: fix VDUSE reconnect device start failure To: David Marchand Cc: dev@dpdk.org, chenbox@nvidia.com References: <20241023151552.2863387-1-maxime.coquelin@redhat.com> <20241023151552.2863387-4-maxime.coquelin@redhat.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= In-Reply-To: X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 On 10/23/24 18:06, David Marchand wrote: > On Wed, Oct 23, 2024 at 5:16 PM Maxime Coquelin > wrote: >> >> This patch fixes a FD leak in the VDUSE device reconnect >> code fails to start the device. >> >> Also take the opportunity to refactor the related code into >> a dedicated function. >> >> Fixes: da79cc7fda76 ("vhost: add reconnection support to VDUSE") >> >> Signed-off-by: Maxime Coquelin >> --- >> lib/vhost/vduse.c | 63 +++++++++++++++++++++++++++++++---------------- >> 1 file changed, 42 insertions(+), 21 deletions(-) >> >> diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c >> index d1373d0549..c8c4761293 100644 >> --- a/lib/vhost/vduse.c >> +++ b/lib/vhost/vduse.c >> @@ -476,6 +476,46 @@ vduse_reconnect_handler(int fd, void *arg, int *remove) >> *remove = 1; >> } >> >> +static int >> +vduse_reconnect_start_device(struct virtio_net *dev) >> +{ >> + int fd, ret; >> + >> + /* >> + * Make vduse_device_start() being executed in the same >> + * context for both reconnection and fresh startup. >> + */ >> + fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); >> + if (fd < 0) { >> + VHOST_CONFIG_LOG(dev->ifname, ERR, "Failed to create reconnect efd: %s", >> + strerror(errno)); >> + ret = -1; >> + goto out_err; >> + } >> + >> + ret = fdset_add(vduse.fdset, fd, vduse_reconnect_handler, NULL, dev); >> + if (ret) { >> + VHOST_CONFIG_LOG(dev->ifname, ERR, "Failed to add reconnect efd %d to vduse fdset", >> + fd); >> + goto out_err_close; >> + } >> + >> + ret = eventfd_write(fd, (eventfd_t)1); >> + if (ret < 0) { >> + VHOST_CONFIG_LOG(dev->ifname, ERR, "Failed to write to reconnect eventfd"); >> + goto out_err_fdset; >> + } >> + >> + return 0; >> + >> +out_err_fdset: >> + fdset_del(vduse.fdset, fd); >> +out_err_close: >> + close(fd); >> +out_err: >> + return ret; >> +} >> + >> int >> vduse_device_create(const char *path, bool compliant_ol_flags) >> { >> @@ -741,28 +781,9 @@ vduse_device_create(const char *path, bool compliant_ol_flags) >> } >> >> if (reconnect && dev->status & VIRTIO_DEVICE_STATUS_DRIVER_OK) { >> - /* >> - * Make vduse_device_start() being executed in the same >> - * context for both reconnection and fresh startup. >> - */ >> - reco_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); >> - if (reco_fd < 0) { >> - VHOST_CONFIG_LOG(name, ERR, "Failed to create reco_fd: %s", >> - strerror(errno)); >> - ret = -1; >> - goto out_dev_destroy; >> - } >> - >> - ret = fdset_add(vduse.fdset, reco_fd, vduse_reconnect_handler, NULL, dev); >> + ret = vduse_reconnect_start_device(dev); >> if (ret) { >> - VHOST_CONFIG_LOG(name, ERR, "Failed to add reconnect fd %d to vduse fdset", >> - reco_fd); >> - goto out_dev_destroy; >> - } >> - >> - ret = eventfd_write(reco_fd, (eventfd_t)1); >> - if (ret < 0) { >> - VHOST_CONFIG_LOG(name, ERR, "Failed to write to reconnect eventfd"); >> + VHOST_CONFIG_LOG(name, ERR, "Failed to start device at reconnection"); > > We don't need a new log, there is already one for each error case in > vduse_reconnect_start_device(). > > Removed in v2. Thanks, Maxime