From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7555C3F9D2; Tue, 12 Aug 2025 18:20:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755022807; cv=none; b=u9wfnOK4U5c788FG9cA/W9C+OZ7iuEhDeHhpcPBpsnn8/qT2wBiTsY2C0M+3QW2ynfurYqt2vn4LHefk/WT/OexBAUhjDD/V7zC9z9Q/hnUbTZFQQ0NQolfxbH3xQoGXJFaaEk8IfaPPFKJxI5wWi7eYFADTDVIssDhdLixohP4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755022807; c=relaxed/simple; bh=GKDfQgWPhT3DOH4H/SK3r1h86r3m2mzSMeg18pzcfkA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iEbBQSZ9XT0BxqdPmgqghRO1XNI6+lNIjA4dHpTHg7rhvJj8p1okUz0+je3ebtVIJVpyItUWxeSLO4jyvQ8cEZfvaOJZrQT48T/h6T322bnsxebKlER/yJ3mNvdMFgP5V7/sKNOaa6hRtMb3xJygIIPTAwplc/ZknZYSZQTSIgY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PLs8gjQM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PLs8gjQM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A6F4C4CEF6; Tue, 12 Aug 2025 18:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755022807; bh=GKDfQgWPhT3DOH4H/SK3r1h86r3m2mzSMeg18pzcfkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PLs8gjQMKsRJiybuGlhoP5Uj17tzszkNdwxqZcbfCKxca3DU7G2m77u3T+lO0rKxM G9CKjHZYrrW0HvFu+mRYIAMbNXLgu5cc3cS1qkkzL4LCHZ8Jr6pUyLOTaBtMLIDtBk d1Re2I97BgpJmiCCMzSriuPCKvNeWRY4E9m/eJk4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Williamson , Jason Gunthorpe , Jacob Pan , Sasha Levin Subject: [PATCH 6.12 265/369] vfio: Fix unbalanced vfio_df_close call in no-iommu mode Date: Tue, 12 Aug 2025 19:29:22 +0200 Message-ID: <20250812173024.731959853@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812173014.736537091@linuxfoundation.org> References: <20250812173014.736537091@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jacob Pan [ Upstream commit b25e271b377999191b12f0afbe1861edcf57e3fe ] For devices with no-iommu enabled in IOMMUFD VFIO compat mode, the group open path skips vfio_df_open(), leaving open_count at 0. This causes a warning in vfio_assert_device_open(device) when vfio_df_close() is called during group close. The correct behavior is to skip only the IOMMUFD bind in the device open path for no-iommu devices. Commit 6086efe73498 omitted vfio_df_open(), which was too broad. This patch restores the previous behavior, ensuring the vfio_df_open is called in the group open path. Fixes: 6086efe73498 ("vfio-iommufd: Move noiommu compat validation out of vfio_iommufd_bind()") Suggested-by: Alex Williamson Suggested-by: Jason Gunthorpe Signed-off-by: Jacob Pan Reviewed-by: Jason Gunthorpe Link: https://lore.kernel.org/r/20250618234618.1910456-1-jacob.pan@linux.microsoft.com Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/group.c | 7 +++---- drivers/vfio/iommufd.c | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c index 95b336de8a17..5f2b2c950bbc 100644 --- a/drivers/vfio/group.c +++ b/drivers/vfio/group.c @@ -194,11 +194,10 @@ static int vfio_df_group_open(struct vfio_device_file *df) * implies they expected translation to exist */ if (!capable(CAP_SYS_RAWIO) || - vfio_iommufd_device_has_compat_ioas(device, df->iommufd)) + vfio_iommufd_device_has_compat_ioas(device, df->iommufd)) { ret = -EPERM; - else - ret = 0; - goto out_put_kvm; + goto out_put_kvm; + } } ret = vfio_df_open(df); diff --git a/drivers/vfio/iommufd.c b/drivers/vfio/iommufd.c index 82eba6966fa5..02852899c2ae 100644 --- a/drivers/vfio/iommufd.c +++ b/drivers/vfio/iommufd.c @@ -25,6 +25,10 @@ int vfio_df_iommufd_bind(struct vfio_device_file *df) lockdep_assert_held(&vdev->dev_set->lock); + /* Returns 0 to permit device opening under noiommu mode */ + if (vfio_device_is_noiommu(vdev)) + return 0; + return vdev->ops->bind_iommufd(vdev, ictx, &df->devid); } -- 2.39.5