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 v2 05/10] mm: memory: use a folio in copy_nonpresent_pte()
Date: Sat, 4 Nov 2023 11:55:17 +0800 [thread overview]
Message-ID: <20231104035522.2418660-6-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231104035522.2418660-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 1f18ed4a5497..d9314dee355e 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->page)]++;
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->page)]++;
/* 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
next prev parent reply other threads:[~2023-11-04 3:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-04 3:55 [PATCH rfc v2 00/10] mm: convert mm counter to take a folio Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 01/10] mm: swap: introduce pfn_swap_entry_to_folio() Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 02/10] s390: pgtable: use a folio in ptep_zap_swap_entry() Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 03/10] mm: huge_memory: use a folio in __split_huge_pmd_locked() Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 04/10] mm: huge_memory: use a folio in zap_huge_pmd() Kefeng Wang
2023-11-04 3:55 ` Kefeng Wang [this message]
2023-11-04 3:55 ` [PATCH v2 06/10] mm: memory: use a folio in zap_pte_range() Kefeng Wang
2023-11-04 17:20 ` Matthew Wilcox
2023-11-06 2:30 ` Kefeng Wang
2023-11-06 14:20 ` Matthew Wilcox
2023-11-06 15:08 ` Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 07/10] mm: memory: use a folio in do_set_pmd() Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 08/10] mm: memory: use a folio in insert_page_into_pte_locked() Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 09/10] mm: convert mm_counter() to take a folio Kefeng Wang
2023-11-04 3:55 ` [PATCH v2 10/10] mm: convert mm_counter_file() " 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=20231104035522.2418660-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.