Unverified Commit d69283f1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6068 mm: batch mm counter updating in filemap_map_pages() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Peng Zhang <zhangpeng362@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VAGIEHABB2YYITVJWJWZSQ4KCDSHBEBD/ 
From: ZhangPeng <zhangpeng362@huawei.com>

Like copy_pte_range()/zap_pte_range(), make mm counter batch updating
in filemap_map_pages(), since folios type are same(MM_SHMEMPAGES or
MM_FILEPAGES) in filemap_map_pages(), only check the first folio type
is enough, the 'lat_pagefault -P 1 file' test from lmbench shows 12%
improvement, and the percpu_counter_add_batch() is gone from perf flame
graph.

Kefeng Wang (2):
  mm: move mm counter updating out of set_pte_range()
  mm: filemap: batch mm counter updating in filemap_map_pages()


-- 
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I9GBVL 
 
Link:https://gitee.com/openeuler/kernel/pulls/6068

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 49fed033 3a12146d

mm/filemap.c

+12 −5
Original line number Diff line number Diff line
@@ -3474,7 +3474,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 int *mmap_miss)

			unsigned long *rss, unsigned int *mmap_miss)

{

	vm_fault_t ret = 0;

	struct page *page = folio_page(folio, start);
@@ -3500,6 +3500,7 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, 
skip:

		if (count) {

			set_pte_range(vmf, folio, page, count, addr);

			*rss += count;

			folio_ref_add(folio, count);

			if (in_range(vmf->address, addr, count * PAGE_SIZE))

				ret = VM_FAULT_NOPAGE;
@@ -3514,6 +3515,7 @@ static vm_fault_t filemap_map_folio_range(struct vm_fault *vmf, 


	if (count) {

		set_pte_range(vmf, folio, page, count, addr);

		*rss += count;

		folio_ref_add(folio, count);

		if (in_range(vmf->address, addr, count * PAGE_SIZE))

			ret = VM_FAULT_NOPAGE;
@@ -3526,7 +3528,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 int *mmap_miss)

		unsigned long *rss, unsigned int *mmap_miss)

{

	vm_fault_t ret = 0;

	struct page *page = &folio->page;
@@ -3548,6 +3550,7 @@ static vm_fault_t filemap_map_order0_folio(struct vm_fault *vmf, 
		ret = VM_FAULT_NOPAGE;



	set_pte_range(vmf, folio, page, 1, addr);

	(*rss)++;

	folio_ref_inc(folio);



	return ret;
@@ -3564,7 +3567,8 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, 
	XA_STATE(xas, &mapping->i_pages, start_pgoff);

	struct folio *folio;

	vm_fault_t ret = 0;

	unsigned int nr_pages = 0, mmap_miss = 0, mmap_miss_saved;

	unsigned long rss = 0;

	unsigned int nr_pages = 0, mmap_miss = 0, mmap_miss_saved, folio_type;



	rcu_read_lock();

	folio = next_uptodate_folio(&xas, mapping, end_pgoff);
@@ -3583,6 +3587,8 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, 
		folio_put(folio);

		goto out;

	}



	folio_type = mm_counter_file(folio);

	do {

		unsigned long end;
@@ -3594,15 +3600,16 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, 


		if (!folio_test_large(folio))

			ret |= filemap_map_order0_folio(vmf,

					folio, addr, &mmap_miss);

					folio, addr, &rss, &mmap_miss);

		else

			ret |= filemap_map_folio_range(vmf, folio,

					xas.xa_index - folio->index, addr,

					nr_pages, &mmap_miss);

					nr_pages, &rss, &mmap_miss);



		folio_unlock(folio);

		folio_put(folio);

	} while ((folio = next_uptodate_folio(&xas, mapping, end_pgoff)) != NULL);

	add_mm_counter(vma->vm_mm, folio_type, rss);

	pte_unmap_unlock(vmf->pte, vmf->ptl);

out:

	rcu_read_unlock();

mm/memory.c

+5 −3
Original line number Diff line number Diff line
@@ -4660,12 +4660,10 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, 
	/* copy-on-write page */

	add_reliable_folio_counter(folio, vma->vm_mm, nr);

	if (write && !(vma->vm_flags & VM_SHARED)) {

		add_mm_counter(vma->vm_mm, MM_ANONPAGES, nr);

		VM_BUG_ON_FOLIO(nr != 1, folio);

		folio_add_new_anon_rmap(folio, vma, addr);

		folio_add_lru_vma(folio, vma);

	} else {

		add_mm_counter(vma->vm_mm, mm_counter_file(folio), nr);

		folio_add_file_rmap_ptes(folio, page, nr, vma);

	}

	set_ptes(vma->vm_mm, addr, vmf->pte, entry, nr);
@@ -4702,9 +4700,11 @@ vm_fault_t finish_fault(struct vm_fault *vmf) 
	struct vm_area_struct *vma = vmf->vma;

	struct page *page;

	vm_fault_t ret;

	bool is_cow = (vmf->flags & FAULT_FLAG_WRITE) &&

		      !(vma->vm_flags & VM_SHARED);



	/* Did we COW the page? */

	if ((vmf->flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED))

	if (is_cow)

		page = vmf->cow_page;

	else

		page = vmf->page;
@@ -4740,8 +4740,10 @@ vm_fault_t finish_fault(struct vm_fault *vmf) 
	/* Re-check under ptl */

	if (likely(!vmf_pte_changed(vmf))) {

		struct folio *folio = page_folio(page);

		int type = is_cow ? MM_ANONPAGES : mm_counter_file(folio);



		set_pte_range(vmf, folio, page, 1, vmf->address);

		add_mm_counter(vma->vm_mm, type, 1);

		ret = 0;

	} else {

		update_mmu_tlb(vma, vmf->address, vmf->pte);