linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
	Matthew Wilcox <willy@infradead.org>,
	David Hildenbrand <david@redhat.com>,
	<linux-s390@vger.kernel.org>,
	Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 15/18] mm: memory: use a folio in copy_nonpresent_pte()
Date: Fri, 3 Nov 2023 22:01:16 +0800	[thread overview]
Message-ID: <20231103140119.2306578-16-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231103140119.2306578-1-wangkefeng.wang@huawei.com>

Use a folio in copy_nonpresent_pte() to save one compound_head() call.

Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
 mm/memory.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 584fe9a550b9..fcc04dce8e8a 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -779,7 +779,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 	unsigned long vm_flags = dst_vma->vm_flags;
 	pte_t orig_pte = ptep_get(src_pte);
 	pte_t pte = orig_pte;
-	struct page *page;
+	struct folio *folio;
 	swp_entry_t entry = pte_to_swp_entry(orig_pte);
 
 	if (likely(!non_swap_entry(entry))) {
@@ -801,9 +801,9 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 		}
 		rss[MM_SWAPENTS]++;
 	} else if (is_migration_entry(entry)) {
-		page = pfn_swap_entry_to_page(entry);
+		folio = pfn_swap_entry_to_folio(entry);
 
-		rss[mm_counter(page)]++;
+		rss[mm_counter_folio(folio)]++;
 
 		if (!is_readable_migration_entry(entry) &&
 				is_cow_mapping(vm_flags)) {
@@ -822,7 +822,7 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 			set_pte_at(src_mm, addr, src_pte, pte);
 		}
 	} else if (is_device_private_entry(entry)) {
-		page = pfn_swap_entry_to_page(entry);
+		folio = pfn_swap_entry_to_folio(entry);
 
 		/*
 		 * Update rss count even for unaddressable pages, as
@@ -833,10 +833,10 @@ copy_nonpresent_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 		 * for unaddressable pages, at some point. But for now
 		 * keep things as they are.
 		 */
-		get_page(page);
-		rss[mm_counter(page)]++;
+		folio_get(folio);
+		rss[mm_counter_folio(folio)]++;
 		/* Cannot fail as these pages cannot get pinned. */
-		BUG_ON(page_try_dup_anon_rmap(page, false, src_vma));
+		BUG_ON(page_try_dup_anon_rmap(&folio->page, false, src_vma));
 
 		/*
 		 * We do not preserve soft-dirty information, because so
-- 
2.27.0



  parent reply	other threads:[~2023-11-03 14:04 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-03 14:01 [PATCH rfc 00/18] mm: convert to use folio mm counter Kefeng Wang
2023-11-03 14:01 ` [PATCH 01/18] mm: add mm_counter_folio() and mm_counter_file_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 02/18] uprobes: use mm_counter_file_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 03/18] mm: userfaultfd: use mm_counter_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 04/18] mm: rmap: use mm_counter_[file]_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 05/18] mm: swap: introduce pfn_swap_entry_to_folio() Kefeng Wang
2023-11-03 14:01 ` [PATCH 06/18] mm: huge_memory: use a folio in __split_huge_pmd_locked() Kefeng Wang
2023-11-03 14:01 ` [PATCH 07/18] mm: huge_memory: use a folio in zap_huge_pmd() Kefeng Wang
2023-11-03 14:01 ` [PATCH 08/18] mm: khugepaged: use mm_counter_file_folio() in collapse_pte_mapped_thp() Kefeng Wang
2023-11-03 14:01 ` [PATCH 09/18] mm: memory: use a folio in do_set_pmd() Kefeng Wang
2023-11-03 14:01 ` [PATCH 10/18] mm: memory: use mm_counter_file_folio() in copy_present_pte() Kefeng Wang
2023-11-03 14:01 ` [PATCH 11/18] mm: memory: use mm_counter_file_folio() in wp_page_copy() Kefeng Wang
2023-11-03 14:01 ` [PATCH 12/18] mm: memory: use mm_counter_file_folio() in set_pte_range() Kefeng Wang
2023-11-03 14:01 ` [PATCH 13/18] mm: memory: use a folio in insert_page_into_pte_locked() Kefeng Wang
2023-11-03 14:01 ` [PATCH 14/18] mm: remove mm_counter_file() Kefeng Wang
2023-11-03 14:01 ` Kefeng Wang [this message]
2023-11-03 14:01 ` [PATCH 16/18] mm: use a folio in zap_pte_range() Kefeng Wang
2023-11-03 19:04   ` kernel test robot
2023-11-03 14:01 ` [PATCH 17/18] s390: pgtable: use mm_counter_folio() in ptep_zap_swap_entry() Kefeng Wang
2023-11-03 14:01 ` [PATCH 18/18] mm: remove mm_counter() Kefeng Wang
2023-11-03 14:30 ` [PATCH rfc 00/18] mm: convert to use folio mm counter Matthew Wilcox
2023-11-04  3:58   ` Kefeng Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231103140119.2306578-16-wangkefeng.wang@huawei.com \
    --to=wangkefeng.wang@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=david@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox