From nobody Sun Feb 8 09:27:18 2026 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (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 94F4325DAEA; Tue, 11 Nov 2025 18:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.153.30 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886936; cv=none; b=LqGq61T8lcCgOb48B2ntsaSY9Zv6qMBgvBOGm6+kGJQ2KAPPU92LUAPrpmv/gvE3iQxdSp1dVzTGKhUpqm1JgEyH2KypSprclgXsYwzWIXd/LNDnc/SE649HGeaCI0909SdVww+JKWT2Fwp/9tHQKIM8MEWTeh1DrONLoIjijHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886936; c=relaxed/simple; bh=qGSVtTdIQfwYImmAqfekJpkI03YVXdvBPZgCprnZIjY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=byefJp9cXHvABK2aTTtL98LlPSULJFsqyd/WZbyS17BJklc/HzhraUtkovIvSCNOrYNO34RhXQz16TGB9QRa8eWf0VF7tZbVKIBASlzxng5z5/NTe700cRhoadSpt1G3kBuciqKnSdyNzoDlk/n7Wzn54SYxx5m6xJweQaJKqJ0= 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=pKzoYXpN; arc=none smtp.client-ip=67.231.153.30 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="pKzoYXpN" Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5ABGKpnQ2601076; Tue, 11 Nov 2025 10:48:47 -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=jxZzy80bQh9jauTcZWOpfobeqFyunTSAHfyArvzcsfQ=; b=pKzoYXpNdMkY QdPdbsCOSJ5OfOsdyQtLWdzq3c9mAT2Sm46YitYra2hQM9OSIrGjQdVKaoZCCT5O 7SQ0x2oAjtkyPa9xxokHauLSUYbgxPL0aEOxLKlSkr9d2juRqdtSK4MZsI2tSy9V 6ZNwH/BnRJ7ekrt8KAvu+jY+rCwsZ+3ZMYWwDoXoVAaXjn11UyFzmidGNQTzwm8R ipWOqKc7KCmjwAA78Omv6VGyCJWLCNdAvsmHnBdrGlFjtzlUcyuQg1ykP5Qv/MFF JICJh35XCyuucYT/Ko0p5IrmgNqkP/gfoqwE+RD454QOMitsTq9Fxs5dnyVyE98A lsx5IO3J5A== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4ac8k51cdm-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 11 Nov 2025 10:48:47 -0800 (PST) Received: from devgpu015.cco6.facebook.com (2620:10d:c0a8:fe::f072) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.20; Tue, 11 Nov 2025 18:48:34 +0000 From: Alex Mastro Date: Tue, 11 Nov 2025 10:48:24 -0800 Subject: [PATCH v3 1/4] vfio: selftests: add iova range query helpers 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: <20251111-iova-ranges-v3-1-7960244642c5@fb.com> References: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> In-Reply-To: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> To: Alex Williamson , David Matlack , Shuah Khan , Jason Gunthorpe CC: , , , Alex Mastro X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: EG2Na0iztcYGmlahczIhBWa4sO9xAP2D X-Authority-Analysis: v=2.4 cv=X95f6WTe c=1 sm=1 tr=0 ts=6913850f cx=c_pps a=MfjaFnPeirRr97d5FC5oHw==:117 a=MfjaFnPeirRr97d5FC5oHw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=1XWaLZrsAAAA:8 a=FOH2dFAWAAAA:8 a=VzKgKez753p4LaRha9sA:9 a=QEXdDO2ut3YA:10 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTExMDE1MiBTYWx0ZWRfX6xjIMfyhjSWo CSYkBCGrHtbQJx824jbPFk2zVT/JDqrie2qyHgjGdMPCnewJxxYD2teofEyLnSndHlgTQZN7JgR p4ncWgR2FrjcZdNqkEjgcTIY8BXk80hgfBSn2pHsMAPftYeDDqmvz14Z3BwAV+kw/IZZjntcw24 0CdgwSXVn8hzg78gS8LBXmsrWziwMtUd59PBSlf4XvhEZ7VdsfLNgMo0JiEU/k9azuaooKdRD8c aXIwc8VLflcK3y53Y3y6yD4OxatxLXfgHI8AgDnbnlzNki/mSdEOD4JT1ZFpzCuJpprbVKOFVoq 0WFfLPD8fmqQNFE8IQDkYVTa9wVT86KJOuIHkA9IH42S775aPXGM2zJDJxpLR7fO3vMSItbyYVV cOogdPZGzHWvEwnuzmaMNnFBERSBRw== X-Proofpoint-GUID: EG2Na0iztcYGmlahczIhBWa4sO9xAP2D 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=2025-11-11_03,2025-11-11_03,2025-10-01_01 VFIO selftests need to map IOVAs from legally accessible ranges, which could vary between hardware. Tests in vfio_dma_mapping_test.c are making excessively strong assumptions about which IOVAs can be mapped. Add vfio_iommu_iova_ranges(), which queries IOVA ranges from the IOMMUFD or VFIO container associated with the device. The queried ranges are normalized to IOMMUFD's iommu_iova_range representation so that handling of IOVA ranges up the stack can be implementation-agnostic. iommu_iova_range and vfio_iova_range are equivalent, so bias to using the new interface's struct. Query IOMMUFD's ranges with IOMMU_IOAS_IOVA_RANGES. Query VFIO container's ranges with VFIO_IOMMU_GET_INFO and VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANGE. The underlying vfio_iommu_type1_info buffer-related functionality has been kept generic so the same helpers can be used to query other capability chain information, if needed. Reviewed-by: David Matlack Tested-by: David Matlack Signed-off-by: Alex Mastro --- .../testing/selftests/vfio/lib/include/vfio_util.h | 8 +- tools/testing/selftests/vfio/lib/vfio_pci_device.c | 172 +++++++++++++++++= ++++ 2 files changed, 179 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/vfio/lib/include/vfio_util.h b/tools/t= esting/selftests/vfio/lib/include/vfio_util.h index 240409bf5f8a..ef8f06ef0c13 100644 --- a/tools/testing/selftests/vfio/lib/include/vfio_util.h +++ b/tools/testing/selftests/vfio/lib/include/vfio_util.h @@ -4,9 +4,12 @@ =20 #include #include -#include + +#include +#include #include #include +#include =20 #include "../../../kselftest.h" =20 @@ -206,6 +209,9 @@ struct vfio_pci_device *vfio_pci_device_init(const char= *bdf, const char *iommu_ void vfio_pci_device_cleanup(struct vfio_pci_device *device); void vfio_pci_device_reset(struct vfio_pci_device *device); =20 +struct iommu_iova_range *vfio_pci_iova_ranges(struct vfio_pci_device *devi= ce, + u32 *nranges); + int __vfio_pci_dma_map(struct vfio_pci_device *device, struct vfio_dma_region *region); int __vfio_pci_dma_unmap(struct vfio_pci_device *device, diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/tes= ting/selftests/vfio/lib/vfio_pci_device.c index a381fd253aa7..11749348f53f 100644 --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@ -29,6 +29,178 @@ VFIO_ASSERT_EQ(__ret, 0, "ioctl(%s, %s, %s) returned %d\n", #_fd, #_op, #= _arg, __ret); \ } while (0) =20 +static struct vfio_info_cap_header *next_cap_hdr(void *buf, u32 bufsz, + u32 *cap_offset) +{ + struct vfio_info_cap_header *hdr; + + if (!*cap_offset) + return NULL; + + VFIO_ASSERT_LT(*cap_offset, bufsz); + VFIO_ASSERT_GE(bufsz - *cap_offset, sizeof(*hdr)); + + hdr =3D (struct vfio_info_cap_header *)((u8 *)buf + *cap_offset); + *cap_offset =3D hdr->next; + + return hdr; +} + +static struct vfio_info_cap_header *vfio_iommu_info_cap_hdr(struct vfio_io= mmu_type1_info *info, + u16 cap_id) +{ + struct vfio_info_cap_header *hdr; + u32 cap_offset =3D info->cap_offset; + u32 max_depth; + u32 depth =3D 0; + + if (!(info->flags & VFIO_IOMMU_INFO_CAPS)) + return NULL; + + if (cap_offset) + VFIO_ASSERT_GE(cap_offset, sizeof(*info)); + + max_depth =3D (info->argsz - sizeof(*info)) / sizeof(*hdr); + + while ((hdr =3D next_cap_hdr(info, info->argsz, &cap_offset))) { + depth++; + VFIO_ASSERT_LE(depth, max_depth, "Capability chain contains a cycle\n"); + + if (hdr->id =3D=3D cap_id) + return hdr; + } + + return NULL; +} + +/* Return buffer including capability chain, if present. Free with free() = */ +static struct vfio_iommu_type1_info *vfio_iommu_get_info(struct vfio_pci_d= evice *device) +{ + struct vfio_iommu_type1_info *info; + + info =3D malloc(sizeof(*info)); + VFIO_ASSERT_NOT_NULL(info); + + *info =3D (struct vfio_iommu_type1_info) { + .argsz =3D sizeof(*info), + }; + + ioctl_assert(device->container_fd, VFIO_IOMMU_GET_INFO, info); + VFIO_ASSERT_GE(info->argsz, sizeof(*info)); + + info =3D realloc(info, info->argsz); + VFIO_ASSERT_NOT_NULL(info); + + ioctl_assert(device->container_fd, VFIO_IOMMU_GET_INFO, info); + VFIO_ASSERT_GE(info->argsz, sizeof(*info)); + + return info; +} + +/* + * Return iova ranges for the device's container. Normalize vfio_iommu_typ= e1 to + * report iommufd's iommu_iova_range. Free with free(). + */ +static struct iommu_iova_range *vfio_iommu_iova_ranges(struct vfio_pci_dev= ice *device, + u32 *nranges) +{ + struct vfio_iommu_type1_info_cap_iova_range *cap_range; + struct vfio_iommu_type1_info *info; + struct vfio_info_cap_header *hdr; + struct iommu_iova_range *ranges =3D NULL; + + info =3D vfio_iommu_get_info(device); + hdr =3D vfio_iommu_info_cap_hdr(info, VFIO_IOMMU_TYPE1_INFO_CAP_IOVA_RANG= E); + VFIO_ASSERT_NOT_NULL(hdr); + + cap_range =3D container_of(hdr, struct vfio_iommu_type1_info_cap_iova_ran= ge, header); + VFIO_ASSERT_GT(cap_range->nr_iovas, 0); + + ranges =3D calloc(cap_range->nr_iovas, sizeof(*ranges)); + VFIO_ASSERT_NOT_NULL(ranges); + + for (u32 i =3D 0; i < cap_range->nr_iovas; i++) { + ranges[i] =3D (struct iommu_iova_range){ + .start =3D cap_range->iova_ranges[i].start, + .last =3D cap_range->iova_ranges[i].end, + }; + } + + *nranges =3D cap_range->nr_iovas; + + free(info); + return ranges; +} + +/* Return iova ranges of the device's IOAS. Free with free() */ +static struct iommu_iova_range *iommufd_iova_ranges(struct vfio_pci_device= *device, + u32 *nranges) +{ + struct iommu_iova_range *ranges; + int ret; + + struct iommu_ioas_iova_ranges query =3D { + .size =3D sizeof(query), + .ioas_id =3D device->ioas_id, + }; + + ret =3D ioctl(device->iommufd, IOMMU_IOAS_IOVA_RANGES, &query); + VFIO_ASSERT_EQ(ret, -1); + VFIO_ASSERT_EQ(errno, EMSGSIZE); + VFIO_ASSERT_GT(query.num_iovas, 0); + + ranges =3D calloc(query.num_iovas, sizeof(*ranges)); + VFIO_ASSERT_NOT_NULL(ranges); + + query.allowed_iovas =3D (uintptr_t)ranges; + + ioctl_assert(device->iommufd, IOMMU_IOAS_IOVA_RANGES, &query); + *nranges =3D query.num_iovas; + + return ranges; +} + +static int iova_range_comp(const void *a, const void *b) +{ + const struct iommu_iova_range *ra =3D a, *rb =3D b; + + if (ra->start < rb->start) + return -1; + + if (ra->start > rb->start) + return 1; + + return 0; +} + +/* Return sorted IOVA ranges of the device. Free with free(). */ +struct iommu_iova_range *vfio_pci_iova_ranges(struct vfio_pci_device *devi= ce, + u32 *nranges) +{ + struct iommu_iova_range *ranges; + + if (device->iommufd) + ranges =3D iommufd_iova_ranges(device, nranges); + else + ranges =3D vfio_iommu_iova_ranges(device, nranges); + + if (!ranges) + return NULL; + + VFIO_ASSERT_GT(*nranges, 0); + + /* Sort and check that ranges are sane and non-overlapping */ + qsort(ranges, *nranges, sizeof(*ranges), iova_range_comp); + VFIO_ASSERT_LT(ranges[0].start, ranges[0].last); + + for (u32 i =3D 1; i < *nranges; i++) { + VFIO_ASSERT_LT(ranges[i].start, ranges[i].last); + VFIO_ASSERT_LT(ranges[i - 1].last, ranges[i].start); + } + + return ranges; +} + iova_t __to_iova(struct vfio_pci_device *device, void *vaddr) { struct vfio_dma_region *region; --=20 2.47.3 From nobody Sun Feb 8 09:27:18 2026 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (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 CC1AD27587D; Tue, 11 Nov 2025 18:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.153.30 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886935; cv=none; b=QDNYr9oePShlnNHZ8GEyGxVD4i7IW5iGpzA3QuyUMZSvZhilgIAK8nw5MJrE8D9yXVk5r4LHBep8oKzsftbQZ3mphl6bdTFUcSfCthFHS41GWn0Wks1yxwFOCdjelmD5aNRpU6/BCMWOHErViVW9AuPZYGTOUda+MgMPwduc7EU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886935; c=relaxed/simple; bh=0XtmbB2SY36i1Pp1D5v4+9obrUNbM8EOQuG7J4fBRoo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=L476wqj4hdU+L0eGGWKmmpg8dqh43+YYZsjCeNUHvDQQ8WHRqSuZDmBYplisHBRQ2BMVploLhmBsFj2UqBZz+Vw2aOTBwVQGvi7V2crepu3elUW8nzvwHG5su9T6ntZX72zTQz7nOhb6YU42uI95/dziS1/0bT+qU4E8d/gtcYs= 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=QBCrnVQE; arc=none smtp.client-ip=67.231.153.30 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="QBCrnVQE" Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5ABGKpnR2601076; Tue, 11 Nov 2025 10:48:48 -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=Utst7KVIWa/F56Scqc+4oMwpIO/MEqYbjt6MntaxnOM=; b=QBCrnVQEtYu7 yZ/7V2o5x9H61X1g2EhMF81jaPEjYjPY+IOsFosS3DAHPvZklpthpokB23HpSROp IagofIYnoEUu7FYYljjXAF4NvvTUHSmLqFrfy2enpK13+qCNudIAS6JQZFa05x2D KZsKQ71W4o98eOpSx90fcIqwqezDIrj/AwkAa9F6ZAJobufQ8ZZS7CRmEi6stDri jBzin7uI7JhHA5ax/bd7z9oF9oc7NV9MG791+GM/Q17tLhcHlUkfFD1EAodFGz8z qyRIIR3a7fZ1aNcg4GP9YoUl9P2QqHxyPFbqI08tBT8zj631Hvuo1uICEMtXw8mH Dtsw+JfR9w== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4ac8k51cdm-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 11 Nov 2025 10:48:48 -0800 (PST) Received: from devgpu015.cco6.facebook.com (2620:10d:c0a8:fe::f072) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.20; Tue, 11 Nov 2025 18:48:35 +0000 From: Alex Mastro Date: Tue, 11 Nov 2025 10:48:25 -0800 Subject: [PATCH v3 2/4] vfio: selftests: fix map limit tests to use last available iova 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: <20251111-iova-ranges-v3-2-7960244642c5@fb.com> References: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> In-Reply-To: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> To: Alex Williamson , David Matlack , Shuah Khan , Jason Gunthorpe CC: , , , Alex Mastro X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: U95uMc45q4D_icKTbdh7aqIt5GWq24e6 X-Authority-Analysis: v=2.4 cv=X95f6WTe c=1 sm=1 tr=0 ts=69138510 cx=c_pps a=MfjaFnPeirRr97d5FC5oHw==:117 a=MfjaFnPeirRr97d5FC5oHw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=1XWaLZrsAAAA:8 a=FOH2dFAWAAAA:8 a=6z5LghiaB1OvJCA-hK8A:9 a=QEXdDO2ut3YA:10 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTExMDE1MiBTYWx0ZWRfX4GS92S66yklG q+5TxHPbxse1w/ISBp81OSII5fVqjreYThq7OZmSvh3dPp/mxnzF/76ujDylkl6uykgvHNQYd+y y7XNScq4/l+onPSiLwjrvpHnF4Jb9eH2N6/qHDWq6dxBvKB2mbNxwqOzLbaZzexqyEwSicYWPuK M5IWgIomzsBLvGP+ognSp3bXvcbt+SSkiMUIPDQ3eBD3Xx6DOMSX0F5IUsdb1/CeGv1lu9BQR17 Tn3U+NPH6SU2u6zegIQkdoqxjJNYxvVPlVU5pCgOhhj+xnEbUsE9Xx+4hc9DNAuMLpj/WHVoHtF uwhCpn5t5LV1FUVZRr/deYQHlCQCJ2AUD0UBTVSKYcyQn81oIlAoiwLlJ0VwdW6quzl85RdVHAW eBpFiglx1Nroe+w5TJA1XuTdEUJ7ig== X-Proofpoint-GUID: U95uMc45q4D_icKTbdh7aqIt5GWq24e6 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=2025-11-11_03,2025-11-11_03,2025-10-01_01 Use the newly available vfio_pci_iova_ranges() to determine the last legal IOVA, and use this as the basis for vfio_dma_map_limit_test tests. Fixes: de8d1f2fd5a5 ("vfio: selftests: add end of address space DMA map/unm= ap tests") Reviewed-by: David Matlack Tested-by: David Matlack Signed-off-by: Alex Mastro --- tools/testing/selftests/vfio/vfio_dma_mapping_test.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c b/tools/t= esting/selftests/vfio/vfio_dma_mapping_test.c index 4f1ea79a200c..e1374aab96bd 100644 --- a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c +++ b/tools/testing/selftests/vfio/vfio_dma_mapping_test.c @@ -3,6 +3,8 @@ #include #include =20 +#include +#include #include #include #include @@ -219,7 +221,10 @@ FIXTURE_VARIANT_ADD_ALL_IOMMU_MODES(); FIXTURE_SETUP(vfio_dma_map_limit_test) { struct vfio_dma_region *region =3D &self->region; + struct iommu_iova_range *ranges; u64 region_size =3D getpagesize(); + iova_t last_iova; + u32 nranges; =20 /* * Over-allocate mmap by double the size to provide enough backing vaddr @@ -232,8 +237,13 @@ FIXTURE_SETUP(vfio_dma_map_limit_test) MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); ASSERT_NE(region->vaddr, MAP_FAILED); =20 - /* One page prior to the end of address space */ - region->iova =3D ~(iova_t)0 & ~(region_size - 1); + ranges =3D vfio_pci_iova_ranges(self->device, &nranges); + VFIO_ASSERT_NOT_NULL(ranges); + last_iova =3D ranges[nranges - 1].last; + free(ranges); + + /* One page prior to the last iova */ + region->iova =3D last_iova & ~(region_size - 1); region->size =3D region_size; } =20 @@ -276,6 +286,7 @@ TEST_F(vfio_dma_map_limit_test, overflow) struct vfio_dma_region *region =3D &self->region; int rc; =20 + region->iova =3D ~(iova_t)0 & ~(region->size - 1); region->size =3D self->mmap_size; =20 rc =3D __vfio_pci_dma_map(self->device, region); --=20 2.47.3 From nobody Sun Feb 8 09:27:18 2026 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (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 CC22F27CB35; Tue, 11 Nov 2025 18:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.153.30 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886935; cv=none; b=TSz8BobnP7l4EHGQ8O+xaIJXL1zZeTqaOKvqHNvW03DzKJM8bMcMqxc32CmrRl1Vmo9YlkjNVeA1pWFAZ3zSP4I3YKW+8A5IYIKSHsHvCTMEB9EI0lnjjRYA+feuXh6vzWUud0gG5iIPORPGNkEnz4/MtcezBoSK6BdaTrEyudI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886935; c=relaxed/simple; bh=nc+DGgEqQfqQz5WzZ4XaxStY2EfWbuj1ZktOUW2kh9c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=tYg3UgortVy5pGZ9K6/fNMqZOVm6LRozJq3eXAfD8TA8HOdng/3UQ8qqxpf/rUcoeOx177mbEPwdFmP1X0Rlj9M7zDCmWpxyzfgF90GiPlWoFRpBrGqFcwY7KmcVeJondJrkscGdrYeAiP8GJGkCmPZWyAiI13/0WWHymbUEy5o= 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=qAeKtTh1; arc=none smtp.client-ip=67.231.153.30 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="qAeKtTh1" Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5ABGKpnS2601076; Tue, 11 Nov 2025 10:48:48 -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=wT30skF+U4U+/Fon2QsJc9vYCx3RS/iEPGBkESiFPUI=; b=qAeKtTh1NEvI VwnjEsDB+lJfKepY8VJAr6TRkdp7C8gb0BMLQ1cwkSHICsHc2ouBoxY+QLp2vLZ/ C6BT5dfZsTsAhTqrfOS/aM6FGAmuLCSrheJAxjBmHBFx0uQaSMbUBjZe6kgfv5jS fyOfHtD1630szrc663JZ9Z1rHdGd/GH2Lcd19+oaq/6Jd1C2Whb74QP0FIGoxyjf ovYGeMc7k3SV0tbcv8UrGbdcHWWe8pXFM32fHwFMScr00f6eD0iPHuaQ21I6O2KP vgIrWQhonCj7+tTuMlcEObUfd6vabBWWW7Mmxdqj+sbqkzE/7tOsCTxnhR1JFc/d DrWXMkprrw== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4ac8k51cdm-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 11 Nov 2025 10:48:48 -0800 (PST) Received: from devgpu015.cco6.facebook.com (2620:10d:c0a8:fe::f072) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.20; Tue, 11 Nov 2025 18:48:35 +0000 From: Alex Mastro Date: Tue, 11 Nov 2025 10:48:26 -0800 Subject: [PATCH v3 3/4] vfio: selftests: add iova allocator 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: <20251111-iova-ranges-v3-3-7960244642c5@fb.com> References: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> In-Reply-To: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> To: Alex Williamson , David Matlack , Shuah Khan , Jason Gunthorpe CC: , , , Alex Mastro X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: 2PAs8tZLOXpDvgQvUYHO6SzQf2xuh9XW X-Authority-Analysis: v=2.4 cv=X95f6WTe c=1 sm=1 tr=0 ts=69138510 cx=c_pps a=MfjaFnPeirRr97d5FC5oHw==:117 a=MfjaFnPeirRr97d5FC5oHw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VwQbUJbxAAAA:8 a=r1p2_3pzAAAA:8 a=1XWaLZrsAAAA:8 a=FOH2dFAWAAAA:8 a=9tNaKRM82XbWTj2lM3MA:9 a=QEXdDO2ut3YA:10 a=r_pkcD-q9-ctt7trBg_g:22 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTExMDE1MiBTYWx0ZWRfX9ceOUy2+PZmE EzN23uOAgKeRjnIgItWl5oHNXF3eZ45ohX7sDBId7tGkWf4t9hpmoW7qj2rHc9ER9V/fFptdlZy Jc3gk75jbSmf2sBiLs1pY49YY1i/qAY+uXpg+e5sEYFDG+yZbONoAVQvWP5xTAjsH3KXJX2HCke AFUcv5NiDXLYwagmHx+MFWWmWdnK19NSyLVQG5T2sPDT4i3EhLNHno0xjFwTNBRP8AmhbSd4oeo srT2cQdBZzqNDWpI5dAVQ34pitoMK2cAisQKepp+rUiTmpEaK9uf1RnF5GEF7xt0jJTSbOV5ubQ MFMt2HGqMTUl+INOVfMHZ4fjPMC2LQXFvrv/R6M82BTcr5drD4auOxLufJKmG4UFq0shvnblSxz xzpTdX2I1wvcO9p0v8jJvUwsKvHQiA== X-Proofpoint-GUID: 2PAs8tZLOXpDvgQvUYHO6SzQf2xuh9XW 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=2025-11-11_03,2025-11-11_03,2025-10-01_01 Add struct iova_allocator, which gives tests a convenient way to generate legally-accessible IOVAs to map. This allocator traverses the sorted available IOVA ranges linearly, requires power-of-two size allocations, and does not support freeing iova allocations. The assumption is that tests are not IOVA space-bounded, and will not need to recycle IOVAs. This is based on Alex Williamson's patch series for adding an IOVA allocator [1]. [1] https://lore.kernel.org/all/20251108212954.26477-1-alex@shazbot.org/ Reviewed-by: David Matlack Tested-by: David Matlack Signed-off-by: Alex Mastro --- .../testing/selftests/vfio/lib/include/vfio_util.h | 11 ++++ tools/testing/selftests/vfio/lib/vfio_pci_device.c | 74 ++++++++++++++++++= +++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/vfio/lib/include/vfio_util.h b/tools/t= esting/selftests/vfio/lib/include/vfio_util.h index ef8f06ef0c13..69ec0c856481 100644 --- a/tools/testing/selftests/vfio/lib/include/vfio_util.h +++ b/tools/testing/selftests/vfio/lib/include/vfio_util.h @@ -188,6 +188,13 @@ struct vfio_pci_device { struct vfio_pci_driver driver; }; =20 +struct iova_allocator { + struct iommu_iova_range *ranges; + u32 nranges; + u32 range_idx; + u64 range_offset; +}; + /* * Return the BDF string of the device that the test should use. * @@ -212,6 +219,10 @@ void vfio_pci_device_reset(struct vfio_pci_device *dev= ice); struct iommu_iova_range *vfio_pci_iova_ranges(struct vfio_pci_device *devi= ce, u32 *nranges); =20 +struct iova_allocator *iova_allocator_init(struct vfio_pci_device *device); +void iova_allocator_cleanup(struct iova_allocator *allocator); +iova_t iova_allocator_alloc(struct iova_allocator *allocator, size_t size); + int __vfio_pci_dma_map(struct vfio_pci_device *device, struct vfio_dma_region *region); int __vfio_pci_dma_unmap(struct vfio_pci_device *device, diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/tes= ting/selftests/vfio/lib/vfio_pci_device.c index 11749348f53f..b479a359da12 100644 --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@ -12,11 +12,12 @@ #include =20 #include +#include #include #include +#include #include #include -#include =20 #include "../../../kselftest.h" #include @@ -201,6 +202,77 @@ struct iommu_iova_range *vfio_pci_iova_ranges(struct v= fio_pci_device *device, return ranges; } =20 +struct iova_allocator *iova_allocator_init(struct vfio_pci_device *device) +{ + struct iova_allocator *allocator; + struct iommu_iova_range *ranges; + u32 nranges; + + ranges =3D vfio_pci_iova_ranges(device, &nranges); + VFIO_ASSERT_NOT_NULL(ranges); + + allocator =3D malloc(sizeof(*allocator)); + VFIO_ASSERT_NOT_NULL(allocator); + + *allocator =3D (struct iova_allocator){ + .ranges =3D ranges, + .nranges =3D nranges, + .range_idx =3D 0, + .range_offset =3D 0, + }; + + return allocator; +} + +void iova_allocator_cleanup(struct iova_allocator *allocator) +{ + free(allocator->ranges); + free(allocator); +} + +iova_t iova_allocator_alloc(struct iova_allocator *allocator, size_t size) +{ + VFIO_ASSERT_GT(size, 0, "Invalid size arg, zero\n"); + VFIO_ASSERT_EQ(size & (size - 1), 0, "Invalid size arg, non-power-of-2\n"= ); + + for (;;) { + struct iommu_iova_range *range; + iova_t iova, last; + + VFIO_ASSERT_LT(allocator->range_idx, allocator->nranges, + "IOVA allocator out of space\n"); + + range =3D &allocator->ranges[allocator->range_idx]; + iova =3D range->start + allocator->range_offset; + + /* Check for sufficient space at the current offset */ + if (check_add_overflow(iova, size - 1, &last) || + last > range->last) + goto next_range; + + /* Align iova to size */ + iova =3D last & ~(size - 1); + + /* Check for sufficient space at the aligned iova */ + if (check_add_overflow(iova, size - 1, &last) || + last > range->last) + goto next_range; + + if (last =3D=3D range->last) { + allocator->range_idx++; + allocator->range_offset =3D 0; + } else { + allocator->range_offset =3D last - range->start + 1; + } + + return iova; + +next_range: + allocator->range_idx++; + allocator->range_offset =3D 0; + } +} + iova_t __to_iova(struct vfio_pci_device *device, void *vaddr) { struct vfio_dma_region *region; --=20 2.47.3 From nobody Sun Feb 8 09:27:18 2026 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) (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 30D2729BDAC; Tue, 11 Nov 2025 18:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.153.30 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886935; cv=none; b=l61XYINeBDg/pm5BvYJExtdFbNa0o+GNawPLVDEPrfUXorUZdbX0ziM6GYA/lRHinqBinqtMGE7eSkbIYZI43Cuo4WFzLRG2wFucxqaN6DS7SmfVRRl+GdU8nFJftEc+BQhqNfpF1nOOWWZ4IPYm3cJXhjFcNkXAjM6cogrpfNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762886935; c=relaxed/simple; bh=XaAbEe2qedf2XRV3s2dfM+FiD4+y5ooxNwFcuE3dzCA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=IomRihghuML92zk+H7LJJjjhRS/4LZmcEiJ0xIU48wPhBTRrXxNiww/DLFLJMDMEcuN69Z8Eze49vTEb7VtFcfZ8tRf4sDBz8Aljq+9whjktNGrKy4WU1Sn9kxSbkWa/CzxclyYzbYb5SDVVb2yHxXD1NG4K3i9VQx1P82NWOmM= 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=pcbcaOt+; arc=none smtp.client-ip=67.231.153.30 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="pcbcaOt+" Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5ABGKpnT2601076; Tue, 11 Nov 2025 10:48:49 -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=C6Syl/saA4CzZdd/MCSZCKwchjl4BKuY26Fv5OT+iOU=; b=pcbcaOt++GnR QrpAxzpq2gmQuEnjiyw22dBr806LzxTXSbV2FdHg+8+FNZoPhcjd5tm7e/OgXsUx JwQPAAgwtSw1BjQPuTnZMTYEelwwPwmC5WsYZLMpCDj+TtIxa5tN4oecRZ2FK2mV sY/4PNUvBOoC2vKPYUHgMaa2JxzQ5+CmANRIk95mpAv4MTWK0VPYNHc+7YVgoQMW VtUud9WHkorjWQuJVM0vGqxYx7yy/RsW+97if0nybCCqXAeWhL7RRJ8+afkDsOPW hFKYiBAtJp8iyXFo9O8NaiiLZLwK/bCBef2wQpxifHHVSWDkwsajiGUs/J5F+LyT UaL/fWMMPw== Received: from maileast.thefacebook.com ([163.114.135.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 4ac8k51cdm-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 11 Nov 2025 10:48:48 -0800 (PST) Received: from devgpu015.cco6.facebook.com (2620:10d:c0a8:fe::f072) by mail.thefacebook.com (2620:10d:c0a9:6f::237c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.20; Tue, 11 Nov 2025 18:48:36 +0000 From: Alex Mastro Date: Tue, 11 Nov 2025 10:48:27 -0800 Subject: [PATCH v3 4/4] vfio: selftests: replace iova=vaddr with allocated iovas 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: <20251111-iova-ranges-v3-4-7960244642c5@fb.com> References: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> In-Reply-To: <20251111-iova-ranges-v3-0-7960244642c5@fb.com> To: Alex Williamson , David Matlack , Shuah Khan , Jason Gunthorpe CC: , , , Alex Mastro X-Mailer: b4 0.13.0 X-Proofpoint-ORIG-GUID: ODaj3tp_75R0wsR46t6-F38Tyq2Ennq7 X-Authority-Analysis: v=2.4 cv=X95f6WTe c=1 sm=1 tr=0 ts=69138510 cx=c_pps a=MfjaFnPeirRr97d5FC5oHw==:117 a=MfjaFnPeirRr97d5FC5oHw==:17 a=IkcTkHD0fZMA:10 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=1XWaLZrsAAAA:8 a=FOH2dFAWAAAA:8 a=nYNqVF6_RSbOQ5eVvY4A:9 a=QEXdDO2ut3YA:10 a=cPQSjfK2_nFv0Q5t_7PE:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTExMDE1MiBTYWx0ZWRfX6ScbTR1FAQw5 kMFbnDL65BMrwHKHJsk0qO1xS/3caUxDO7IvSdq67XabZpE7Vmwgh+MjpOGbkBfUl9Zo/pq0neB QrSS4/6dVT0wsBE8sCFC/+uIdYM8R7aA93gj+VtfQCX8q1gww0+YWXdQ4hCGaG9WTmVjYrW4+WO w7ppSS8d+Dd/RH/J2TpIqJ7d461qdxTWyWQe63MyOfpA1ELTyaHm+1h6/ctoJKpD64dLe3O3SBt vXYSnpYFBm7eUiIKb0Aa+iZlDj1BUJR9tQTKLPZJ/sTSezuMpnunAYgEAKXcF/IWeazse+dY81n dEMOeQr7Yjkh1UmwXE65uro4+PH6JjXDqdZBGDoyCunpqHFXHy90077P0JUuxUOVcVx1rOE5jvP N/uq2hG30b0YCw5GKLaaN2w6VX8yQA== X-Proofpoint-GUID: ODaj3tp_75R0wsR46t6-F38Tyq2Ennq7 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=2025-11-11_03,2025-11-11_03,2025-10-01_01 vfio_dma_mapping_test and vfio_pci_driver_test currently use iova=3Dvaddr as part of DMA mapping operations. However, not all IOMMUs support the same virtual address width as the processor. For instance, older Intel consumer platforms only support 39-bits of IOMMU address space. On such platforms, using the virtual address as the IOVA fails. Make the tests more robust by using iova_allocator to vend IOVAs, which queries legally accessible IOVAs from the underlying IOMMUFD or VFIO container. Reviewed-by: David Matlack Tested-by: David Matlack Signed-off-by: Alex Mastro --- tools/testing/selftests/vfio/vfio_dma_mapping_test.c | 5 ++++- tools/testing/selftests/vfio/vfio_pci_driver_test.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c b/tools/t= esting/selftests/vfio/vfio_dma_mapping_test.c index e1374aab96bd..102603d4407d 100644 --- a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c +++ b/tools/testing/selftests/vfio/vfio_dma_mapping_test.c @@ -95,6 +95,7 @@ static int iommu_mapping_get(const char *bdf, u64 iova, =20 FIXTURE(vfio_dma_mapping_test) { struct vfio_pci_device *device; + struct iova_allocator *iova_allocator; }; =20 FIXTURE_VARIANT(vfio_dma_mapping_test) { @@ -119,10 +120,12 @@ FIXTURE_VARIANT_ADD_ALL_IOMMU_MODES(anonymous_hugetlb= _1gb, SZ_1G, MAP_HUGETLB | FIXTURE_SETUP(vfio_dma_mapping_test) { self->device =3D vfio_pci_device_init(device_bdf, variant->iommu_mode); + self->iova_allocator =3D iova_allocator_init(self->device); } =20 FIXTURE_TEARDOWN(vfio_dma_mapping_test) { + iova_allocator_cleanup(self->iova_allocator); vfio_pci_device_cleanup(self->device); } =20 @@ -144,7 +147,7 @@ TEST_F(vfio_dma_mapping_test, dma_map_unmap) else ASSERT_NE(region.vaddr, MAP_FAILED); =20 - region.iova =3D (u64)region.vaddr; + region.iova =3D iova_allocator_alloc(self->iova_allocator, size); region.size =3D size; =20 vfio_pci_dma_map(self->device, ®ion); diff --git a/tools/testing/selftests/vfio/vfio_pci_driver_test.c b/tools/te= sting/selftests/vfio/vfio_pci_driver_test.c index 2dbd70b7db62..f69eec8b928d 100644 --- a/tools/testing/selftests/vfio/vfio_pci_driver_test.c +++ b/tools/testing/selftests/vfio/vfio_pci_driver_test.c @@ -19,6 +19,7 @@ static const char *device_bdf; } while (0) =20 static void region_setup(struct vfio_pci_device *device, + struct iova_allocator *iova_allocator, struct vfio_dma_region *region, u64 size) { const int flags =3D MAP_SHARED | MAP_ANONYMOUS; @@ -29,7 +30,7 @@ static void region_setup(struct vfio_pci_device *device, VFIO_ASSERT_NE(vaddr, MAP_FAILED); =20 region->vaddr =3D vaddr; - region->iova =3D (u64)vaddr; + region->iova =3D iova_allocator_alloc(iova_allocator, size); region->size =3D size; =20 vfio_pci_dma_map(device, region); @@ -44,6 +45,7 @@ static void region_teardown(struct vfio_pci_device *devic= e, =20 FIXTURE(vfio_pci_driver_test) { struct vfio_pci_device *device; + struct iova_allocator *iova_allocator; struct vfio_dma_region memcpy_region; void *vaddr; int msi_fd; @@ -72,14 +74,15 @@ FIXTURE_SETUP(vfio_pci_driver_test) struct vfio_pci_driver *driver; =20 self->device =3D vfio_pci_device_init(device_bdf, variant->iommu_mode); + self->iova_allocator =3D iova_allocator_init(self->device); =20 driver =3D &self->device->driver; =20 - region_setup(self->device, &self->memcpy_region, SZ_1G); - region_setup(self->device, &driver->region, SZ_2M); + region_setup(self->device, self->iova_allocator, &self->memcpy_region, SZ= _1G); + region_setup(self->device, self->iova_allocator, &driver->region, SZ_2M); =20 /* Any IOVA that doesn't overlap memcpy_region and driver->region. */ - self->unmapped_iova =3D 8UL * SZ_1G; + self->unmapped_iova =3D iova_allocator_alloc(self->iova_allocator, SZ_1G); =20 vfio_pci_driver_init(self->device); self->msi_fd =3D self->device->msi_eventfds[driver->msi]; @@ -108,6 +111,7 @@ FIXTURE_TEARDOWN(vfio_pci_driver_test) region_teardown(self->device, &self->memcpy_region); region_teardown(self->device, &driver->region); =20 + iova_allocator_cleanup(self->iova_allocator); vfio_pci_device_cleanup(self->device); } =20 --=20 2.47.3