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 3/4] mm/memory: convert do_shared_fault() to folios
Date: Sun, 2 Jul 2023 22:58:49 -0700 [thread overview]
Message-ID: <20230703055850.227169-3-sidhartha.kumar@oracle.com> (raw)
In-Reply-To: <20230703055850.227169-1-sidhartha.kumar@oracle.com>
Saves three implicit calls to compound_head().
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
mm/memory.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index 93480e846ace6..33bf13431974c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4594,6 +4594,7 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
vm_fault_t ret, tmp;
+ struct folio *folio = page_folio(vmf->page);
ret = __do_fault(vmf);
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY)))
@@ -4604,11 +4605,11 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf)
* about to become writable
*/
if (vma->vm_ops->page_mkwrite) {
- unlock_page(vmf->page);
+ folio_unlock(folio);
tmp = do_page_mkwrite(vmf);
if (unlikely(!tmp ||
(tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)))) {
- put_page(vmf->page);
+ folio_put(folio);
return tmp;
}
}
@@ -4616,8 +4617,8 @@ static vm_fault_t do_shared_fault(struct vm_fault *vmf)
ret |= finish_fault(vmf);
if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE |
VM_FAULT_RETRY))) {
- unlock_page(vmf->page);
- put_page(vmf->page);
+ folio_unlock(folio);
+ folio_put(folio);
return ret;
}
--
2.41.0
next prev parent reply other threads:[~2023-07-03 5:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-03 5:58 [PATCH 1/4] mm/memory: convert do_page_mkwrite() to use folios Sidhartha Kumar
2023-07-03 5:58 ` [PATCH 2/4] mm/memory: convert wp_page_shared() " Sidhartha Kumar
2023-07-03 9:29 ` zhangpeng (AS)
2023-07-03 23:29 ` Matthew Wilcox
2023-07-03 5:58 ` Sidhartha Kumar [this message]
2023-07-03 9:29 ` [PATCH 3/4] mm/memory: convert do_shared_fault() to folios zhangpeng (AS)
2023-07-03 22:05 ` SeongJae Park
2023-07-04 2:25 ` Sidhartha Kumar
2023-07-03 23:31 ` Matthew Wilcox
2023-07-04 2:18 ` Sidhartha Kumar
2023-07-03 5:58 ` [PATCH 4/4] mm/memory: convert do_read_fault() to use folios Sidhartha Kumar
2023-07-03 9:29 ` zhangpeng (AS)
2023-07-03 23:32 ` Matthew Wilcox
2023-07-03 9:29 ` [PATCH 1/4] mm/memory: convert do_page_mkwrite() " zhangpeng (AS)
2023-07-03 23:25 ` Matthew Wilcox
2023-07-04 19:35 ` 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=20230703055850.227169-3-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