Commit a0839471 authored by Barry Song's avatar Barry Song Committed by Liu Shixin
Browse files

mm: remove folio_test_anon(folio)==false path in __folio_add_anon_rmap() 

mainline inclusion
from mainline-v6.11-rc1
commit 4c1171f1d22484f2419b07ab688548350db521cb
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJ5MT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4c1171f1d22484f2419b07ab688548350db521cb

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

The folio_test_anon(folio)==false cases has been relocated to
folio_add_new_anon_rmap().  Additionally, four other callers consistently
pass anonymous folios.

stack 1:
remove_migration_pmd
   -> folio_add_anon_rmap_pmd
     -> __folio_add_anon_rmap

stack 2:
__split_huge_pmd_locked
   -> folio_add_anon_rmap_ptes
      -> __folio_add_anon_rmap

stack 3:
remove_migration_pmd
   -> folio_add_anon_rmap_pmd
      -> __folio_add_anon_rmap (RMAP_LEVEL_PMD)

stack 4:
try_to_merge_one_page
   -> replace_page
     -> folio_add_anon_rmap_pte
       -> __folio_add_anon_rmap

__folio_add_anon_rmap() only needs to handle the cases
folio_test_anon(folio)==true now.
We can remove the !folio_test_anon(folio)) path within
__folio_add_anon_rmap() now.

Link: https://lkml.kernel.org/r/20240617231137.80726-4-21cnbao@gmail.com


Signed-off-by: default avatarBarry Song <v-songbaohua@oppo.com>
Suggested-by: default avatarDavid Hildenbrand <david@redhat.com>
Tested-by: default avatarShuai Yuan <yuanshuai@oppo.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Chris Li <chrisl@kernel.org>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Cc: Yu Zhao <yuzhao@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent b14604b2

mm/rmap.c

+3 −14
Original line number Diff line number Diff line
@@ -1282,23 +1282,12 @@ static __always_inline void __folio_add_anon_rmap(struct folio *folio, 
{

	int i, nr, nr_pmdmapped = 0;



	VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio);



	nr = __folio_add_rmap(folio, page, nr_pages, level, &nr_pmdmapped);



	if (unlikely(!folio_test_anon(folio))) {

		VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio);

		/*

		 * For a PTE-mapped large folio, we only know that the single

		 * PTE is exclusive. Further, __folio_set_anon() might not get

		 * folio->index right when not given the address of the head

		 * page.

		 */

		VM_WARN_ON_FOLIO(folio_test_large(folio) &&

				 level != RMAP_LEVEL_PMD, folio);

		__folio_set_anon(folio, vma, address,

				 !!(flags & RMAP_EXCLUSIVE));

	} else if (likely(!folio_test_ksm(folio))) {

	if (likely(!folio_test_ksm(folio)))

		__page_check_anon_rmap(folio, page, vma, address);

	}



	__folio_mod_stat(folio, nr, nr_pmdmapped);