Commit 7c52303f authored by Kefeng Wang's avatar Kefeng Wang
Browse files

mm: convert mm_counter_file() to take a folio 

mainline inclusion
from mainline-v6.9-rc1
commit 6b27cc6c66abf0f0b091a95ca1ad4e0fc68c11fd
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHB4
CVE: NA

-------------------------------------------------

Now all callers of mm_counter_file() have a folio, convert
mm_counter_file() to take a folio.  Saves a call to compound_head() hidden
inside PageSwapBacked().

Link: https://lkml.kernel.org/r/20240111152429.3374566-11-willy@infradead.org


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 6b27cc6c66abf0f0b091a95ca1ad4e0fc68c11fd)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>

 Conflicts:
	mm/memory.c
	mm/rmap.c
parent c6371632

include/linux/mm.h

+4 −4
Original line number Diff line number Diff line
@@ -2607,10 +2607,10 @@ static inline void dec_mm_counter(struct mm_struct *mm, int member) 
	mm_trace_rss_stat(mm, member);

}



/* Optimized variant when page is already known not to be PageAnon */

static inline int mm_counter_file(struct page *page)

/* Optimized variant when folio is already known not to be anon */

static inline int mm_counter_file(struct folio *folio)

{

	if (PageSwapBacked(page))

	if (folio_test_swapbacked(folio))

		return MM_SHMEMPAGES;

	return MM_FILEPAGES;

}
@@ -2619,7 +2619,7 @@ static inline int mm_counter(struct folio *folio) 
{

	if (folio_test_anon(folio))

		return MM_ANONPAGES;

	return mm_counter_file(&folio->page);

	return mm_counter_file(folio);

}



static inline unsigned long get_mm_rss(struct mm_struct *mm)

kernel/events/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, 
		dec_mm_counter(mm, MM_ANONPAGES);



	if (!folio_test_anon(old_folio)) {

		dec_mm_counter(mm, mm_counter_file(old_page));

		dec_mm_counter(mm, mm_counter_file(old_folio));

		inc_mm_counter(mm, MM_ANONPAGES);

	}

mm/huge_memory.c

+2 −2
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, 
		} else {

			if (arch_needs_pgtable_deposit())

				zap_deposited_table(tlb->mm, pmd);

			add_mm_counter(tlb->mm, mm_counter_file(&folio->page),

			add_mm_counter(tlb->mm, mm_counter_file(folio),

				       -HPAGE_PMD_NR);

		}
@@ -2302,7 +2302,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, 
			folio_remove_rmap_pmd(folio, page, vma);

			folio_put(folio);

		}

		add_mm_counter(mm, mm_counter_file(&folio->page), -HPAGE_PMD_NR);

		add_mm_counter(mm, mm_counter_file(folio), -HPAGE_PMD_NR);

		return;

	}

mm/khugepaged.c

+2 −2
Original line number Diff line number Diff line
@@ -1652,7 +1652,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, 
	/* step 3: set proper refcount and mm_counters. */

	if (nr_ptes) {

		folio_ref_sub(folio, nr_ptes);

		add_mm_counter(mm, mm_counter_file(&folio->page), -nr_ptes);

		add_mm_counter(mm, mm_counter_file(folio), -nr_ptes);

	}



	/* step 4: remove empty page table */
@@ -1683,7 +1683,7 @@ int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, 
	if (nr_ptes) {

		flush_tlb_mm(mm);

		folio_ref_sub(folio, nr_ptes);

		add_mm_counter(mm, mm_counter_file(&folio->page), -nr_ptes);

		add_mm_counter(mm, mm_counter_file(folio), -nr_ptes);

	}

	if (start_pte)

		pte_unmap_unlock(start_pte, ptl);

mm/memory.c

+5 −5
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma, 
	} else if (page) {

		folio_get(folio);

		folio_dup_file_rmap_pte(folio, page);

		rss[mm_counter_file(page)]++;

		rss[mm_counter_file(folio)]++;

		add_reliable_folio_counter(folio, dst_vma->vm_mm, 1);

	}
@@ -1875,7 +1875,7 @@ static int insert_page_into_pte_locked(struct vm_area_struct *vma, pte_t *pte, 
		return -EBUSY;

	/* Ok, finally just insert the thing.. */

	folio_get(folio);

	inc_mm_counter(vma->vm_mm, mm_counter_file(page));

	inc_mm_counter(vma->vm_mm, mm_counter_file(folio));

	folio_add_file_rmap_pte(folio, page, vma);

	set_pte_at(vma->vm_mm, addr, pte, mk_pte(page, prot));

	return 0;
@@ -3184,7 +3184,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) 
	if (likely(vmf->pte && pte_same(ptep_get(vmf->pte), vmf->orig_pte))) {

		if (old_folio) {

			if (!folio_test_anon(old_folio)) {

				dec_mm_counter(mm, mm_counter_file(&old_folio->page));

				dec_mm_counter(mm, mm_counter_file(old_folio));

				inc_mm_counter(mm, MM_ANONPAGES);

			}

			add_reliable_folio_counter(old_folio, mm, -1);
@@ -4480,7 +4480,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) 
	if (write)

		entry = maybe_pmd_mkwrite(pmd_mkdirty(entry), vma);



	add_mm_counter(vma->vm_mm, mm_counter_file(page), HPAGE_PMD_NR);

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

	add_reliable_page_counter(page, vma->vm_mm, HPAGE_PMD_NR);

	folio_add_file_rmap_pmd(folio, page, vma);
@@ -4545,7 +4545,7 @@ void set_pte_range(struct vm_fault *vmf, struct folio *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(page), nr);

		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);