From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9755606A332 for ; Mon, 26 Oct 2026 18:11:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=SVOiXbwJ Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A404F409FA; Mon, 26 Oct 2026 19:11:08 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTPS id A75BC402E8 for ; Mon, 26 Oct 2026 19:11:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1793038265; 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=sExffriHbLOdMFqYRwR2u8NJ9xKI/HB66z2yqfmZKbg=; b=SVOiXbwJB6f9F+ylgzHEpKezcKR+HiNCXpALQVFqff2Pmt1QnXfk1RTeMTChTkx85tF6j6 ERkWiFyycnBIRAvltcq6F6GYKtvSCHmOdhR16FPc/ZqAeUIREQg9HzqUDOQrRxiI+oTbPr avMhJr0gBfLUiLNjFsWFTo5bEbAbFDo= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-203-xdzlVdx1PUyG1oYtVAFZXQ-1; Mon, 26 Oct 2026 14:11:02 -0400 X-MC-Unique: xdzlVdx1PUyG1oYtVAFZXQ-1 X-Mimecast-MFC-AGG-ID: xdzlVdx1PUyG1oYtVAFZXQ_1793038261 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 748D4180034C; Mon, 26 Oct 2026 18:11:01 +0000 (UTC) Received: from dmarchan.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AA6D71956088; Mon, 26 Oct 2026 18:11:00 +0000 (UTC) From: David Marchand To: hemant.agrawal@nxp.com, dev@dpdk.org Subject: [PATCH v2 08/16] bus/fslmc: fix some VFIO device FD and memory leaks Date: Mon, 26 Oct 2026 19:10:22 +0100 Message-ID: <20261026181031.304100-9-david.marchand@redhat.com> In-Reply-To: <20261026181031.304100-1-david.marchand@redhat.com> References: <20260723135400.3621271-1-david.marchand@redhat.com> <20261026181031.304100-1-david.marchand@redhat.com> X-Archived-By: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: uZbykPnhh-q2_DrOM9uyLEUW4OYPe9Lv3RzUAb-w8g0_1793038261 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Archive: List-Post: List-Help: List-Subscribe: , X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 In case VFIO_DEVICE_GET_INFO fails, the vfio_dev_fd was leaked. In a similar way, failing to add this device FD in the group list would result in leaking the FD. When uninitialising a device or doing a bus cleanup, the per device VFIO FD and the associated memory used for tracking it were leaked. Fixes: 57cb02edf122 ("bus/fslmc: enhance MC VFIO multi-process support") Signed-off-by: David Marchand --- drivers/bus/fslmc/fslmc_vfio.c | 45 ++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index 2a3d022d2e..10efd98e7b 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -217,13 +217,17 @@ static int fslmc_vfio_clear_group(int vfio_group_fd) { struct fslmc_vfio_group *group; - struct fslmc_vfio_device *dev; int clear = 0; LIST_FOREACH(group, &s_vfio_container.groups, next) { if (group->fd == vfio_group_fd) { - LIST_FOREACH(dev, &group->vfio_devices, next) + while (!LIST_EMPTY(&group->vfio_devices)) { + struct fslmc_vfio_device *dev = LIST_FIRST(&group->vfio_devices); + + close(dev->fd); LIST_REMOVE(dev, next); + rte_free(dev); + } close(vfio_group_fd); LIST_REMOVE(group, next); @@ -323,6 +327,8 @@ fslmc_vfio_group_add_dev(int vfio_group_fd, if (group->fd == vfio_group_fd) { dev = rte_zmalloc(NULL, sizeof(struct fslmc_vfio_device), 0); + if (dev == NULL) + return -ENOMEM; dev->fd = dev_fd; rte_strscpy(dev->dev_name, name, sizeof(dev->dev_name)); LIST_INSERT_HEAD(&group->vfio_devices, dev, next); @@ -338,26 +344,25 @@ fslmc_vfio_group_remove_dev(int vfio_group_fd, { struct fslmc_vfio_group *group = NULL; struct fslmc_vfio_device *dev; - int removed = 0; LIST_FOREACH(group, &s_vfio_container.groups, next) { if (group->fd == vfio_group_fd) break; } - if (group) { - LIST_FOREACH(dev, &group->vfio_devices, next) { - if (!strcmp(dev->dev_name, name)) { - LIST_REMOVE(dev, next); - removed = 1; - break; - } + if (group == NULL) + goto err; + + LIST_FOREACH(dev, &group->vfio_devices, next) { + if (strcmp(dev->dev_name, name) == 0) { + close(dev->fd); + LIST_REMOVE(dev, next); + rte_free(dev); + return 0; } } - if (removed) - return 0; - +err: return -ENODEV; } @@ -1251,11 +1256,21 @@ fslmc_vfio_setup_device(const char *dev_addr, if (ret) { DPAA2_BUS_ERR("%s cannot get device info err(%d)(%s)", dev_addr, errno, strerror(errno)); + close(*vfio_dev_fd); + *vfio_dev_fd = -1; return ret; } - return fslmc_vfio_group_add_dev(vfio_group_fd, *vfio_dev_fd, - dev_addr); + ret = fslmc_vfio_group_add_dev(vfio_group_fd, *vfio_dev_fd, dev_addr); + if (ret) { + DPAA2_BUS_ERR("%s cannot add device in group err(%d)(%s)", + dev_addr, ret, strerror(-ret)); + close(*vfio_dev_fd); + *vfio_dev_fd = -1; + return ret; + } + + return 0; } static intptr_t vfio_map_mcp_obj(const char *mcp_obj) -- 2.54.0