Skip to content

Commit d14de5b

Browse files
Li ZheAlex Williamson
authored andcommitted
vfio/type1: optimize vfio_unpin_pages_remote()
When vfio_unpin_pages_remote() is called with a range of addresses that includes large folios, the function currently performs individual put_pfn() operations for each page. This can lead to significant performance overheads, especially when dealing with large ranges of pages. It would be very rare for reserved PFNs and non reserved will to be mixed within the same range. So this patch utilizes the has_rsvd variable introduced in the previous patch to determine whether batch put_pfn() operations can be performed. Moreover, compared to put_pfn(), unpin_user_page_range_dirty_lock() is capable of handling large folio scenarios more efficiently. The performance test results for completing the 16G VFIO IOMMU DMA unmapping are as follows. Base(v6.16): ------- AVERAGE (MADV_HUGEPAGE) -------- VFIO UNMAP DMA in 0.141 s (113.7 GB/s) ------- AVERAGE (MAP_POPULATE) -------- VFIO UNMAP DMA in 0.307 s (52.2 GB/s) ------- AVERAGE (HUGETLBFS) -------- VFIO UNMAP DMA in 0.135 s (118.6 GB/s) With this patchset: ------- AVERAGE (MADV_HUGEPAGE) -------- VFIO UNMAP DMA in 0.044 s (363.2 GB/s) ------- AVERAGE (MAP_POPULATE) -------- VFIO UNMAP DMA in 0.289 s (55.3 GB/s) ------- AVERAGE (HUGETLBFS) -------- VFIO UNMAP DMA in 0.044 s (361.3 GB/s) For large folio, we achieve an over 67% performance improvement in the VFIO UNMAP DMA item. For small folios, the performance test results appear to show a slight improvement. Suggested-by: Jason Gunthorpe <jgg@ziepe.ca> Signed-off-by: Li Zhe <lizhe.67@bytedance.com> Reviewed-by: David Hildenbrand <david@redhat.com> Acked-by: David Hildenbrand <david@redhat.com> Link: https://lore.kernel.org/r/20250814064714.56485-6-lizhe.67@bytedance.com Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
1 parent 089722e commit d14de5b

1 file changed

Lines changed: 16 additions & 4 deletions

File tree

drivers/vfio/vfio_iommu_type1.c

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -800,17 +800,29 @@ static long vfio_pin_pages_remote(struct vfio_dma *dma, unsigned long vaddr,
800800
return pinned;
801801
}
802802

803+
static inline void put_valid_unreserved_pfns(unsigned long start_pfn,
804+
unsigned long npage, int prot)
805+
{
806+
unpin_user_page_range_dirty_lock(pfn_to_page(start_pfn), npage,
807+
prot & IOMMU_WRITE);
808+
}
809+
803810
static long vfio_unpin_pages_remote(struct vfio_dma *dma, dma_addr_t iova,
804811
unsigned long pfn, unsigned long npage,
805812
bool do_accounting)
806813
{
807814
long unlocked = 0, locked = vpfn_pages(dma, iova, npage);
808-
long i;
809815

810-
for (i = 0; i < npage; i++)
811-
if (put_pfn(pfn++, dma->prot))
812-
unlocked++;
816+
if (dma->has_rsvd) {
817+
unsigned long i;
813818

819+
for (i = 0; i < npage; i++)
820+
if (put_pfn(pfn++, dma->prot))
821+
unlocked++;
822+
} else {
823+
put_valid_unreserved_pfns(pfn, npage, dma->prot);
824+
unlocked = npage;
825+
}
814826
if (do_accounting)
815827
vfio_lock_acct(dma, locked - unlocked, true);
816828

0 commit comments

Comments
 (0)