From: Pranjal Shrivastava <praan@google.com>
To: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Logan Gunthorpe <logang@deltatee.com>,
Alex Williamson <alex@shazbot.org>,
Jason Gunthorpe <jgg@ziepe.ca>, Kevin Tian <kevin.tian@intel.com>,
Pranjal Shrivastava <praan@google.com>,
Ankit Agrawal <ankita@nvidia.com>, Matt Evans <mattev@meta.com>,
Vivek Kasireddy <vivek.kasireddy@intel.com>,
Leon Romanovsky <leon@kernel.org>,
Shivaji Kant <shivajikant@google.com>,
Samiullah Khawaja <skhawaja@google.com>,
Unnati Sachan <unnatisachan@google.com>
Subject: [RFC PATCH v2 5/5] vfio/pci: Add revocation fence for ZONE_DEVICE DMABUFs
Date: Tue, 4 Aug 2026 18:50:50 +0000 [thread overview]
Message-ID: <20260804185050.2053672-6-praan@google.com> (raw)
In-Reply-To: <20260804185050.2053672-1-praan@google.com>
Implement a synchronization fence to safely revoke ZONE_DEVICE-backed
DMABUFs. Introduce a fence in vfio_pci_dma_buf_set_status(). The fence
waits for all struct page refcounts to drop to 1.
Signed-off-by: Pranjal Shrivastava <praan@google.com>
---
drivers/vfio/pci/vfio_pci_dmabuf.c | 55 ++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
diff --git a/drivers/vfio/pci/vfio_pci_dmabuf.c b/drivers/vfio/pci/vfio_pci_dmabuf.c
index b582e856ba7a..b4284b5cad03 100644
--- a/drivers/vfio/pci/vfio_pci_dmabuf.c
+++ b/drivers/vfio/pci/vfio_pci_dmabuf.c
@@ -4,6 +4,7 @@
#include <linux/dma-buf-mapping.h>
#include <linux/pci-p2pdma.h>
#include <linux/dma-resv.h>
+#include <linux/iopoll.h>
#include <linux/sched.h>
#include <uapi/linux/dma-buf.h>
@@ -745,6 +746,44 @@ int vfio_pci_core_mmap_prep_dmabuf(struct vfio_pci_core_device *vdev,
return ret;
}
+static void vfio_pci_zone_device_wait_fence(struct vfio_pci_dma_buf *priv)
+{
+ unsigned int i;
+
+ if (!priv->zone_device_backed)
+ return;
+
+ /*
+ * Fence: Wait for any active references to the ZONE_DEVICE
+ * pages to be dropped. A refcount of 1 represents the base
+ * ownership.
+ */
+ for (i = 0; i < priv->nr_ranges; i++) {
+ unsigned long pfn = priv->phys_vec[i].paddr >> PAGE_SHIFT;
+ unsigned long npgs = PAGE_ALIGN(priv->phys_vec[i].len) >> PAGE_SHIFT;
+
+ while (npgs--) {
+ struct page *page = pfn_to_page(pfn++);
+ int count, ret;
+
+ /*
+ * Poll page_count() and block indefinitely until all
+ * refs drop to avoid DMA-after-free.
+ */
+ do {
+ ret = read_poll_timeout(page_count, count,
+ (count == 1),
+ 1000, 10000000,
+ false, page);
+ if (ret)
+ dev_warn(&priv->vdev->pdev->dev,
+ "Waiting for GUP pins to drop on PFN 0x%lx... (importer hung?)\n",
+ pfn - 1);
+ } while (ret);
+ }
+ }
+}
+
/* Set the DMABUF's revocation status (OK or temporarily/permanently revoked) */
static void vfio_pci_dma_buf_set_status(struct vfio_pci_dma_buf *priv,
enum vfio_pci_dma_buf_status new_status)
@@ -779,8 +818,24 @@ static void vfio_pci_dma_buf_set_status(struct vfio_pci_dma_buf *priv,
dma_resv_unlock(priv->dmabuf->resv);
kref_put(&priv->kref, vfio_pci_dma_buf_done);
wait_for_completion(&priv->comp);
+
+ /*
+ * Note: Rmap Deadlocks
+ * unmap_mapping_range() is safe to call here within memory_lock
+ * despite the VMA being VM_MIXEDMAP. Because our ZONE_DEVICE pages
+ * are allocated via devm_memremap_pages(), page->mapping is never
+ * set which makes them invisible to rmap.
+ *
+ * If this changes in the future, this call must be factored outside
+ * the memory_lock to prevent a 3-way circular deadlock:
+ * (mmap_lock -> memory_lock -> i_mmap_rwsem).
+ */
unmap_mapping_range(priv->dmabuf->file->f_mapping,
0, 0, true);
+
+ /* Wait for all page refs to drop if ZONE_DEVICE registered */
+ vfio_pci_zone_device_wait_fence(priv);
+
/*
* Re-arm the registered kref reference and the
* completion so the post-revoke state matches the
--
2.55.0.571.g244d577d93-goog
prev parent reply other threads:[~2026-08-04 18:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-04 18:50 [RFC PATCH v2 0/5] vfio/pci: Support ZONE_DEVICE-backed DMABUF Exports Pranjal Shrivastava
2026-08-04 18:50 ` [RFC PATCH v2 1/5] vfio: Add UAPI flag for ZONE_DEVICE-backed DMABUF exports Pranjal Shrivastava
2026-08-04 18:50 ` [RFC PATCH v2 2/5] vfio/pci: Implement ZONE_DEVICE registration for DMABUFs Pranjal Shrivastava
2026-08-04 18:50 ` [RFC PATCH v2 3/5] vfio/pci: Implement page-backed .map_dma_buf handler Pranjal Shrivastava
2026-08-04 18:50 ` [RFC PATCH v2 4/5] vfio/pci: Add .mmap handler for page-backed DMABUFs Pranjal Shrivastava
2026-08-04 18:50 ` Pranjal Shrivastava [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260804185050.2053672-6-praan@google.com \
--to=praan@google.com \
--cc=alex@shazbot.org \
--cc=ankita@nvidia.com \
--cc=bhelgaas@google.com \
--cc=jgg@ziepe.ca \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=mattev@meta.com \
--cc=shivajikant@google.com \
--cc=skhawaja@google.com \
--cc=unnatisachan@google.com \
--cc=vivek.kasireddy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).