From nobody Mon Dec 1 22:34:42 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C47B534A783 for ; Wed, 26 Nov 2025 23:18:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764199090; cv=none; b=RSfJ8mC42FabkP95ek4bcwxPeBsm9z4GWnNr/rNBO3AThevzyzayKb3mAINRPkz6n/oW/vkYZQ7NPcWr12SZtVANXEJt66jT0L/Y1E3k8MXCTPe+x78eQjEere6Tu3NJssTfAbnxffPY4H6Qj1VvUEt9qJR3H+exxEjT9TwQaMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764199090; c=relaxed/simple; bh=WpySdpWplIFkyFjdRPH8mjnIr8ZWwugcwAyYN9dmoGA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PcLeurci9rhNSJwDVVf1h+endi+0TtXUlG9Y9tup2SWCwLMDx/Rys8bK9vSmSiSCPQV/i6Z8gtBgfyIR7e4zxtrQuUwEJO95ujCJ6DkvP+O5BvLUuy/Bw7DY5Dt2aEV5bcdlsIQVYZ38eY1K4GIBlPIhQVh0eWTBReXkjo/v4ZE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wePGeV1N; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--dmatlack.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wePGeV1N" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-7b9321b9312so400887b3a.1 for ; Wed, 26 Nov 2025 15:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764199088; x=1764803888; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=W+pnV+aPRrlLst9nvfnueF4Po9qU0QkYO4ZzZSMG/yA=; b=wePGeV1N2xD+JfemPLRC4NW0f3uLCt0Aqy/+wI3XffuXrbwplTY04zEdET/LSxWEBb W2N8G6JxjjrppO0zGXyyTDlDuS/j3HvWqpLMb4MPOY49nIzHEHLe/Epx1gak0bF2XwJ5 6XuDpFHQQ41f891P8kfSwdjANGAwE5x48WGqdR/h8WhjOAIAtO3IxNP/fIIsvyqFMRDX RiRJkUNe0e0K6h/KUuEJLc2UxDPGNPk0b7OESwiRYbdSE0cC0Vd3hl38mqK+s40SwH1n mGi68gwFQO/YwN5v6I17uG2wm89rdnQFKyz4aqxvbBmmTV6n3AzrYZ+EWlYWLtQa5OIC soKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764199088; x=1764803888; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=W+pnV+aPRrlLst9nvfnueF4Po9qU0QkYO4ZzZSMG/yA=; b=LPlHIT9Y6aaoSq5ZYmsVeFmfem+eUFFhvQB/1fPtJhatWeiT+Wc7CaCgx0ILMc2f8H Q7pJI3sdbyW5lszX6Kp6ymkCDc1DtxhwAU/kQZtCcr8D92mGcD1Qx/TgEk5olXZa+3Rf woQ7kkOvAJDRGHsd534VtWOMXVB3LPa5d13ZPpjyPta1lKsUgEcp5TGzZOtMYtF+48Lu RKQioqgAaYDu31L10RiKHvIhGOggbQHd3hCGUajH9hg3o3sRM/vevFt6BuUet8A0GULP pH/vITs7r9HLflkZBJuXfuRQj3vla9Xj1gMvYUjRBmDuGkkqtFLkQUv7r1lk71hnlrLb satQ== X-Forwarded-Encrypted: i=1; AJvYcCVn006zfxOKORE07j0MnCwj9/xrlxi/bLomTKi4vVZIsabeAEdKrO4vfAszZVTX+LbBmy1bA0cKjHoKv0I=@vger.kernel.org X-Gm-Message-State: AOJu0YwWh1UQTtg9ZhAaUERV3gu+zB254w6CfU394+gki/wFyou61bJf kTcoEf+QY3plVfjK0duyuBR/EuPGStL9LaC3yKhLe8Ue4u62ErWNy0KeGX3Phy5HTkL1HreEK+d 1gk6vfA+kw4l1jQ== X-Google-Smtp-Source: AGHT+IFuic0ctn0G24phSOJnRXkr3T8Tckl/kQVJBgvphMjPTbTwnjLR0jMKiGqJ+NLnuaO7uN+8Wbs7AMCmPA== X-Received: from pfbfj11.prod.google.com ([2002:a05:6a00:3a0b:b0:7b0:e3d3:f03e]) (user=dmatlack job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2e82:b0:7aa:9723:3217 with SMTP id d2e1a72fcca58-7c58e40f6dcmr19685166b3a.25.1764199088215; Wed, 26 Nov 2025 15:18:08 -0800 (PST) Date: Wed, 26 Nov 2025 23:17:32 +0000 In-Reply-To: <20251126231733.3302983-1-dmatlack@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251126231733.3302983-1-dmatlack@google.com> X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog Message-ID: <20251126231733.3302983-18-dmatlack@google.com> Subject: [PATCH v4 17/18] vfio: selftests: Eliminate INVALID_IOVA From: David Matlack To: Alex Williamson Cc: Alex Mastro , David Matlack , Jason Gunthorpe , Josh Hilke , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Raghavendra Rao Ananta , Vipin Sharma Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Eliminate INVALID_IOVA as there are platforms where UINT64_MAX is a valid iova. Reviewed-by: Alex Mastro Tested-by: Alex Mastro Reviewed-by: Raghavendra Rao Ananta Signed-off-by: David Matlack --- .../selftests/vfio/lib/include/libvfio/iommu.h | 3 +-- .../vfio/lib/include/libvfio/vfio_pci_device.h | 4 ++-- tools/testing/selftests/vfio/lib/iommu.c | 14 +++++++++----- .../testing/selftests/vfio/vfio_dma_mapping_test.c | 2 +- 4 files changed, 13 insertions(+), 10 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 e35f13ed3f3c..5c9b9dc6d993 100644 --- a/tools/testing/selftests/vfio/lib/include/libvfio/iommu.h +++ b/tools/testing/selftests/vfio/lib/include/libvfio/iommu.h @@ -8,7 +8,6 @@ #include =20 typedef u64 iova_t; -#define INVALID_IOVA UINT64_MAX =20 struct iommu_mode { const char *name; @@ -57,7 +56,7 @@ static inline void iommu_unmap_all(struct iommu *iommu) VFIO_ASSERT_EQ(__iommu_unmap_all(iommu, NULL), 0); } =20 -iova_t __iommu_hva2iova(struct iommu *iommu, void *vaddr); +int __iommu_hva2iova(struct iommu *iommu, void *vaddr, iova_t *iova); iova_t iommu_hva2iova(struct iommu *iommu, void *vaddr); =20 struct iommu_iova_range *iommu_iova_ranges(struct iommu *iommu, u32 *nrang= es); diff --git a/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_devi= ce.h b/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h index 160e003131d6..2858885a89bb 100644 --- a/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h +++ b/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h @@ -103,9 +103,9 @@ static inline void vfio_pci_msix_disable(struct vfio_pc= i_device *device) vfio_pci_irq_disable(device, VFIO_PCI_MSIX_IRQ_INDEX); } =20 -static inline iova_t __to_iova(struct vfio_pci_device *device, void *vaddr) +static inline int __to_iova(struct vfio_pci_device *device, void *vaddr, i= ova_t *iova) { - return __iommu_hva2iova(device->iommu, vaddr); + return __iommu_hva2iova(device->iommu, vaddr, iova); } =20 static inline iova_t to_iova(struct vfio_pci_device *device, void *vaddr) diff --git a/tools/testing/selftests/vfio/lib/iommu.c b/tools/testing/selft= ests/vfio/lib/iommu.c index 52f9cdf5f171..8079d43523f3 100644 --- a/tools/testing/selftests/vfio/lib/iommu.c +++ b/tools/testing/selftests/vfio/lib/iommu.c @@ -67,7 +67,7 @@ static const struct iommu_mode *lookup_iommu_mode(const c= har *iommu_mode) VFIO_FAIL("Unrecognized IOMMU mode: %s\n", iommu_mode); } =20 -iova_t __iommu_hva2iova(struct iommu *iommu, void *vaddr) +int __iommu_hva2iova(struct iommu *iommu, void *vaddr, iova_t *iova) { struct dma_region *region; =20 @@ -78,18 +78,22 @@ iova_t __iommu_hva2iova(struct iommu *iommu, void *vadd= r) if (vaddr >=3D region->vaddr + region->size) continue; =20 - return region->iova + (vaddr - region->vaddr); + if (iova) + *iova =3D region->iova + (vaddr - region->vaddr); + + return 0; } =20 - return INVALID_IOVA; + return -ENOENT; } =20 iova_t iommu_hva2iova(struct iommu *iommu, void *vaddr) { iova_t iova; + int ret; =20 - iova =3D __iommu_hva2iova(iommu, vaddr); - VFIO_ASSERT_NE(iova, INVALID_IOVA, "%p is not mapped into IOMMU\n", vaddr= ); + ret =3D __iommu_hva2iova(iommu, vaddr, &iova); + VFIO_ASSERT_EQ(ret, 0, "%p is not mapped into the iommu\n", vaddr); =20 return iova; } diff --git a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c b/tools/t= esting/selftests/vfio/vfio_dma_mapping_test.c index 213fcd8dcc79..5397822c3dd4 100644 --- a/tools/testing/selftests/vfio/vfio_dma_mapping_test.c +++ b/tools/testing/selftests/vfio/vfio_dma_mapping_test.c @@ -199,7 +199,7 @@ TEST_F(vfio_dma_mapping_test, dma_map_unmap) ASSERT_EQ(rc, 0); ASSERT_EQ(unmapped, region.size); printf("Unmapped IOVA 0x%lx\n", region.iova); - ASSERT_EQ(INVALID_IOVA, __to_iova(self->device, region.vaddr)); + ASSERT_NE(0, __to_iova(self->device, region.vaddr, NULL)); ASSERT_NE(0, iommu_mapping_get(device_bdf, region.iova, &mapping)); =20 ASSERT_TRUE(!munmap(region.vaddr, size)); --=20 2.52.0.487.g5c8c507ade-goog