From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.178 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792622382; b=WMthJX+BXQVSu8z7qmDPxLFNwZcg1toKB1PVDFgrapdRUF2lnKtind4nDBhmuuiwDarp iqYSwIJdOY9junoX0cJXtJPhChehYWO8ZNwvOL0H9QIzXsTD5yWO/hDaUHqVKLd732NnT zZzllgplKtJB3p/vOvAZQUAzkDa94tb4qi+H8wYXnIHi7o4lhza9EkyXRh1MK5gi5pbS+ eLEPxcuDTHRrCFHwOL33kqu2K1ThxN1vVzWsDx49E2nmbHFwKidkcN2ZNkFNI5sxT56Gl in1EflJcbRE4fqGsJYEbUVc6+MediPVXUOKrHPyWmp7WtfOciSZNVBhBUB+lKSGjcrA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792622382; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; bh=DXLtP8iji/E6g+v1wNlt1USSNo7BmW/WXCZuZX1tS6I=; b=IkqDfYbYJlaiUDaCewwadX5vGR0qpqgjCsmv9h0vIn6VZoi7uc/xt8LakhUmUUbR/Wm+ OE0komCSAiYKFX9b7Ta9Z3NCs5ZVrQcbc0hcMbQYylN58E9ZdKlOxKA1Kl8WLD6Q3j+kt DMscji12oYuMshF14P8sU7swhGIf2dNxbQ8n5oP1tWqrEfeDljRN3gaTenuDaAM6InEgo thM2vSZFmsHJD/ekGvlMGZ114YY5GQtWySInQqMM4+GP9lwnTAQtrGuDy+WdE0AYdFrhl WNrKcHww4jJ8W4alOb6Fr+nZR7bxidKzice6Wp5BdnVwA2BlCK9oNAhP4zmfQHMtGcw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=ZI9gjShp; arc=none smtp.remote-ip=209.85.214.178 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FC5A606A324 for ; Wed, 21 Oct 2026 22:39:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 4FC5A606A324 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=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=ZI9gjShp Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2e9eb579c0eso7138475ad.3 for ; Wed, 21 Oct 2026 15:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792622380; x=1793227180; darn=lists.linux.dev; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=DXLtP8iji/E6g+v1wNlt1USSNo7BmW/WXCZuZX1tS6I=; b=ZI9gjShp+tRzMMPfnUoBivCZdcIrHJ6SldHmc5nZL6XKpuesp9mv4GwOUADeRylMGQ 2HT4OiCSboIbu9/fkiaLGFv2+LxemR1jSpuNeR9JJwQkr4KBWSecz3eCF5efos+Ph8ad GBUQt/610CpG69ct3i6C9QYdGo/Wj1seQWGVZalNS873OXPKXi8NjDNd78XmLVtN9ArW C/+Uh6UfMomfyKwfGTJgwnB9f3lOx34c4RBNQK+VsUARn7XvQOA6zzC2o3QdGX/mtgjz 8JqQtn2/vOrHIU1UspN8HNMjlTNUMJpFHEo50ObebdYMjISPpxSvcyf9SvYdzifQEPAh Noow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792622380; x=1793227180; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=DXLtP8iji/E6g+v1wNlt1USSNo7BmW/WXCZuZX1tS6I=; b=rzD3pB0j0LmAu8B1ogF/0Tgmx74PFDpydOHnAr7MW9U17HIj/4s5sYQuXyZ4ILOJEz +CRaB2rpD+TdEZWsT9aLOEiAL8Kg56SswOrYppAm7uErhZmmZSDDP+1VJfOvdRkaMFmE 97E5SUGRD3y7AtdXHmleWKCmhuBoatCv6+Dw6eYW2jogXKLOLLvR0lRRXpTI+HqFpTMn a/gwufJNrhobEKpR8f9LpCO9IP5hs8xSwacB8s3fPdKEBwih+XEk0bhKK2uRIRDiC8YV uVBBau7wCGCSLhUqnPOkex5ddeKXt8FY+tmGg8d7FYw0gJrLJwMgw8vEJo45dbM3WP6S epdg== X-Forwarded-Encrypted: i=1; AKwUvBy0o2bRgWKvvFxO3AHG9SVbCeByLp/iIpfZTXUOC7QkSpy8HC3Pw/xc3szeG4m1qLwL7iHKxw==@lists.linux.dev X-Gm-Message-State: AFq9FYIDB7HFfy3mu8166zH3AA/8LaVu/lOtCpxzAYwA0ptTJl925OYN c+r4/Tu1VSsYlrgoftxEiJCmF5dLZcaXZmmZ+JhbGoxlAabmMUKIQBOAFhhYXN4slQ== X-Gm-Gg: AYBFou2b+cqsYh8jkBPaZZJy5TnwH49vgMz7X0KVqDzEHOs1L8Zgqd/XKI9GFPufwhl +7h9yBPskZvFcsrSzc8LEwJnxk3ezSlx0+v5Aww8hRYSWgZOROFvfrASwHYwgqsZ/iPe/eyMqIa Vysiyumr3vxkqw1nJEvPwF8ja0LltyHPT73snnQWyLUtNVsrMH/lzOuDNJ5m9V5Srk7Q72xFcT9 tcbL+pccMnqcyXE14TaDS2oEArcWIkVVZq3gP6KGa+ITazIa24N/OXyYYBSnQoVWKVpFy0wXR5U tHFW158mNw65vuNMxYdKbD1C4QkONbJ/J2P7uqqo2VyT9iHAbzFf+LKjw+dyt9sEsJxlYS7kpLL PVIv5ogyDwcOtqrgKtQ27uQ+Vqy+5LZZzSA2tz4v49Ok5O+kL+hwrEHMoFetx4sorH6pRd9HJc9 1QcUA2Spu+GIt0qkFHkO5TxGnP0dLPM+SHi0h545Af9STHF/8qAxK4TaBOpU3RGstUUvulE0ofL XOGCmX/ZwJ48cK9WQ1puvL2jbebicoqKh4m5yIpXF5s42PQzhta61vX83DAhvfKMWRsUu1mKxAE NQpNYM73wDQ2MXrW X-Received: by 2002:a17:903:144e:b0:2dd:c053:82f6 with SMTP id d9443c01a7336-2ea43fe27cemr24610525ad.45.1792622379947; Wed, 21 Oct 2026 15:39:39 -0700 (PDT) Received: from google.com (64.75.127.34.bc.googleusercontent.com. [34.127.75.64]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ea3b4ada65sm15769465ad.73.2026.10.21.15.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Oct 2026 15:39:38 -0700 (PDT) Date: Wed, 21 Oct 2026 22:39:34 +0000 From: David Matlack To: Samiullah Khawaja Cc: Joerg Roedel , Will Deacon , Jason Gunthorpe , Robin Murphy , Kevin Tian , Alex Williamson , iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pasha Tatashin , Lu Baolu , Pranjal Shrivastava Subject: Re: [RFC PATCH 2/3] vfio: selftests: Add iommufd hwpt replace test Message-ID: References: <20260925011308.3381953-1-skhawaja@google.com> <20260925011308.3381953-3-skhawaja@google.com> X-Mailing-List: iommu@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260925011308.3381953-3-skhawaja@google.com> On 2026-09-25 01:13 AM, Samiullah Khawaja wrote: > Add a test that does iommufd hwpt replace while a DMA is ongoing. This > verifies the hitless replace of IOMMU domain without disrupting the DMA. > > Note that the new domain is attached after mapping the required DMA > memory at the same IOVA in the new domain. > > Signed-off-by: Samiullah Khawaja Aside from the MODE_IOMMUFD nit, Reviewed-by: David Matlack > --- > tools/testing/selftests/vfio/Makefile | 1 + > .../vfio/vfio_iommufd_hwpt_replace_test.c | 171 ++++++++++++++++++ > 2 files changed, 172 insertions(+) > create mode 100644 tools/testing/selftests/vfio/vfio_iommufd_hwpt_replace_test.c > > diff --git a/tools/testing/selftests/vfio/Makefile b/tools/testing/selftests/vfio/Makefile > index 2c32c48db509..01d0e808871b 100644 > --- a/tools/testing/selftests/vfio/Makefile > +++ b/tools/testing/selftests/vfio/Makefile > @@ -8,6 +8,7 @@ else > CFLAGS = $(KHDR_INCLUDES) > TEST_GEN_PROGS += vfio_dma_mapping_test > TEST_GEN_PROGS += vfio_dma_mapping_mmio_test > +TEST_GEN_PROGS += vfio_iommufd_hwpt_replace_test > TEST_GEN_PROGS += vfio_iommufd_setup_test > TEST_GEN_PROGS += vfio_pci_device_test > TEST_GEN_PROGS += vfio_pci_device_init_perf_test > diff --git a/tools/testing/selftests/vfio/vfio_iommufd_hwpt_replace_test.c b/tools/testing/selftests/vfio/vfio_iommufd_hwpt_replace_test.c > new file mode 100644 > index 000000000000..3ec243aae626 > --- /dev/null > +++ b/tools/testing/selftests/vfio/vfio_iommufd_hwpt_replace_test.c > @@ -0,0 +1,171 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +#include > +#include > +#include > + > +#include > +#include > + > +#include > + > +#include "kselftest_harness.h" > + > +static const char *device_bdf; > + > +static void region_setup(struct iommu *iommu, > + struct iova_allocator *iova_allocator, > + struct dma_region *region, u64 size) > +{ > + const int flags = MAP_SHARED | MAP_ANONYMOUS; > + const int prot = PROT_READ | PROT_WRITE; > + void *vaddr; > + > + vaddr = mmap(NULL, size, prot, flags, -1, 0); > + VFIO_ASSERT_NE(vaddr, MAP_FAILED); > + > + region->vaddr = vaddr; > + region->iova = iova_allocator_alloc(iova_allocator, size); > + region->size = size; > + > + iommu_map(iommu, region); > +} > + > +static void region_teardown(struct iommu *iommu, struct dma_region *region) > +{ > + iommu_unmap(iommu, region); > + VFIO_ASSERT_EQ(munmap(region->vaddr, region->size), 0); > +} > + > +FIXTURE(vfio_iommufd_replace_hwpt_test) { > + struct iommu *iommu; > + struct vfio_pci_device *device; > + struct iova_allocator *iova_allocator; > + struct dma_region memcpy_region; > + > + u64 size; > + void *src; > + void *dst; > + iova_t src_iova; > + iova_t dst_iova; > +}; > + > +FIXTURE_SETUP(vfio_iommufd_replace_hwpt_test) > +{ > + struct vfio_pci_driver *driver; > + > + self->iommu = iommu_init("iommufd"); nit: iommu_init(MODE_IOMMUFD) This needs to be fixed in iommufd_iommu_init() in the previous patch as well. > + self->device = vfio_pci_device_init(device_bdf, self->iommu); > + self->iova_allocator = iova_allocator_init(self->iommu); > + > + driver = &self->device->driver; > + > + region_setup(self->iommu, self->iova_allocator, &self->memcpy_region, SZ_2M); > + region_setup(self->iommu, self->iova_allocator, &driver->region, SZ_2M); The driver->region.size is now populated automatically based on what the driver needs. So you can just pass in driver->region.size here instead of hard-coding SZ_2M. > + > + if (driver->ops) > + vfio_pci_driver_init(self->device); > + > + self->size = self->memcpy_region.size / 2; > + self->src = self->memcpy_region.vaddr; > + self->dst = self->src + self->size; > + > + self->src_iova = to_iova(self->device, self->src); > + self->dst_iova = to_iova(self->device, self->dst); > +} > + > +FIXTURE_TEARDOWN(vfio_iommufd_replace_hwpt_test) > +{ > + struct vfio_pci_driver *driver = &self->device->driver; > + > + if (driver->ops) > + vfio_pci_driver_remove(self->device); > + > + region_teardown(self->iommu, &self->memcpy_region); > + region_teardown(self->iommu, &driver->region); > + > + iova_allocator_cleanup(self->iova_allocator); > + vfio_pci_device_cleanup(self->device); > + iommu_cleanup(self->iommu); > +} > + > +FIXTURE_VARIANT(vfio_iommufd_replace_hwpt_test) { > + u32 attaches; > +}; > + > +FIXTURE_VARIANT_ADD(vfio_iommufd_replace_hwpt_test, domain_replace) { > + .attaches = 1000, Maybe we should replace memcpy_wait() with memcpy_poll() and move the wait loop out into the generic driver layer (vfio_pci_driver.c) repeatedly calling memcpy_poll(). The would let you do replaces until the memcpy is done instead of hard-coding a random number, and also lift more code out of the the drivers and into the generic core. It should be easy enough to swap the drivers from wait() to poll() model if you are feeling up for it. Not a blocker for this series though. > +}; > + > +FIXTURE_VARIANT_ADD(vfio_iommufd_replace_hwpt_test, noreplace) { > + .attaches = 0, > +}; > + > +TEST_F_TIMEOUT(vfio_iommufd_replace_hwpt_test, memcpy, 120) > +{ > + struct dma_region memcpy_region = {}, driver_region = {}; > + struct vfio_pci_driver *driver = &self->device->driver; > + struct iommu *iommu2 = NULL; > + u64 size = 0; > + int ret; > + u32 i; > + > + if (variant->attaches) { > + iommu2 = iommufd_iommu_init(self->iommu->iommufd, > + self->device->dev_id); > + > + memcpy_region = self->memcpy_region; > + driver_region = self->device->driver.region; > + > + iommu_map(iommu2, &memcpy_region); > + iommu_map(iommu2, &driver_region); > + } > + > + if (driver->ops) { > + memset(self->src, 'x', self->size); > + memset(self->dst, 'y', self->size); > + > + size = min_t(u64, driver->max_memcpy_size, self->size); > + > + /* > + * Fill the device's queue. memcpy_start() returns with > + * max_memcpy_count transfers still outstanding. > + */ > + vfio_pci_driver_memcpy_start(self->device, > + self->src_iova, > + self->dst_iova, > + size, driver->max_memcpy_count); > + } > + > + /* > + * Replace the domain repeatedly while that transfer is in flight. Since > + * domain replacement is a race with the translation requests, it needs > + * to be done multiple times to capture the small window where iommu > + * faults can occur. > + * > + * The loop ends on the original domain, so the teardown below is safe. > + */ > + for (i = 0; i < variant->attaches; i++) { > + vfio_pci_device_attach_iommu(self->device, iommu2); > + vfio_pci_device_attach_iommu(self->device, self->iommu); > + } > + > + if (driver->ops) { > + ret = vfio_pci_driver_memcpy_wait(self->device); > + > + ASSERT_EQ(0, ret); > + ASSERT_EQ(0, memcmp(self->src, self->dst, size)); > + } > + > + if (iommu2) { > + iommu_unmap(iommu2, &memcpy_region); > + iommu_unmap(iommu2, &driver_region); > + iommu_cleanup(iommu2); > + } > +} > + > +int main(int argc, char *argv[]) > +{ > + device_bdf = vfio_selftests_get_bdf(&argc, argv); > + > + return test_harness_run(argc, argv); > +} > -- > 2.56.0.rc1.315.gc6ed9934b7-goog >