All of lore.kernel.org
 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>,
	Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 4/6] mm: memory: use a folio in do_cow_page()
Date: Tue, 7 Nov 2023 21:52:14 +0800	[thread overview]
Message-ID: <20231107135216.415926-5-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231107135216.415926-1-wangkefeng.wang@huawei.com>

Use folio_prealloc() helper and convert to use a folio in
do_cow_page(), which save five compound_head() calls.

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

diff --git a/mm/memory.c b/mm/memory.c
index 062136d25da3..5ecee3eac29d 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4648,6 +4648,7 @@ static vm_fault_t do_read_fault(struct vm_fault *vmf)
 static vm_fault_t do_cow_fault(struct vm_fault *vmf)
 {
 	struct vm_area_struct *vma = vmf->vma;
+	struct folio *folio;
 	vm_fault_t ret;
 
 	ret = vmf_can_call_fault(vmf);
@@ -4656,16 +4657,11 @@ static vm_fault_t do_cow_fault(struct vm_fault *vmf)
 	if (ret)
 		return ret;
 
-	vmf->cow_page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, vmf->address);
-	if (!vmf->cow_page)
+	folio = folio_prealloc(vma->vm_mm, vma, vmf->address, false);
+	if (!folio)
 		return VM_FAULT_OOM;
 
-	if (mem_cgroup_charge(page_folio(vmf->cow_page), vma->vm_mm,
-				GFP_KERNEL)) {
-		put_page(vmf->cow_page);
-		return VM_FAULT_OOM;
-	}
-	folio_throttle_swaprate(page_folio(vmf->cow_page), GFP_KERNEL);
+	vmf->cow_page = &folio->page;
 
 	ret = __do_fault(vmf);
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
@@ -4674,7 +4670,7 @@ static vm_fault_t do_cow_fault(struct vm_fault *vmf)
 		return ret;
 
 	copy_user_highpage(vmf->cow_page, vmf->page, vmf->address, vma);
-	__SetPageUptodate(vmf->cow_page);
+	__folio_mark_uptodate(folio);
 
 	ret |= finish_fault(vmf);
 	unlock_page(vmf->page);
@@ -4683,7 +4679,7 @@ static vm_fault_t do_cow_fault(struct vm_fault *vmf)
 		goto uncharge_out;
 	return ret;
 uncharge_out:
-	put_page(vmf->cow_page);
+	folio_put(folio);
 	return ret;
 }
 
-- 
2.27.0


  parent reply	other threads:[~2023-11-07 13:54 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 ` [PATCH 3/6] mm: memory: rename page_copy_prealloc() to folio_prealloc() Kefeng Wang
2023-11-07 18:21   ` Sidhartha Kumar
2023-11-07 13:52 ` Kefeng Wang [this message]
2023-11-07 18:27   ` [PATCH 4/6] mm: memory: use a folio in do_cow_page() 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-5-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 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.