mm/filemap: count only the faulting address as a mmap hit
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/2 mm/filemap: count only the faulting address as a mmap hit
filemap_map_pages() reduces file->f_ra.mmap_miss when fault-around maps folios that are already present in the page cache. That hit accounting is too generous because fault-around can install PTEs around the faulting address even though the fault only proves that the faulting address was accessed.
Move the mmap_miss update back into filemap_map_pages(), drop the mmap_miss argument from the helper functions, and decrement mmap_miss only when the helper return value shows that the faulting address was mapped. Keep the existing workingset-folio behavior unchanged.
--- mm/filemap.c | 55 +++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 31 deletions(-)
mm/filemap.c +24 -31
@@ -3747,8 +3747,7 @@ static struct folio *next_uptodate_folio(struct xa_state *xas,static vm_fault_t filemap_map_folio_range (struct vm_fault *vmf,struct folio *folio,unsigned long start,unsigned long addr,unsigned int nr_pages, -unsigned long *rss,unsigned short *mmap_miss, -pgoff_t file_end) +unsigned long *rss,pgoff_t file_end) {struct address_space *mapping = folio->mapping;unsigned int ref_from_caller =1 ;
@@ -3780,16 +3779,6 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf,if (PageHWPoison (page + count)) goto skip; -/* -* If there are too many folios that are recently evicted -* in a file, they will probably continue to be evicted. -* In such situation, read-ahead is only a waste of IO. -* Don't decrease mmap_miss in this scenario to make sure -* we can stop read-ahead. -*/ -if (!folio_test_workingset (folio)) - (*mmap_miss)++; -/* * NOTE: If there're PTE markers, we'll leave them to be * handled in the specific fault path, and it'll prohibit the
@@ -3836,7 +3825,7 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf,static vm_fault_t filemap_map_order0_folio (struct vm_fault *vmf,struct folio *folio,unsigned long addr, -unsigned long *rss,unsigned short *mmap_miss) +unsigned long *rss) {vm_fault_t ret =0 ;struct page *page = &folio->page;
@@ -3844,10 +3833,6 @@ static vm_fault_t filemap_map_order0_folio(struct vm_fault *vmf,if (PageHWPoison (page)) goto out; -/* See comment of filemap_map_folio_range() */ -if (!folio_test_workingset (folio)) - (*mmap_miss)++; -/* * NOTE: If there're PTE markers, we'll leave them to be * handled in the specific fault path, and it'll prohibit
@@ -3882,7 +3867,6 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf,vm_fault_t ret =0 ;unsigned long rss =0 ;unsigned int nr_pages =0 , folio_type; -unsigned short mmap_miss =0 , mmap_miss_saved;/* * Recalculate end_pgoff based on file_end before calling
@@ -3921,6 +3905,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, folio_type =mm_counter_file (folio); do { unsigned long end; + vm_fault_t map_ret; addr += (xas.xa_index - last_pgoff) << PAGE_SHIFT; vmf->pte += xas.xa_index - last_pgoff;
@@ -3928,13 +3913,27 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, end =folio_next_index (folio) -1 ; nr_pages =min (end, end_pgoff) - xas.xa_index +1 ; -if (!folio_test_large (folio)) - ret |=filemap_map_order0_folio (vmf, - folio, addr, &rss, &mmap_miss); -else - ret |=filemap_map_folio_range (vmf, folio, - xas.xa_index - folio->index, addr, - nr_pages, &rss, &mmap_miss, file_end); +if (!folio_test_large (folio)) { + map_ret =filemap_map_order0_folio (vmf, folio, addr, + &rss); + }else { +unsigned long start = xas.xa_index - folio->index; + + map_ret =filemap_map_folio_range (vmf, folio, start, + addr, nr_pages, &rss, + file_end); + } + ret |= map_ret; + +if ((map_ret &VM_FAULT_NOPAGE ) && + !folio_test_workingset (folio)) { +unsigned short mmap_miss; + + mmap_miss =READ_ONCE (file->f_ra.mmap_miss); +if (mmap_miss) +WRITE_ONCE (file->f_ra.mmap_miss, + mmap_miss -1 ); + }folio_unlock (folio); }while ((folio =next_uptodate_folio (&xas, mapping, end_pgoff)) !=NULL );
@@ -3944,12 +3943,6 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, out:rcu_read_unlock (); - mmap_miss_saved =READ_ONCE (file->f_ra.mmap_miss); -if (mmap_miss >= mmap_miss_saved) -WRITE_ONCE (file->f_ra.mmap_miss,0 ); -else -WRITE_ONCE (file->f_ra.mmap_miss, mmap_miss_saved - mmap_miss); -return ret; }EXPORT_SYMBOL (filemap_map_pages);
Signature · 1 line
2.34.1
Matthew Wilcox
maintainermm/filemap.c static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, · line 3789
Quoted 7 lines · fujunjie
mm/filemap.c +0
-7-/* -* If there are too many folios that are recently evicted -* in a file, they will probably continue to be evicted. -* In such situation, read-ahead is only a waste of IO. -* Don't decrease mmap_miss in this scenario to make sure -* we can stop read-ahead. -*/
I'm sad to lose this comment. Why not move it to ...
mm/filemap.c vm_fault_t filemap_map_pages(struct vm_fault *vmf, · line 3926
Quoted 1 line
mm/filemap.c +1
-0+ ret |= map_ret;
here?
Quoted 9 lines
mm/filemap.c +9
-0+if ((map_ret &VM_FAULT_NOPAGE ) && + !folio_test_workingset (folio)) { +unsigned short mmap_miss; + + mmap_miss =READ_ONCE (file->f_ra.mmap_miss); +if (mmap_miss) +WRITE_ONCE (file->f_ra.mmap_miss, + mmap_miss -1 ); + }
Quoted 15 lines · Matthew Wilcox
mm/filemap.c static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, · line 3789
Quoted 7 lines · fujunjie
mm/filemap.c +0
-7-/* -* If there are too many folios that are recently evicted -* in a file, they will probably continue to be evicted. -* In such situation, read-ahead is only a waste of IO. -* Don't decrease mmap_miss in this scenario to make sure -* we can stop read-ahead. -*/ I'm sad to lose this comment. Why not move it to ...
mm/filemap.c vm_fault_t filemap_map_pages(struct vm_fault *vmf, · line 3926
Quoted 1 line
mm/filemap.c +1
-0+ ret |= map_ret;here?
Quoted 9 lines
mm/filemap.c vm_fault_t filemap_map_pages(struct vm_fault *vmf, · line 3936
Quoted 9 lines
mm/filemap.c +9
-0+if ((map_ret &VM_FAULT_NOPAGE ) && + !folio_test_workingset (folio)) { +unsigned short mmap_miss; + + mmap_miss =READ_ONCE (file->f_ra.mmap_miss); +if (mmap_miss) +WRITE_ONCE (file->f_ra.mmap_miss, + mmap_miss -1 ); + }
Yes, that makes sense. I'll move the comment there in the next version.
Best regards,
fujunjie
PATCH v2 2/2 mm/filemap: do not count FAULT_FLAG_TRIED retries as mmap hits
In reply to a message not in the archiveA fault that starts synchronous mmap readahead can return VM_FAULT_RETRY after dropping mmap_lock. The retry may then map the folio brought in by that same miss.
Do not let this retry decrement mmap_miss. The retry still maps the folio from the page cache; it just does not count as a useful mmap readahead hit.
--- mm/filemap.c | 1 + 1 file changed, 1 insertion(+)
mm/filemap.c +1 -0
@@ -3926,6 +3926,7 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, ret |= map_ret;if ((map_ret &VM_FAULT_NOPAGE ) && + !(vmf->flags &FAULT_FLAG_TRIED ) && !folio_test_workingset (folio)) {unsigned short mmap_miss;
Signature · 1 line
2.34.1