mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vfio: use the new follow_pfnmap API

Browse Source 
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>
This commit is contained in:
Peter Xu 2024-08-26 16:43:47 -04:00 committed by Andrew Morton
parent cbea8536d9
commit a77f9489f1
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/vfio/vfio_iommu_type1.c
View File

@ -513,12 +513,10 @@ static int follow_fault_pfn(struct vm_area_struct *vma, struct mm_struct *mm,
unsigned long vaddr, unsigned long *pfn, unsigned long vaddr, unsigned long *pfn,
bool write_fault) bool write_fault)
{ {
pte_t *ptep; struct follow_pfnmap_args args = { .vma = vma, .address = vaddr };
pte_t pte;
spinlock_t *ptl;
int ret; int ret;
ret = follow_pte(vma, vaddr, &ptep, &ptl); ret = follow_pfnmap_start(&args);
if (ret) { if (ret) {
bool unlocked = false; bool unlocked = false;
@ -532,19 +530,17 @@ static int follow_fault_pfn(struct vm_area_struct *vma, struct mm_struct *mm,
if (ret) if (ret)
return ret; return ret;
ret = follow_pte(vma, vaddr, &ptep, &ptl); ret = follow_pfnmap_start(&args);
if (ret) if (ret)
return ret; return ret;
} }
pte = ptep_get(ptep); if (write_fault && !args.writable)
if (write_fault && !pte_write(pte))
ret = -EFAULT; ret = -EFAULT;
else else
*pfn = pte_pfn(pte); *pfn = args.pfn;
pte_unmap_unlock(ptep, ptl); follow_pfnmap_end(&args);
return ret; return ret;
} }