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 21/40] mm/rmap: remove page_add_anon_rmap()
Date: Wed, 20 Dec 2023 23:44:45 +0100 [thread overview]
Message-ID: <20231220224504.646757-22-david@redhat.com> (raw)
In-Reply-To: <20231220224504.646757-1-david@redhat.com>
All users are gone, remove it and all traces.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
include/linux/rmap.h | 2 --
mm/rmap.c | 31 ++++---------------------------
2 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index b5da3d86200e4..fe7b5a8b0e75b 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -239,8 +239,6 @@ void folio_add_anon_rmap_ptes(struct folio *, struct page *, int nr_pages,
folio_add_anon_rmap_ptes(folio, page, 1, vma, address, flags)
void folio_add_anon_rmap_pmd(struct folio *, struct page *,
struct vm_area_struct *, unsigned long address, rmap_t flags);
-void page_add_anon_rmap(struct page *, struct vm_area_struct *,
- unsigned long address, rmap_t flags);
void folio_add_new_anon_rmap(struct folio *, struct vm_area_struct *,
unsigned long address);
void folio_add_file_rmap_ptes(struct folio *, struct page *, int nr_pages,
diff --git a/mm/rmap.c b/mm/rmap.c
index 7f380f5a34c90..87415bbf24022 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1270,7 +1270,7 @@ static void __page_check_anon_rmap(struct folio *folio, struct page *page,
* The page's anon-rmap details (mapping and index) are guaranteed to
* be set up correctly at this point.
*
- * We have exclusion against page_add_anon_rmap because the caller
+ * We have exclusion against folio_add_anon_rmap_*() because the caller
* always holds the page locked.
*
* We have exclusion against folio_add_new_anon_rmap because those pages
@@ -1283,29 +1283,6 @@ static void __page_check_anon_rmap(struct folio *folio, struct page *page,
page);
}
-/**
- * page_add_anon_rmap - add pte mapping to an anonymous page
- * @page: the page to add the mapping to
- * @vma: the vm area in which the mapping is added
- * @address: the user virtual address mapped
- * @flags: the rmap flags
- *
- * The caller needs to hold the pte lock, and the page must be locked in
- * the anon_vma case: to serialize mapping,index checking after setting,
- * and to ensure that PageAnon is not being upgraded racily to PageKsm
- * (but PageKsm is never downgraded to PageAnon).
- */
-void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma,
- unsigned long address, rmap_t flags)
-{
- struct folio *folio = page_folio(page);
-
- if (likely(!(flags & RMAP_COMPOUND)))
- folio_add_anon_rmap_pte(folio, page, vma, address, flags);
- else
- folio_add_anon_rmap_pmd(folio, page, vma, address, flags);
-}
-
static __always_inline void __folio_add_anon_rmap(struct folio *folio,
struct page *page, int nr_pages, struct vm_area_struct *vma,
unsigned long address, rmap_t flags, enum rmap_level level)
@@ -1419,7 +1396,7 @@ void folio_add_anon_rmap_pmd(struct folio *folio, struct page *page,
* @vma: the vm area in which the mapping is added
* @address: the user virtual address mapped
*
- * Like page_add_anon_rmap() but must only be called on *new* folios.
+ * Like folio_add_anon_rmap_*() but must only be called on *new* folios.
* This means the inc-and-test can be bypassed.
* The folio does not have to be locked.
*
@@ -1479,7 +1456,7 @@ static __always_inline void __folio_add_file_rmap(struct folio *folio,
if (nr)
__lruvec_stat_mod_folio(folio, NR_FILE_MAPPED, nr);
- /* See comments in page_add_anon_rmap() */
+ /* See comments in folio_add_anon_rmap_*() */
if (!folio_test_large(folio))
mlock_vma_folio(folio, vma);
}
@@ -1593,7 +1570,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma,
/*
* It would be tidy to reset folio_test_anon mapping when fully
- * unmapped, but that might overwrite a racing page_add_anon_rmap
+ * unmapped, but that might overwrite a racing folio_add_anon_rmap_*()
* which increments mapcount after us but sets mapping before us:
* so leave the reset to free_pages_prepare, and remember that
* it's only reliable while mapped.
--
2.43.0
next prev parent reply other threads:[~2023-12-20 22:46 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 ` [PATCH v2 09/40] mm/huge_memory: page_add_file_rmap() -> folio_add_file_rmap_pmd() David Hildenbrand
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 ` David Hildenbrand [this message]
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-22-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;
as well as URLs for NNTP newsgroup(s).