Skip to content

Commit 9d532f2

Browse files
johnhubbardawilliam
authored andcommitted
vfio/spapr_tce: convert get_user_pages() --> pin_user_pages()
This code was using get_user_pages*(), in a "Case 2" scenario (DMA/RDMA), using the categorization from [1]. That means that it's time to convert the get_user_pages*() + put_page() calls to pin_user_pages*() + unpin_user_pages() calls. There is some helpful background in [2]: basically, this is a small part of fixing a long-standing disconnect between pinning pages, and file systems' use of those pages. [1] Documentation/core-api/pin_user_pages.rst [2] "Explicit pinning of user-space pages": https://lwn.net/Articles/807108/ Cc: Alex Williamson <[email protected]> Cc: Cornelia Huck <[email protected]> Cc: [email protected] Signed-off-by: John Hubbard <[email protected]> Signed-off-by: Alex Williamson <[email protected]>
1 parent e1907d6 commit 9d532f2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/vfio/vfio_iommu_spapr_tce.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ static void tce_iommu_unuse_page(struct tce_container *container,
383383
struct page *page;
384384

385385
page = pfn_to_page(hpa >> PAGE_SHIFT);
386-
put_page(page);
386+
unpin_user_page(page);
387387
}
388388

389389
static int tce_iommu_prereg_ua_to_hpa(struct tce_container *container,
@@ -486,7 +486,7 @@ static int tce_iommu_use_page(unsigned long tce, unsigned long *hpa)
486486
struct page *page = NULL;
487487
enum dma_data_direction direction = iommu_tce_direction(tce);
488488

489-
if (get_user_pages_fast(tce & PAGE_MASK, 1,
489+
if (pin_user_pages_fast(tce & PAGE_MASK, 1,
490490
direction != DMA_TO_DEVICE ? FOLL_WRITE : 0,
491491
&page) != 1)
492492
return -EFAULT;

0 commit comments

Comments
 (0)