linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, willy@infradead.org,
	Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 4/4] mm/memory: convert do_read_fault() to use folios
Date: Wed,  5 Jul 2023 12:43:35 -0700	[thread overview]
Message-ID: <20230705194335.273790-4-sidhartha.kumar@oracle.com> (raw)
In-Reply-To: <20230705194335.273790-1-sidhartha.kumar@oracle.com>

Saves one implicit call to compound_head()

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
v2
	 - move folio initialization after __do_fault()

 mm/memory.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index ce7826d3f6200..e40a03e488ca2 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4527,6 +4527,7 @@ static inline bool should_fault_around(struct vm_fault *vmf)
 static vm_fault_t do_read_fault(struct vm_fault *vmf)
 {
 	vm_fault_t ret = 0;
+	struct folio *folio;
 
 	/*
 	 * Let's call ->map_pages() first and use ->fault() as fallback
@@ -4543,10 +4544,12 @@ static vm_fault_t do_read_fault(struct vm_fault *vmf)
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
 		return ret;
 
+	folio = page_folio(vmf->page);
+
 	ret |= finish_fault(vmf);
-	unlock_page(vmf->page);
+	folio_unlock(folio);
 	if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
-		put_page(vmf->page);
+		folio_put(folio);
 	return ret;
 }
 
-- 
2.41.0



  parent reply	other threads:[~2023-07-05 19:44 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-05 19:43 [PATCH v2 1/4] mm/memory: convert do_page_mkwrite() " Sidhartha Kumar
2023-07-05 19:43 ` [PATCH v2 2/4] mm/memory: convert wp_page_shared() " Sidhartha Kumar
2023-07-05 20:03   ` Matthew Wilcox
2023-07-05 19:43 ` [PATCH v2 3/4] mm/memory: convert do_shared_fault() to folios Sidhartha Kumar
2023-07-05 20:13   ` Matthew Wilcox
2023-07-05 20:16     ` Sidhartha Kumar
2023-07-05 20:19       ` Matthew Wilcox
2023-07-05 19:43 ` Sidhartha Kumar [this message]
2023-07-05 20:19   ` [PATCH v2 4/4] mm/memory: convert do_read_fault() to use folios Matthew Wilcox
2023-07-05 20:25     ` Sidhartha Kumar
2023-07-05 19:52 ` [PATCH v2 1/4] mm/memory: convert do_page_mkwrite() " Matthew Wilcox

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=20230705194335.273790-4-sidhartha.kumar@oracle.com \
    --to=sidhartha.kumar@oracle.com \
    --cc=akpm@linux-foundation.org \
    --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