diff mbox series

[RFC,v3,2/4] rmap: add folio_add_file_rmap_range()

Message ID 20230203131636.1648662-3-fengwei.yin@intel.com (mailing list archive)
State New
Headers show
Series folio based filemap_map_pages() | expand

Commit Message

Yin Fengwei Feb. 3, 2023, 1:16 p.m. UTC 
folio_add_file_rmap_range() allows to add pte mapping to a specific
range of file folio. Comparing to page_add_file_rmap(),it batched
updates __lruvec_stat for large folio.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
---
 include/linux/rmap.h |  2 ++
 mm/rmap.c            | 66 ++++++++++++++++++++++++++++++++++----------
 2 files changed, 54 insertions(+), 14 deletions(-)

Comments

Matthew Wilcox Feb. 3, 2023, 2:02 p.m. UTC | #1 
On Fri, Feb 03, 2023 at 09:16:34PM +0800, Yin Fengwei wrote:
> +++ b/mm/rmap.c
> @@ -1303,31 +1303,44 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma,
>  }
>  
>  /**
> - * page_add_file_rmap - add pte mapping to a file page
> - * @page:	the page to add the mapping to
> + * flio_add_file_rmap_range - add pte mapping to a sub page range of a folio

Typo -- missing 'o'.  And there's that word "sub" still ;-)

> + * @folio:	The filio to add the mapping to

s/filio/folio/

> + * @start:	The first page index in folio

Better to describe it as the 'first page number' -- index is usually
used as file index, ie offset within the file, rather than offset within
the folio.

> + * @nr_pages:	The number of pages for pte mapping adding

Maybe "The number of pages which will be mapped"?
Kirill A. Shutemov Feb. 3, 2023, 2:19 p.m. UTC | #2 
On Fri, Feb 03, 2023 at 09:16:34PM +0800, Yin Fengwei wrote:
> folio_add_file_rmap_range() allows to add pte mapping to a specific
> range of file folio. Comparing to page_add_file_rmap(),it batched

Missing space before 'it'.
Yin Fengwei Feb. 4, 2023, 3:34 a.m. UTC | #3 
On 2/3/2023 10:02 PM, Matthew Wilcox wrote:
> On Fri, Feb 03, 2023 at 09:16:34PM +0800, Yin Fengwei wrote:
>> +++ b/mm/rmap.c
>> @@ -1303,31 +1303,44 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma,
>>  }
>>  
>>  /**
>> - * page_add_file_rmap - add pte mapping to a file page
>> - * @page:	the page to add the mapping to
>> + * flio_add_file_rmap_range - add pte mapping to a sub page range of a folio
> 
> Typo -- missing 'o'.  And there's that word "sub" still ;-)
OK. 

> 
>> + * @folio:	The filio to add the mapping to
> 
> s/filio/folio/
OK.

> 
>> + * @start:	The first page index in folio
> 
> Better to describe it as the 'first page number' -- index is usually
> used as file index, ie offset within the file, rather than offset within
> the folio.
OK.

> 
>> + * @nr_pages:	The number of pages for pte mapping adding
> 
> Maybe "The number of pages which will be mapped"?
Sure.


Regards
Yin, Fengwei

>
Yin Fengwei Feb. 4, 2023, 3:35 a.m. UTC | #4 
On 2/3/2023 10:19 PM, Kirill A. Shutemov wrote:
> On Fri, Feb 03, 2023 at 09:16:34PM +0800, Yin Fengwei wrote:
>> folio_add_file_rmap_range() allows to add pte mapping to a specific
>> range of file folio. Comparing to page_add_file_rmap(),it batched
> 
> Missing space before 'it'.
Sure.

checkpatch didn't warn me for all these things you and Matthew pointed
out. I will be more careful for this in the future. And thanks a lot
for the reviewing.


Regards
Yin, Fengwei

> 
>
diff mbox series

Patch

diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index a4570da03e58..974124b41fee 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -198,6 +198,8 @@  void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *,
 		unsigned long address);
 void page_add_file_rmap(struct page *, struct vm_area_struct *,
 		bool compound);
+void folio_add_file_rmap_range(struct folio *, unsigned long start,
+		unsigned int nr_pages, struct vm_area_struct *, bool compound);
 void page_remove_rmap(struct page *, struct vm_area_struct *,
 		bool compound);
 
diff --git a/mm/rmap.c b/mm/rmap.c
index 8287f2cc327d..f8861d832468 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1303,31 +1303,44 @@  void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma,
 }
 
 /**
- * page_add_file_rmap - add pte mapping to a file page
- * @page:	the page to add the mapping to
+ * flio_add_file_rmap_range - add pte mapping to a sub page range of a folio
+ * @folio:	The filio to add the mapping to
+ * @start:	The first page index in folio
+ * @nr_pages:	The number of pages for pte mapping adding
  * @vma:	the vm area in which the mapping is added
  * @compound:	charge the page as compound or small page
  *
+ * The page range of folio is defined by [first_page, first_page + nr_pages)
+ *
  * The caller needs to hold the pte lock.
  */
-void page_add_file_rmap(struct page *page, struct vm_area_struct *vma,
-		bool compound)
+void folio_add_file_rmap_range(struct folio *folio, unsigned long start,
+			unsigned int nr_pages, struct vm_area_struct *vma,
+			bool compound)
 {
-	struct folio *folio = page_folio(page);
 	atomic_t *mapped = &folio->_nr_pages_mapped;
-	int nr = 0, nr_pmdmapped = 0;
-	bool first;
+	unsigned int nr_pmdmapped = 0, first;
+	int nr = 0;
 
-	VM_BUG_ON_PAGE(compound && !PageTransHuge(page), page);
+	VM_WARN_ON_FOLIO(compound && !folio_test_pmd_mappable(folio), folio);
 
 	/* Is page being mapped by PTE? Is this its first map to be added? */
 	if (likely(!compound)) {
-		first = atomic_inc_and_test(&page->_mapcount);
-		nr = first;
-		if (first && folio_test_large(folio)) {
-			nr = atomic_inc_return_relaxed(mapped);
-			nr = (nr < COMPOUND_MAPPED);
-		}
+		struct page *page = folio_page(folio, start);
+
+		nr_pages = min_t(unsigned int, nr_pages,
+					folio_nr_pages(folio) - start);
+
+		do {
+			first = atomic_inc_and_test(&page->_mapcount);
+			if (first && folio_test_large(folio)) {
+				first = atomic_inc_return_relaxed(mapped);
+				first = (nr < COMPOUND_MAPPED);
+			}
+
+			if (first)
+				nr++;
+		} while (page++, --nr_pages > 0);
 	} else if (folio_test_pmd_mappable(folio)) {
 		/* That test is redundant: it's for safety or to optimize out */
 
@@ -1356,6 +1369,31 @@  void page_add_file_rmap(struct page *page, struct vm_area_struct *vma,
 	mlock_vma_folio(folio, vma, compound);
 }
 
+/**
+ * page_add_file_rmap - add pte mapping to a file page
+ * @page:	the page to add the mapping to
+ * @vma:	the vm area in which the mapping is added
+ * @compound:	charge the page as compound or small page
+ *
+ * The caller needs to hold the pte lock.
+ */
+void page_add_file_rmap(struct page *page, struct vm_area_struct *vma,
+		bool compound)
+{
+	struct folio *folio = page_folio(page);
+	unsigned int nr_pages;
+
+	VM_WARN_ON_ONCE_PAGE(compound && !PageTransHuge(page), page);
+
+	if (likely(!compound))
+		nr_pages = 1;
+	else
+		nr_pages = folio_nr_pages(folio);
+
+	folio_add_file_rmap_range(folio, folio_page_idx(folio, page),
+			nr_pages, vma, compound);
+}
+
 /**
  * page_remove_rmap - take down pte mapping from a page
  * @page:	page to remove mapping from