Skip to content

Commit 62fb8ad

Browse files
committed
mm: Provide address mask in struct follow_pfnmap_args
follow_pfnmap_start() walks the page table for a given address and fills out the struct follow_pfnmap_args in pfnmap_args_setup(). The address mask of the page table level is already provided to this latter function for calculating the pfn. This address mask can also be useful for the caller to determine the extent of the contiguous mapping. For example, vfio-pci now supports huge_fault for pfnmaps and is able to insert pud and pmd mappings. When we DMA map these pfnmaps, ex. PCI MMIO BARs, we iterate follow_pfnmap_start() to get each pfn to test for a contiguous pfn range. Providing the mapping address mask allows us to skip the extent of the mapping level. Assuming a 1GB pud level and 4KB page size, iterations are reduced by a factor of 256K. In wall clock time, mapping a 32GB PCI BAR is reduced from ~1s to <1ms. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: David Hildenbrand <david@redhat.com> Cc: linux-mm@kvack.org Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Mitchell Augustin <mitchell.augustin@canonical.com> Tested-by: Mitchell Augustin <mitchell.augustin@canonical.com> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Acked-by: David Hildenbrand <david@redhat.com> Link: https://lore.kernel.org/r/20250218222209.1382449-6-alex.williamson@redhat.com Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
1 parent 0635559 commit 62fb8ad

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

include/linux/mm.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,11 +2417,13 @@ struct follow_pfnmap_args {
24172417
* Outputs:
24182418
*
24192419
* @pfn: the PFN of the address
2420+
* @addr_mask: address mask covering pfn
24202421
* @pgprot: the pgprot_t of the mapping
24212422
* @writable: whether the mapping is writable
24222423
* @special: whether the mapping is a special mapping (real PFN maps)
24232424
*/
24242425
unsigned long pfn;
2426+
unsigned long addr_mask;
24252427
pgprot_t pgprot;
24262428
bool writable;
24272429
bool special;

mm/memory.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6488,6 +6488,7 @@ static inline void pfnmap_args_setup(struct follow_pfnmap_args *args,
64886488
args->lock = lock;
64896489
args->ptep = ptep;
64906490
args->pfn = pfn_base + ((args->address & ~addr_mask) >> PAGE_SHIFT);
6491+
args->addr_mask = addr_mask;
64916492
args->pgprot = pgprot;
64926493
args->writable = writable;
64936494
args->special = special;

0 commit comments

Comments
 (0)