From nobody Sun Feb 8 11:26:12 2026 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) (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 1899734DCD7; Tue, 13 Jan 2026 23:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.145.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768345766; cv=none; b=ArVKqLmcYyIHSgU8wIwO6oqcczci2r0l985MB+h9Izo6QukAfcwaiS8/ACnANqvtGg/OpArggMdvm470tQwnl7umHODk4QybJlQNwKc68bDaApoVy3BKACdFAdVUXeUOOqjw8NPnNPRBbeEC1ggeN+VVx8jVRcgEg1JG5NL56ls= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768345766; c=relaxed/simple; bh=fkrdBctk1aST+sSHe3JoGU8KujzMzEzuEICfMKThj7k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Kkx1cYnZ+PRIgyo8Hr5FSixLVCxDeZvNFf6IvrH7rjN1JLqbyauqoIFliazyFlDFWGPfouipr2r6GKIIc6dRQqEfh8tyVyI2m9OCnSiMXEQEw8fZBqP2loEz9I14S2LeHsVxQtsXqqf6K62kyK2WrCj+6G8PoY6YddfX4OMMdqk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=fb.com header.i=@fb.com header.b=CxSA5f8W; arc=none smtp.client-ip=67.231.145.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fb.com header.i=@fb.com header.b="CxSA5f8W" Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60DN6m634099591; Tue, 13 Jan 2026 15:09:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=s2048-2025-q2; bh=OyC5pNyK4lUwaTgpChdW1KmmFya8dvnjMMlIoImdkRQ=; b=CxSA5f8WMZ1K Z43+3GqxFizJK+BxQHDChSPUUyqCwkg53xTLIl7B3Tp6nRBsd9Q5vlbc1LGsVenY Wj/SlEeA4TYD1iUDSgww2cJB72T9Qek8h9vsIa7ZQWSPcgbEU5PQAruhZETuqZ7/ s5Ax7yPsOc3AkKTXMC9QVTDkah6nEOXKwLC7WCw8WbLicRtDd9GeedmJSycObvrS O/jEyjS37sHddcxrChUpkcJjV1uT19qAbYbfsYYUlLqpiOF9ClsiCVPnnkdjHzi8 ECJbrmBaKoODUKUq2L0qGq9u0zB90C2ZCVrxWc6gLV8Yry37l4p2a7jYLWMAOGHp 80FXUH2u1Q== Received: from mail.thefacebook.com ([163.114.134.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4bnyeh80r2-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 13 Jan 2026 15:09:16 -0800 (PST) Received: from devgpu015.cco6.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c08b:78::2ac9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.29; Tue, 13 Jan 2026 23:09:03 +0000 From: Alex Mastro Date: Tue, 13 Jan 2026 15:08:36 -0800 Subject: [PATCH v2 1/3] vfio: selftests: Centralize IOMMU mode name definitions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260113-map-mmio-test-v2-1-e6d34f09c0bb@fb.com> References: <20260113-map-mmio-test-v2-0-e6d34f09c0bb@fb.com> In-Reply-To: <20260113-map-mmio-test-v2-0-e6d34f09c0bb@fb.com> To: Alex Williamson , David Matlack , Shuah Khan CC: Peter Xu , , , , Jason Gunthorpe , Alex Mastro X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: RLB5IoYT0I5VELiTct--AiNOqQpEjALK X-Authority-Analysis: v=2.4 cv=brZBxUai c=1 sm=1 tr=0 ts=6966d09c cx=c_pps a=CB4LiSf2rd0gKozIdrpkBw==:117 a=CB4LiSf2rd0gKozIdrpkBw==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=FOH2dFAWAAAA:8 a=ZEimqIeFnaV32_7obd8A:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTEzMDE4NyBTYWx0ZWRfXw9RNTItLCHMs 1FwQgw7R0XfOq6GsmPxcSCP/83JHXmCFKvncsA3Ks5XnjMfC3SwO36WR18bKs3KMydjdpmP+FkO oIxkVWD3rheSnpPEsgirrV83jbcGQG+dKswooTekSJO6gYrwNweRvyF6hYaTc1QCyO61wMZe4ek zkPNZOtcthF1hZPEWNbfF0VUbZEuLpGNBxVgvoyKihJtGtSwF+N8AERqnc70u+lb1lYPK925o00 VDYbDJ8lqn2s5XYZvjYcg3nJ17VT1eQ7V4JEF05uo8i3RF6urBgCIwqsMygz0WSaVuzYPsl/ggY WySJ47+afbcMgE6Be49kYGPrkW6j0KiT+ldFp83FSgyZKA/fWNqckUm7HDEm/VsyxTF8HzCTWZ4 JnIeDIvlZCg43ZoIEfDonyUjs2xK3fQInaPEQewfq8wD3y1OTleAN/Ilt/djPBWAwrV4t8fvIic m2ld4WBLIOIUGs98c4A== X-Proofpoint-GUID: RLB5IoYT0I5VELiTct--AiNOqQpEjALK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-13_04,2026-01-09_02,2025-10-01_01 Replace scattered string literals with MODE_* macros in iommu.h. This provides a single source of truth for IOMMU mode name strings. Signed-off-by: Alex Mastro --- tools/testing/selftests/vfio/lib/include/libvfio/iommu.h | 6 ++++++ tools/testing/selftests/vfio/lib/iommu.c | 12 ++++++------ tools/testing/selftests/vfio/vfio_dma_mapping_test.c | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/vfio/lib/include/libvfio/iommu.h b/too= ls/testing/selftests/vfio/lib/include/libvfio/iommu.h index 5c9b9dc6d993..e9a3386a4719 100644 --- a/tools/testing/selftests/vfio/lib/include/libvfio/iommu.h +++ b/tools/testing/selftests/vfio/lib/include/libvfio/iommu.h @@ -61,6 +61,12 @@ iova_t iommu_hva2iova(struct iommu *iommu, void *vaddr); =20 struct iommu_iova_range *iommu_iova_ranges(struct iommu *iommu, u32 *nrang= es); =20 +#define MODE_VFIO_TYPE1_IOMMU "vfio_type1_iommu" +#define MODE_VFIO_TYPE1V2_IOMMU "vfio_type1v2_iommu" +#define MODE_IOMMUFD_COMPAT_TYPE1 "iommufd_compat_type1" +#define MODE_IOMMUFD_COMPAT_TYPE1V2 "iommufd_compat_type1v2" +#define MODE_IOMMUFD "iommufd" + /* * Generator for VFIO selftests fixture variants that replicate across all * possible IOMMU modes. Tests must define FIXTURE_VARIANT_ADD_IOMMU_MODE() diff --git a/tools/testing/selftests/vfio/lib/iommu.c b/tools/testing/selft= ests/vfio/lib/iommu.c index 8079d43523f3..27d1d13abfeb 100644 --- a/tools/testing/selftests/vfio/lib/iommu.c +++ b/tools/testing/selftests/vfio/lib/iommu.c @@ -21,32 +21,32 @@ #include "../../../kselftest.h" #include =20 -const char *default_iommu_mode =3D "iommufd"; +const char *default_iommu_mode =3D MODE_IOMMUFD; =20 /* Reminder: Keep in sync with FIXTURE_VARIANT_ADD_ALL_IOMMU_MODES(). */ static const struct iommu_mode iommu_modes[] =3D { { - .name =3D "vfio_type1_iommu", + .name =3D MODE_VFIO_TYPE1_IOMMU, .container_path =3D "/dev/vfio/vfio", .iommu_type =3D VFIO_TYPE1_IOMMU, }, { - .name =3D "vfio_type1v2_iommu", + .name =3D MODE_VFIO_TYPE1V2_IOMMU, .container_path =3D "/dev/vfio/vfio", .iommu_type =3D VFIO_TYPE1v2_IOMMU, }, { - .name =3D "iommufd_compat_type1", + .name =3D MODE_IOMMUFD_COMPAT_TYPE1, .container_path =3D "/dev/iommu", .iommu_type =3D VFIO_TYPE1_IOMMU, }, { - .name =3D "iommufd_compat_type1v2", + .name =3D MODE_IOMMUFD_COMPAT_TYPE1V2, .container_path =3D "/dev/iommu", .iommu_type =3D VFIO_TYPE1v2_IOMMU, }, { - .name =3D "iommufd", + .name =3D MODE_IOMMUFD, }, }; =20 diff --git a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c b/tools/t= esting/selftests/vfio/vfio_dma_mapping_test.c index 5397822c3dd4..7cd396aa205c 100644 --- a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c +++ b/tools/testing/selftests/vfio/vfio_dma_mapping_test.c @@ -166,7 +166,7 @@ TEST_F(vfio_dma_mapping_test, dma_map_unmap) * IOMMUFD compatibility-mode does not support huge mappings when * using VFIO_TYPE1_IOMMU. */ - if (!strcmp(variant->iommu_mode, "iommufd_compat_type1")) + if (!strcmp(variant->iommu_mode, MODE_IOMMUFD_COMPAT_TYPE1)) mapping_size =3D SZ_4K; =20 ASSERT_EQ(0, rc); --=20 2.47.3 From nobody Sun Feb 8 11:26:12 2026 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) (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 D028534F461; Tue, 13 Jan 2026 23:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.145.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768345766; cv=none; b=XSNKk3y+S1MhSXpmCuSttTej7NOQ5Cftr2J6ob+4hKJLSLRzoy8BJgBtOf65Zh5P5ZlrXHbq0ZgxqIrQdP6KEPeg1sv/WJ7tt6yhjki2IPhZ/vORH4qYycKFAH13UJPCNvvhUw8DHDs9w1kg5OSb3r9uR38ZLawLQwgFKtZlba4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768345766; c=relaxed/simple; bh=B9pNp3j1Dj9Gcf7HZDzPCg5yLaHt4JAmlo7rzTbtwQ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=ce9MbY5bKrJDrhdrfGSbyCiDdr00VnYu56b+CpyKG01O/lF5t4jlkhSHXO5XSJbuN303+QWQ6dBXMY3poKztBKDcULM5kwiv53E0MLYb3vs5HwPmT21QUjH9Cf1TS24Q0RkOv6ICWZPKfBkO40nWB1Kvsue+J4otfqt9+96MaNI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=fb.com header.i=@fb.com header.b=WfaiFmEl; arc=none smtp.client-ip=67.231.145.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fb.com header.i=@fb.com header.b="WfaiFmEl" Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60DN6m654099591; Tue, 13 Jan 2026 15:09:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=s2048-2025-q2; bh=eZHIvPhwIUYdWzpFoeqwcw1qyPbDppq6+l09hYcGKV8=; b=WfaiFmElJc/B oajvlVP8x5nP2S/sOX85dhnBnqTajPjPzvz8yJ9T66kXsJgRfLcLt5ZedQTeIZiR nUGGKjLrbF3F79/3JHKwR0C6G/VxGs7m6c9rzNvzM8/vk3uEgHSAcOX0Ei5DXCt/ U5vftRcVrRWBcIfBgQpPs50vXP3AKFb7O4F7M3zU3X7k+xAB+INoHAn1CqEMZiX8 Dj5sVGId3AappPrq5B37tbk4ulzDAIQcxtLoaZXOGc00fxgH4YayQ2qOrQaCVKA3 qtILW16cbAr4fflwG9uUa7tScaQYbAA8JxE4Te9OoJlKpFj4rs+wzuSB1WpWLNEt 21CTan8FJw== Received: from mail.thefacebook.com ([163.114.134.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4bnyeh80r2-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 13 Jan 2026 15:09:17 -0800 (PST) Received: from devgpu015.cco6.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c08b:78::2ac9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.29; Tue, 13 Jan 2026 23:09:03 +0000 From: Alex Mastro Date: Tue, 13 Jan 2026 15:08:37 -0800 Subject: [PATCH v2 2/3] vfio: selftests: Align BAR mmaps for efficient IOMMU mapping Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260113-map-mmio-test-v2-2-e6d34f09c0bb@fb.com> References: <20260113-map-mmio-test-v2-0-e6d34f09c0bb@fb.com> In-Reply-To: <20260113-map-mmio-test-v2-0-e6d34f09c0bb@fb.com> To: Alex Williamson , David Matlack , Shuah Khan CC: Peter Xu , , , , Jason Gunthorpe , Alex Mastro X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: Xk8r-uT5EcmcNacGhrw8qbwpOAc8frUU X-Authority-Analysis: v=2.4 cv=brZBxUai c=1 sm=1 tr=0 ts=6966d09d cx=c_pps a=CB4LiSf2rd0gKozIdrpkBw==:117 a=CB4LiSf2rd0gKozIdrpkBw==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=FOH2dFAWAAAA:8 a=TV4XJVjupk0IgnZMQ3QA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTEzMDE4NyBTYWx0ZWRfX/i/BgLaftROT Kr6NB1Qp8uCSWgPidx/OdDmqoZGhxXIUq0u3WAM7YeK4lg72WLRkWKdEs4/5YrtH+Px84y6kAWJ G8kv9mRhwW2SD0q88ruMhKbDdyy4duEO9bz2bJwW8XMp7Wiyk10JYtfWP/qRnK0nClRabU9j9Nr ObBhbsu9lStG+dviv8PbPX1Isc9HiKwCgqrdNyJm0tf/r702IbA02v4oFyiIELTau4K+3qg7ftr F7XKgOCL9N+6Cq7zFZVN26EH9whANSiIj444ZmFZWj2QDZh65R1JkbvrGCwnFnNXbq0KebsktmL 2Pb4PWIwDv1a5Ko0nyTiUJybYpfhR33sBXNMuzdpC+xeO0NkejPg4JXdFWcBTc/KhBsCX0TixQJ Mgc2u0UZUa5adG2WXmZKkUfDl0Pqu8mxp7ox7oC8vwrv9z1WuxGyFg61Cu/ECedwRLNaMRWiDZA /ncr9ApzgKSaVGNkt9A== X-Proofpoint-GUID: Xk8r-uT5EcmcNacGhrw8qbwpOAc8frUU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-13_04,2026-01-09_02,2025-10-01_01 Update vfio_pci_bar_map() to align BAR mmaps for efficient huge page mappings. The manual mmap alignment can be removed once mmap(!MAP_FIXED) on vfio device fds improves to automatically return well-aligned addresses. Signed-off-by: Alex Mastro --- tools/testing/selftests/vfio/lib/include/libvfio.h | 9 ++++++++ tools/testing/selftests/vfio/lib/libvfio.c | 25 ++++++++++++++++++= ++++ tools/testing/selftests/vfio/lib/vfio_pci_device.c | 24 ++++++++++++++++++= ++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/vfio/lib/include/libvfio.h b/tools/tes= ting/selftests/vfio/lib/include/libvfio.h index 279ddcd70194..5ebf8503586e 100644 --- a/tools/testing/selftests/vfio/lib/include/libvfio.h +++ b/tools/testing/selftests/vfio/lib/include/libvfio.h @@ -23,4 +23,13 @@ const char *vfio_selftests_get_bdf(int *argc, char *argv[]); char **vfio_selftests_get_bdfs(int *argc, char *argv[], int *nr_bdfs); =20 +/* + * Reserve virtual address space of size at an address satisfying + * (vaddr % align) =3D=3D offset. + * + * Returns the reserved vaddr. The caller is responsible for unmapping + * the returned region. + */ +void *mmap_aligned(size_t size, size_t align, size_t offset); + #endif /* SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_H */ diff --git a/tools/testing/selftests/vfio/lib/libvfio.c b/tools/testing/sel= ftests/vfio/lib/libvfio.c index a23a3cc5be69..4529bb1e69d1 100644 --- a/tools/testing/selftests/vfio/lib/libvfio.c +++ b/tools/testing/selftests/vfio/lib/libvfio.c @@ -2,6 +2,9 @@ =20 #include #include +#include + +#include =20 #include "../../../kselftest.h" #include @@ -76,3 +79,25 @@ const char *vfio_selftests_get_bdf(int *argc, char *argv= []) =20 return vfio_selftests_get_bdfs(argc, argv, &nr_bdfs)[0]; } + +void *mmap_aligned(size_t size, size_t align, size_t offset) +{ + void *map_base, *map_align; + size_t delta; + + VFIO_ASSERT_GT(align, offset); + delta =3D align - offset; + + map_base =3D mmap(NULL, size + align, PROT_NONE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + VFIO_ASSERT_NE(map_base, MAP_FAILED); + + map_align =3D (void *)(ALIGN((uintptr_t)map_base + delta, align) - delta); + + if (map_align > map_base) + VFIO_ASSERT_EQ(munmap(map_base, map_align - map_base), 0); + + VFIO_ASSERT_EQ(munmap(map_align + size, map_base + align - map_align), 0); + + return map_align; +} diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/tes= ting/selftests/vfio/lib/vfio_pci_device.c index 13fdb4b0b10f..03f35011b5f7 100644 --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@ -12,10 +12,14 @@ #include =20 #include +#include #include +#include #include +#include #include #include +#include #include #include =20 @@ -124,20 +128,38 @@ static void vfio_pci_region_get(struct vfio_pci_devic= e *device, int index, static void vfio_pci_bar_map(struct vfio_pci_device *device, int index) { struct vfio_pci_bar *bar =3D &device->bars[index]; + size_t align, size; + void *vaddr; int prot =3D 0; =20 VFIO_ASSERT_LT(index, PCI_STD_NUM_BARS); VFIO_ASSERT_NULL(bar->vaddr); VFIO_ASSERT_TRUE(bar->info.flags & VFIO_REGION_INFO_FLAG_MMAP); + VFIO_ASSERT_TRUE(is_power_of_2(bar->info.size)); =20 if (bar->info.flags & VFIO_REGION_INFO_FLAG_READ) prot |=3D PROT_READ; if (bar->info.flags & VFIO_REGION_INFO_FLAG_WRITE) prot |=3D PROT_WRITE; =20 - bar->vaddr =3D mmap(NULL, bar->info.size, prot, MAP_FILE | MAP_SHARED, + size =3D bar->info.size; + + /* + * Align BAR mmaps to improve page fault granularity during potential + * subsequent IOMMU mapping of these BAR vaddr. 1G for x86 is the + * largest hugepage size across any architecture, so no benefit from + * larger alignment. BARs smaller than 1G will be aligned by their + * power-of-two size, guaranteeing sufficient alignment for smaller + * hugepages, if present. + */ + align =3D min_t(size_t, size, SZ_1G); + + vaddr =3D mmap_aligned(size, align, 0); + bar->vaddr =3D mmap(vaddr, size, prot, MAP_SHARED | MAP_FIXED, device->fd, bar->info.offset); VFIO_ASSERT_NE(bar->vaddr, MAP_FAILED); + + madvise(bar->vaddr, size, MADV_HUGEPAGE); } =20 static void vfio_pci_bar_unmap(struct vfio_pci_device *device, int index) --=20 2.47.3 From nobody Sun Feb 8 11:26:12 2026 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) (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 918E334FF46; Tue, 13 Jan 2026 23:09:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.145.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768345767; cv=none; b=ujzrqWB4y5WTusltDCQYwgcE8++ZRc4bpKKIPJvVzbiX+2si4NvtVhMCHZy1psk+d7XaIcnoCq64MRvCZwFRxUZpEznE1NWqWp3bCPEWtCudG//oIdRnHj+1SRV4LIStCz5/jACBCjSml3mSrHaKDM+hptqdDx8EfD2o4DPrbvo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768345767; c=relaxed/simple; bh=pQxsBZwch3YoWkqClhpNBi21JRjK1LSqDgOVcnyH6TY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=oj9UTNnaGvJH3+RJtJmshkqgl3cEGLOcXq2FPim3o+OpSw1XRG6JxkQRoxVH/gxW73BxqB3Mf351C0dJioeEIOLtn+Yx0jzphY/grezj0ZpgXMnrVF1GmCwalktOEaAMwx7L11394gazg1jNxPmRuZQ47MqBQhjW1f/kGnHw07Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com; spf=pass smtp.mailfrom=meta.com; dkim=pass (2048-bit key) header.d=fb.com header.i=@fb.com header.b=tSPnHRI8; arc=none smtp.client-ip=67.231.145.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=meta.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fb.com header.i=@fb.com header.b="tSPnHRI8" Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60DN6m664099591; Tue, 13 Jan 2026 15:09:18 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=s2048-2025-q2; bh=vmuACL6Byooatn57EepVgCCX9NM030r1I/ikSyIw7eU=; b=tSPnHRI8qL/0 6DE4xtWJOa5ZVtonqOmAfOZKonHgE0rJAoCzpdcboZODxPbDfs07fg4/qa5GcIoS dt72x9eapSLZTmtS8/z2pAHRgaMDwTo9tt976lOs7WNRzwj903YiP6dDzBn69KQ1 lWtLXmX0Ci16i0Sg2ynRlH+0D+8cQC0m7yyWz6D5ywJxhh8jEuYZ//glP+wmGsgt yMxu42jdXu7SgpbuhfaY/NYccYNKgD9WU33yn3a8xAPD65PzV2TI1sFvxxsaPsy+ Yv4MUty33cQQ14ne6MMbR9A3cJEEf3a4o5WPRoZHdsRDgWaMxD3ofzkk795rpT0h NnZmixFFGw== Received: from mail.thefacebook.com ([163.114.134.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4bnyeh80r2-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 13 Jan 2026 15:09:17 -0800 (PST) Received: from devgpu015.cco6.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c08b:78::2ac9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.29; Tue, 13 Jan 2026 23:09:04 +0000 From: Alex Mastro Date: Tue, 13 Jan 2026 15:08:38 -0800 Subject: [PATCH v2 3/3] vfio: selftests: Add vfio_dma_mapping_mmio_test Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID: <20260113-map-mmio-test-v2-3-e6d34f09c0bb@fb.com> References: <20260113-map-mmio-test-v2-0-e6d34f09c0bb@fb.com> In-Reply-To: <20260113-map-mmio-test-v2-0-e6d34f09c0bb@fb.com> To: Alex Williamson , David Matlack , Shuah Khan CC: Peter Xu , , , , Jason Gunthorpe , Alex Mastro X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: yreJtxB8CECuRy29vzYPR5kD959Tz3LG X-Authority-Analysis: v=2.4 cv=brZBxUai c=1 sm=1 tr=0 ts=6966d09e cx=c_pps a=CB4LiSf2rd0gKozIdrpkBw==:117 a=CB4LiSf2rd0gKozIdrpkBw==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=FOH2dFAWAAAA:8 a=FzPllQ_cktK6OXWCqgAA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTEzMDE4NyBTYWx0ZWRfX4ImIj+DPrzZ3 jw9PaL242LE1hLcGQnAVXbIkOr4gph/7YVzoWDzw8uW9lb3IodwHYyqN5ijOuF+DS1I5Q044Mxe bDCpsvyp+VmH4K56cWbnNvXi33ZOd1QICs1m8dwXZM0fRWuQFiiot+zoXjVPDNumAncm50l//Mj XT23D/lN2rR5mkO3tBaKek9A1N8Ps00iM9R4u1tzaBcbWd51RIlPTda2wkSDrl5befzmkSd8yzB vcf4yjSysel2gmQd2uYNTsMKuTXNKttOxkdMPlSizSo0y1MHnavqm545eLCPAdsTWJOwKR26UsD nN1N57uuzmIdNhAH7lO8DjdHjwB4IhTqxJcY2snbz/PeORZoqTzcp+cJCqQw8wsYmqgmt1vi+z1 YtMNbfRFBGDiRmuKi3GNGZ4bQixBtxowyxc86Ctu8ZW3r0WM1urBrNe8+cdR/ULx75/NHcILzI9 P3ELfqvGAsPbujvQdXA== X-Proofpoint-GUID: yreJtxB8CECuRy29vzYPR5kD959Tz3LG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2026-01-13_04,2026-01-09_02,2025-10-01_01 Test IOMMU mapping the BAR mmaps created during vfio_pci_device_setup(). All IOMMU modes are tested: vfio_type1 variants are expected to succeed, while non-type1 modes are expected to fail. iommufd compat mode can be updated to expect success once kernel support lands; native iommufd will not support mapping vaddrs backed by MMIO (it will support dma-buf based MMIO mapping instead). Signed-off-by: Alex Mastro --- tools/testing/selftests/vfio/Makefile | 1 + .../selftests/vfio/vfio_dma_mapping_mmio_test.c | 144 +++++++++++++++++= ++++ 2 files changed, 145 insertions(+) diff --git a/tools/testing/selftests/vfio/Makefile b/tools/testing/selftest= s/vfio/Makefile index 3c796ca99a50..ead27892ab65 100644 --- a/tools/testing/selftests/vfio/Makefile +++ b/tools/testing/selftests/vfio/Makefile @@ -1,5 +1,6 @@ CFLAGS =3D $(KHDR_INCLUDES) TEST_GEN_PROGS +=3D vfio_dma_mapping_test +TEST_GEN_PROGS +=3D vfio_dma_mapping_mmio_test TEST_GEN_PROGS +=3D vfio_iommufd_setup_test TEST_GEN_PROGS +=3D vfio_pci_device_test TEST_GEN_PROGS +=3D vfio_pci_device_init_perf_test diff --git a/tools/testing/selftests/vfio/vfio_dma_mapping_mmio_test.c b/to= ols/testing/selftests/vfio/vfio_dma_mapping_mmio_test.c new file mode 100644 index 000000000000..5a86b34329ad --- /dev/null +++ b/tools/testing/selftests/vfio/vfio_dma_mapping_mmio_test.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include "../kselftest_harness.h" + +static const char *device_bdf; + +static struct vfio_pci_bar *largest_mapped_bar(struct vfio_pci_device *dev= ice) +{ + u32 flags =3D VFIO_REGION_INFO_FLAG_READ | VFIO_REGION_INFO_FLAG_WRITE; + struct vfio_pci_bar *largest =3D NULL; + u64 bar_size =3D 0; + + for (int i =3D 0; i < PCI_STD_NUM_BARS; i++) { + struct vfio_pci_bar *bar =3D &device->bars[i]; + + if (!bar->vaddr) + continue; + + /* + * iommu_map() maps with READ|WRITE, so require the same + * abilities for the underlying VFIO region. + */ + if ((bar->info.flags & flags) !=3D flags) + continue; + + if (bar->info.size > bar_size) { + bar_size =3D bar->info.size; + largest =3D bar; + } + } + + return largest; +} + +FIXTURE(vfio_dma_mapping_mmio_test) { + struct iommu *iommu; + struct vfio_pci_device *device; + struct iova_allocator *iova_allocator; + struct vfio_pci_bar *bar; +}; + +FIXTURE_VARIANT(vfio_dma_mapping_mmio_test) { + const char *iommu_mode; +}; + +#define FIXTURE_VARIANT_ADD_IOMMU_MODE(_iommu_mode) \ +FIXTURE_VARIANT_ADD(vfio_dma_mapping_mmio_test, _iommu_mode) { \ + .iommu_mode =3D #_iommu_mode, \ +} + +FIXTURE_VARIANT_ADD_ALL_IOMMU_MODES(); + +#undef FIXTURE_VARIANT_ADD_IOMMU_MODE + +FIXTURE_SETUP(vfio_dma_mapping_mmio_test) +{ + self->iommu =3D iommu_init(variant->iommu_mode); + self->device =3D vfio_pci_device_init(device_bdf, self->iommu); + self->iova_allocator =3D iova_allocator_init(self->iommu); + self->bar =3D largest_mapped_bar(self->device); + + if (!self->bar) + SKIP(return, "No mappable BAR found on device %s", device_bdf); + + if (self->bar->info.size < 2 * getpagesize()) + SKIP(return, "BAR too small (size=3D0x%llx)", self->bar->info.size); +} + +FIXTURE_TEARDOWN(vfio_dma_mapping_mmio_test) +{ + iova_allocator_cleanup(self->iova_allocator); + vfio_pci_device_cleanup(self->device); + iommu_cleanup(self->iommu); +} + +static void do_mmio_map_test(struct iommu *iommu, + struct iova_allocator *iova_allocator, + void *vaddr, size_t size) +{ + struct dma_region region =3D { + .vaddr =3D vaddr, + .size =3D size, + .iova =3D iova_allocator_alloc(iova_allocator, size), + }; + + /* + * NOTE: Check for iommufd compat success once it lands. Native iommufd + * will never support this. + */ + if (!strcmp(iommu->mode->name, MODE_VFIO_TYPE1V2_IOMMU) || + !strcmp(iommu->mode->name, MODE_VFIO_TYPE1_IOMMU)) { + iommu_map(iommu, ®ion); + iommu_unmap(iommu, ®ion); + } else { + VFIO_ASSERT_NE(__iommu_map(iommu, ®ion), 0); + VFIO_ASSERT_NE(__iommu_unmap(iommu, ®ion, NULL), 0); + } +} + +TEST_F(vfio_dma_mapping_mmio_test, map_full_bar) +{ + do_mmio_map_test(self->iommu, self->iova_allocator, + self->bar->vaddr, self->bar->info.size); +} + +TEST_F(vfio_dma_mapping_mmio_test, map_partial_bar) +{ + do_mmio_map_test(self->iommu, self->iova_allocator, + self->bar->vaddr, getpagesize()); +} + +/* Test IOMMU mapping of BAR mmap with intentionally poor vaddr alignment.= */ +TEST_F(vfio_dma_mapping_mmio_test, map_bar_misaligned) +{ + /* Limit size to bound test time for large BARs */ + size_t size =3D min_t(size_t, self->bar->info.size, SZ_1G); + size_t page_size =3D getpagesize(); + void *vaddr; + + vaddr =3D mmap_aligned(size, SZ_1G, page_size); + vaddr =3D mmap(vaddr, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXE= D, + self->device->fd, self->bar->info.offset); + VFIO_ASSERT_NE(vaddr, MAP_FAILED); + + do_mmio_map_test(self->iommu, self->iova_allocator, vaddr, size); + + VFIO_ASSERT_EQ(munmap(vaddr, size), 0); +} + +int main(int argc, char *argv[]) +{ + device_bdf =3D vfio_selftests_get_bdf(&argc, argv); + return test_harness_run(argc, argv); +} --=20 2.47.3