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>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 3/6] mm: memory: rename page_copy_prealloc() to folio_prealloc()
Date: Tue, 7 Nov 2023 21:52:13 +0800 [thread overview]
Message-ID: <20231107135216.415926-4-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231107135216.415926-1-wangkefeng.wang@huawei.com>
Let's rename page_copy_prealloc() to folio_prealloc(), which could
be reused in more functons, as it maybe zero the new page, pass a
new should_zero to it, and call the vma_alloc_zeroed_movable_folio()
if need_zero is true.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
mm/memory.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index b1bff4d245da..062136d25da3 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -988,12 +988,17 @@ copy_present_pte(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma,
return 0;
}
-static inline struct folio *page_copy_prealloc(struct mm_struct *src_mm,
- struct vm_area_struct *vma, unsigned long addr)
+static inline struct folio *folio_prealloc(struct mm_struct *src_mm,
+ struct vm_area_struct *vma, unsigned long addr, bool need_zero)
{
struct folio *new_folio;
- new_folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma, addr, false);
+ if (need_zero)
+ new_folio = vma_alloc_zeroed_movable_folio(vma, addr);
+ else
+ new_folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0, vma,
+ addr, false);
+
if (!new_folio)
return NULL;
@@ -1125,7 +1130,7 @@ copy_pte_range(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma,
} else if (ret == -EBUSY) {
goto out;
} else if (ret == -EAGAIN) {
- prealloc = page_copy_prealloc(src_mm, src_vma, addr);
+ prealloc = folio_prealloc(src_mm, src_vma, addr, false);
if (!prealloc)
return -ENOMEM;
} else if (ret) {
--
2.27.0
next prev parent reply other threads:[~2023-11-07 13:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-07 13:52 [PATCH 0/6] mm: cleanup and use more folio in page fault Kefeng Wang
2023-11-07 13:52 ` [PATCH 1/6] mm: ksm: use more folio api in ksm_might_need_to_copy() Kefeng Wang
2023-11-07 14:24 ` Matthew Wilcox
2023-11-08 1:40 ` Kefeng Wang
2023-11-08 13:59 ` Matthew Wilcox
2023-11-09 7:09 ` Kefeng Wang
2023-11-13 8:32 ` David Hildenbrand
2023-11-13 9:51 ` Kefeng Wang
2023-11-07 13:52 ` [PATCH 2/6] mm: memory: use a folio in validate_page_before_insert() Kefeng Wang
2023-11-07 18:17 ` Sidhartha Kumar
2023-11-07 13:52 ` Kefeng Wang [this message]
2023-11-07 18:21 ` [PATCH 3/6] mm: memory: rename page_copy_prealloc() to folio_prealloc() Sidhartha Kumar
2023-11-07 13:52 ` [PATCH 4/6] mm: memory: use a folio in do_cow_page() Kefeng Wang
2023-11-07 18:27 ` Sidhartha Kumar
2023-11-08 1:41 ` Kefeng Wang
2023-11-07 13:52 ` [PATCH 5/6] mm: memory: use folio_prealloc() in wp_page_copy() Kefeng Wang
2023-11-07 13:52 ` [PATCH 6/6] mm: memory: use folio_prealloc() in do_anonymous_page() 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=20231107135216.415926-4-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=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