All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org
Cc: linux-fsdevel@vger.kernel.org, linux-fscrypt@vger.kernel.org,
	"Matthew Wilcox \(Oracle\)" <willy@infradead.org>,
	linux-f2fs-devel@lists.sourceforge.net
Subject: [f2fs-dev] [PATCH 5/6] userfault; Expand folio use in mfill_atomic_install_pte()
Date: Tue, 23 Apr 2024 23:55:36 +0100	[thread overview]
Message-ID: <20240423225552.4113447-6-willy@infradead.org> (raw)
In-Reply-To: <20240423225552.4113447-1-willy@infradead.org>

Call page_folio() a little earlier so we can use folio_mapping()
instead of page_mapping(), saving a call to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 mm/userfaultfd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index d9dcc7d71a39..e6486923263c 100644
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -180,9 +180,9 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd,
 	pte_t _dst_pte, *dst_pte;
 	bool writable = dst_vma->vm_flags & VM_WRITE;
 	bool vm_shared = dst_vma->vm_flags & VM_SHARED;
-	bool page_in_cache = page_mapping(page);
 	spinlock_t *ptl;
-	struct folio *folio;
+	struct folio *folio = page_folio(page);
+	bool page_in_cache = folio_mapping(folio);
 
 	_dst_pte = mk_pte(page, dst_vma->vm_page_prot);
 	_dst_pte = pte_mkdirty(_dst_pte);
@@ -212,7 +212,6 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd,
 	if (!pte_none_mostly(ptep_get(dst_pte)))
 		goto out_unlock;
 
-	folio = page_folio(page);
 	if (page_in_cache) {
 		/* Usually, cache pages are already added to LRU */
 		if (newly_allocated)
-- 
2.43.0



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

WARNING: multiple messages have this Message-ID (diff)
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-fsdevel@vger.kernel.org, linux-fscrypt@vger.kernel.org,
	linux-f2fs-devel@lists.sourceforge.net
Subject: [PATCH 5/6] userfault; Expand folio use in mfill_atomic_install_pte()
Date: Tue, 23 Apr 2024 23:55:36 +0100	[thread overview]
Message-ID: <20240423225552.4113447-6-willy@infradead.org> (raw)
In-Reply-To: <20240423225552.4113447-1-willy@infradead.org>

Call page_folio() a little earlier so we can use folio_mapping()
instead of page_mapping(), saving a call to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 mm/userfaultfd.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c
index d9dcc7d71a39..e6486923263c 100644
--- a/mm/userfaultfd.c
+++ b/mm/userfaultfd.c
@@ -180,9 +180,9 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd,
 	pte_t _dst_pte, *dst_pte;
 	bool writable = dst_vma->vm_flags & VM_WRITE;
 	bool vm_shared = dst_vma->vm_flags & VM_SHARED;
-	bool page_in_cache = page_mapping(page);
 	spinlock_t *ptl;
-	struct folio *folio;
+	struct folio *folio = page_folio(page);
+	bool page_in_cache = folio_mapping(folio);
 
 	_dst_pte = mk_pte(page, dst_vma->vm_page_prot);
 	_dst_pte = pte_mkdirty(_dst_pte);
@@ -212,7 +212,6 @@ int mfill_atomic_install_pte(pmd_t *dst_pmd,
 	if (!pte_none_mostly(ptep_get(dst_pte)))
 		goto out_unlock;
 
-	folio = page_folio(page);
 	if (page_in_cache) {
 		/* Usually, cache pages are already added to LRU */
 		if (newly_allocated)
-- 
2.43.0


  parent reply	other threads:[~2024-04-23 22:56 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-23 22:55 [f2fs-dev] [PATCH 0/6] Remove page_mapping() Matthew Wilcox (Oracle)
2024-04-23 22:55 ` Matthew Wilcox (Oracle)
2024-04-23 22:55 ` [f2fs-dev] [PATCH 1/6] fscrypt: Convert bh_get_inode_and_lblk_num to use a folio Matthew Wilcox (Oracle)
2024-04-23 22:55   ` Matthew Wilcox (Oracle)
2024-04-23 23:34   ` [f2fs-dev] " Eric Biggers
2024-04-23 23:34     ` Eric Biggers
2024-04-24 11:53   ` [f2fs-dev] " David Hildenbrand
2024-04-24 11:53     ` David Hildenbrand
2024-04-23 22:55 ` [f2fs-dev] [PATCH 2/6] f2fs: Convert f2fs_clear_page_cache_dirty_tag " Matthew Wilcox (Oracle)
2024-04-23 22:55   ` Matthew Wilcox (Oracle)
2024-04-24 11:53   ` [f2fs-dev] " David Hildenbrand
2024-04-24 11:53     ` David Hildenbrand
2024-04-23 22:55 ` [f2fs-dev] [PATCH 3/6] memory-failure: Remove calls to page_mapping() Matthew Wilcox (Oracle)
2024-04-23 22:55   ` Matthew Wilcox (Oracle)
2024-04-23 23:52   ` [f2fs-dev] " Sidhartha Kumar via Linux-f2fs-devel
2024-04-23 23:52     ` Sidhartha Kumar
2024-04-24 11:54   ` [f2fs-dev] " David Hildenbrand
2024-04-24 11:54     ` David Hildenbrand
2024-04-25  6:21   ` [f2fs-dev] " Miaohe Lin via Linux-f2fs-devel
2024-04-25  6:21     ` Miaohe Lin
2024-04-23 22:55 ` [f2fs-dev] [PATCH 4/6] migrate: Expand the use of folio in __migrate_device_pages() Matthew Wilcox (Oracle)
2024-04-23 22:55   ` Matthew Wilcox (Oracle)
2024-04-24 11:54   ` [f2fs-dev] " David Hildenbrand
2024-04-24 11:54     ` David Hildenbrand
2024-04-23 22:55 ` Matthew Wilcox (Oracle) [this message]
2024-04-23 22:55   ` [PATCH 5/6] userfault; Expand folio use in mfill_atomic_install_pte() Matthew Wilcox (Oracle)
2024-04-24 11:55   ` [f2fs-dev] " David Hildenbrand
2024-04-24 11:55     ` David Hildenbrand
2024-04-23 22:55 ` [f2fs-dev] [PATCH 6/6] mm: Remove page_mapping() Matthew Wilcox (Oracle)
2024-04-23 22:55   ` Matthew Wilcox (Oracle)
2024-04-24 11:55   ` [f2fs-dev] " David Hildenbrand
2024-04-24 11:55     ` David Hildenbrand
2024-04-24 23:34     ` [f2fs-dev] " Andrew Morton
2024-04-24 23:34       ` Andrew Morton
2024-04-24 23:59       ` [f2fs-dev] " Matthew Wilcox
2024-04-24 23:59         ` Matthew Wilcox
2024-05-20 21:16 ` [f2fs-dev] [PATCH 0/6] " patchwork-bot+f2fs
2024-05-20 21:16   ` patchwork-bot+f2fs
2024-07-24  2:16 ` patchwork-bot+f2fs
2024-07-24  2:16   ` patchwork-bot+f2fs

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=20240423225552.4113447-6-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-f2fs-devel@lists.sourceforge.net \
    --cc=linux-fscrypt@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.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.