Skip to content

Commit 6427f62

Browse files
committed
vfio: use the new follow_pfnmap API
JIRA: https://issues.redhat.com/browse/RHEL-73613 commit a77f948 Author: Peter Xu <peterx@redhat.com> Date: Mon Aug 26 16:43:47 2024 -0400 vfio: use the new follow_pfnmap API Use the new API that can understand huge pfn mappings. Link: https://lkml.kernel.org/r/20240826204353.2228736-14-peterx@redhat.com Signed-off-by: Peter Xu <peterx@redhat.com> Cc: Alex Williamson <alex.williamson@redhat.com> Cc: Jason Gunthorpe <jgg@nvidia.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Christian Borntraeger <borntraeger@linux.ibm.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: Gavin Shan <gshan@redhat.com> Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Niklas Schnelle <schnelle@linux.ibm.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Cc: Sean Christopherson <seanjc@google.com> Cc: Sven Schnelle <svens@linux.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Will Deacon <will@kernel.org> Cc: Zi Yan <ziy@nvidia.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Donald Dutile <ddutile@redhat.com>
1 parent eb1b186 commit 6427f62

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

drivers/vfio/vfio_iommu_type1.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -515,12 +515,10 @@ static int follow_fault_pfn(struct vm_area_struct *vma, struct mm_struct *mm,
515515
unsigned long vaddr, unsigned long *pfn,
516516
bool write_fault)
517517
{
518-
pte_t *ptep;
519-
pte_t pte;
520-
spinlock_t *ptl;
518+
struct follow_pfnmap_args args = { .vma = vma, .address = vaddr };
521519
int ret;
522520

523-
ret = follow_pte(vma, vaddr, &ptep, &ptl);
521+
ret = follow_pfnmap_start(&args);
524522
if (ret) {
525523
bool unlocked = false;
526524

@@ -534,19 +532,17 @@ static int follow_fault_pfn(struct vm_area_struct *vma, struct mm_struct *mm,
534532
if (ret)
535533
return ret;
536534

537-
ret = follow_pte(vma, vaddr, &ptep, &ptl);
535+
ret = follow_pfnmap_start(&args);
538536
if (ret)
539537
return ret;
540538
}
541539

542-
pte = ptep_get(ptep);
543-
544-
if (write_fault && !pte_write(pte))
540+
if (write_fault && !args.writable)
545541
ret = -EFAULT;
546542
else
547-
*pfn = pte_pfn(pte);
543+
*pfn = args.pfn;
548544

549-
pte_unmap_unlock(ptep, ptl);
545+
follow_pfnmap_end(&args);
550546
return ret;
551547
}
552548

0 commit comments

Comments
 (0)