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 2/4] mm/memory: convert wp_page_shared() to use folios
Date: Wed,  5 Jul 2023 12:43:33 -0700	[thread overview]
Message-ID: <20230705194335.273790-2-sidhartha.kumar@oracle.com> (raw)
In-Reply-To: <20230705194335.273790-1-sidhartha.kumar@oracle.com>

Saves five implicit calls to compound_head().

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
	v2:
		- change function definition to pass in a folio

 mm/memory.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index e73245b791a7a..fba33fb55a010 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3281,13 +3281,13 @@ static vm_fault_t wp_pfn_shared(struct vm_fault *vmf)
 	return 0;
 }
 
-static vm_fault_t wp_page_shared(struct vm_fault *vmf)
+static vm_fault_t wp_page_shared(struct vm_fault *vmf, struct folio *folio)
 	__releases(vmf->ptl)
 {
 	struct vm_area_struct *vma = vmf->vma;
 	vm_fault_t ret = 0;
 
-	get_page(vmf->page);
+	folio_get(folio);
 
 	if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
 		vm_fault_t tmp;
@@ -3296,21 +3296,21 @@ static vm_fault_t wp_page_shared(struct vm_fault *vmf)
 		tmp = do_page_mkwrite(vmf);
 		if (unlikely(!tmp || (tmp &
 				      (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {
-			put_page(vmf->page);
+			folio_put(folio);
 			return tmp;
 		}
 		tmp = finish_mkwrite_fault(vmf);
 		if (unlikely(tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) {
-			unlock_page(vmf->page);
-			put_page(vmf->page);
+			folio_unlock(folio);
+			folio_put(folio);
 			return tmp;
 		}
 	} else {
 		wp_page_reuse(vmf);
-		lock_page(vmf->page);
+		folio_lock(folio);
 	}
 	ret |= fault_dirty_shared_page(vmf);
-	put_page(vmf->page);
+	folio_put(folio);
 
 	return ret;
 }
@@ -3375,7 +3375,7 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf)
 		 */
 		if (!vmf->page)
 			return wp_pfn_shared(vmf);
-		return wp_page_shared(vmf);
+		return wp_page_shared(vmf, page_folio(vmf->page));
 	}
 
 	if (vmf->page)
-- 
2.41.0



  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 ` Sidhartha Kumar [this message]
2023-07-05 20:03   ` [PATCH v2 2/4] mm/memory: convert wp_page_shared() " 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 ` [PATCH v2 4/4] mm/memory: convert do_read_fault() to use folios Sidhartha Kumar
2023-07-05 20:19   ` 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-2-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