From: David Hildenbrand <david@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, David Hildenbrand <david@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
Hugh Dickins <hughd@google.com>,
Ryan Roberts <ryan.roberts@arm.com>,
Yin Fengwei <fengwei.yin@intel.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Muchun Song <muchun.song@linux.dev>, Peter Xu <peterx@redhat.com>
Subject: [PATCH v2 09/40] mm/huge_memory: page_add_file_rmap() -> folio_add_file_rmap_pmd()
Date: Wed, 20 Dec 2023 23:44:33 +0100 [thread overview]
Message-ID: <20231220224504.646757-10-david@redhat.com> (raw)
In-Reply-To: <20231220224504.646757-1-david@redhat.com>
Let's convert remove_migration_pmd() and while at it, perform some folio
conversion.
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
mm/huge_memory.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index c50dc2e1483fb..bce6f987f36a3 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -3577,6 +3577,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw,
void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
{
+ struct folio *folio = page_folio(new);
struct vm_area_struct *vma = pvmw->vma;
struct mm_struct *mm = vma->vm_mm;
unsigned long address = pvmw->address;
@@ -3588,7 +3589,7 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
return;
entry = pmd_to_swp_entry(*pvmw->pmd);
- get_page(new);
+ folio_get(folio);
pmde = mk_huge_pmd(new, READ_ONCE(vma->vm_page_prot));
if (pmd_swp_soft_dirty(*pvmw->pmd))
pmde = pmd_mksoft_dirty(pmde);
@@ -3599,10 +3600,10 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
if (!is_migration_entry_young(entry))
pmde = pmd_mkold(pmde);
/* NOTE: this may contain setting soft-dirty on some archs */
- if (PageDirty(new) && is_migration_entry_dirty(entry))
+ if (folio_test_dirty(folio) && is_migration_entry_dirty(entry))
pmde = pmd_mkdirty(pmde);
- if (PageAnon(new)) {
+ if (folio_test_anon(folio)) {
rmap_t rmap_flags = RMAP_COMPOUND;
if (!is_readable_migration_entry(entry))
@@ -3610,9 +3611,9 @@ void remove_migration_pmd(struct page_vma_mapped_walk *pvmw, struct page *new)
page_add_anon_rmap(new, vma, haddr, rmap_flags);
} else {
- page_add_file_rmap(new, vma, true);
+ folio_add_file_rmap_pmd(folio, new, vma);
}
- VM_BUG_ON(pmd_write(pmde) && PageAnon(new) && !PageAnonExclusive(new));
+ VM_BUG_ON(pmd_write(pmde) && folio_test_anon(folio) && !PageAnonExclusive(new));
set_pmd_at(mm, haddr, pvmw->pmd, pmde);
/* No need to invalidate - it was non-present before */
--
2.43.0
next prev parent reply other threads:[~2023-12-20 22:45 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-20 22:44 [PATCH v2 00/40] mm/rmap: interface overhaul David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 01/40] mm/rmap: rename hugepage_add* to hugetlb_add* David Hildenbrand
2023-12-21 4:33 ` Matthew Wilcox
2023-12-20 22:44 ` [PATCH v2 02/40] mm/rmap: introduce and use hugetlb_remove_rmap() David Hildenbrand
2023-12-21 2:54 ` Muchun Song
2023-12-20 22:44 ` [PATCH v2 03/40] mm/rmap: introduce and use hugetlb_add_file_rmap() David Hildenbrand
2023-12-21 2:58 ` Muchun Song
2023-12-21 4:35 ` Matthew Wilcox
2023-12-20 22:44 ` [PATCH v2 04/40] mm/rmap: introduce and use hugetlb_try_dup_anon_rmap() David Hildenbrand
2023-12-21 4:40 ` Matthew Wilcox
2023-12-21 9:29 ` David Hildenbrand
2023-12-21 5:47 ` Muchun Song
2023-12-20 22:44 ` [PATCH v2 05/40] mm/rmap: introduce and use hugetlb_try_share_anon_rmap() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 06/40] mm/rmap: add hugetlb sanity checks for anon rmap handling David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 07/40] mm/rmap: convert folio_add_file_rmap_range() into folio_add_file_rmap_[pte|ptes|pmd]() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 08/40] mm/memory: page_add_file_rmap() -> folio_add_file_rmap_[pte|pmd]() David Hildenbrand
2024-08-09 17:13 ` Vincent Donnefort
2024-08-09 17:27 ` David Hildenbrand
2024-08-09 17:32 ` Vincent Donnefort
2023-12-20 22:44 ` David Hildenbrand [this message]
2023-12-20 22:44 ` [PATCH v2 10/40] mm/migrate: page_add_file_rmap() -> folio_add_file_rmap_pte() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 11/40] mm/userfaultfd: " David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 12/40] mm/rmap: remove page_add_file_rmap() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 13/40] mm/rmap: factor out adding folio mappings into __folio_add_rmap() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 14/40] mm/rmap: introduce folio_add_anon_rmap_[pte|ptes|pmd]() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 15/40] mm/huge_memory: batch rmap operations in __split_huge_pmd_locked() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 16/40] mm/huge_memory: page_add_anon_rmap() -> folio_add_anon_rmap_pmd() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 17/40] mm/migrate: page_add_anon_rmap() -> folio_add_anon_rmap_pte() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 18/40] mm/ksm: " David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 19/40] mm/swapfile: " David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 20/40] mm/memory: " David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 21/40] mm/rmap: remove page_add_anon_rmap() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 22/40] mm/rmap: remove RMAP_COMPOUND David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 23/40] mm/rmap: introduce folio_remove_rmap_[pte|ptes|pmd]() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 24/40] kernel/events/uprobes: page_remove_rmap() -> folio_remove_rmap_pte() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 25/40] mm/huge_memory: page_remove_rmap() -> folio_remove_rmap_pmd() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 26/40] mm/khugepaged: page_remove_rmap() -> folio_remove_rmap_pte() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 27/40] mm/ksm: " David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 28/40] mm/memory: " David Hildenbrand
2024-01-22 16:58 ` Ryan Roberts
2024-01-22 17:01 ` David Hildenbrand
2024-01-22 17:20 ` Matthew Wilcox
2024-01-22 17:26 ` Ryan Roberts
2024-01-22 17:32 ` Matthew Wilcox
2024-01-22 17:34 ` David Hildenbrand
2024-01-22 17:40 ` David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 29/40] mm/migrate_device: " David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 30/40] mm/rmap: " David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 31/40] Documentation: stop referring to page_remove_rmap() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 32/40] mm/rmap: remove page_remove_rmap() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 33/40] mm/rmap: convert page_dup_file_rmap() to folio_dup_file_rmap_[pte|ptes|pmd]() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 34/40] mm/rmap: introduce folio_try_dup_anon_rmap_[pte|ptes|pmd]() David Hildenbrand
2023-12-20 22:44 ` [PATCH v2 35/40] mm/huge_memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pmd() David Hildenbrand
2023-12-20 22:45 ` [PATCH v2 36/40] mm/memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pte() David Hildenbrand
2023-12-20 22:45 ` [PATCH v2 37/40] mm/rmap: remove page_try_dup_anon_rmap() David Hildenbrand
2023-12-20 22:45 ` [PATCH v2 38/40] mm: convert page_try_share_anon_rmap() to folio_try_share_anon_rmap_[pte|pmd]() David Hildenbrand
2023-12-20 22:45 ` [PATCH v2 39/40] mm/rmap: rename COMPOUND_MAPPED to ENTIRELY_MAPPED David Hildenbrand
2023-12-20 22:45 ` [PATCH v2 40/40] mm: remove one last reference to page_add_*_rmap() David Hildenbrand
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=20231220224504.646757-10-david@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=fengwei.yin@intel.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=muchun.song@linux.dev \
--cc=peterx@redhat.com \
--cc=ryan.roberts@arm.com \
--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