* [PATCH] mm: Remove __hugepage_set_anon_rmap()
@ 2018-12-17 12:13 Kirill Tkhai
2018-12-17 12:36 ` Kirill A. Shutemov
2018-12-17 22:52 ` Mike Kravetz
0 siblings, 2 replies; 3+ messages in thread
From: Kirill Tkhai @ 2018-12-17 12:13 UTC (permalink / raw)
To: akpm, kirill.shutemov, mike.kravetz, jglisse, ktkhai, linux-mm,
linux-kernel
This function is identical to __page_set_anon_rmap()
since the time, when it was introduced (8 years ago).
The patch removes the function, and makes its users
to use __page_set_anon_rmap() instead.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
mm/rmap.c | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/mm/rmap.c b/mm/rmap.c
index 896c61dbf16c..f0d3bab2f7ad 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1020,7 +1020,7 @@ void page_move_anon_rmap(struct page *page, struct vm_area_struct *vma)
/**
* __page_set_anon_rmap - set up new anonymous rmap
- * @page: Page to add to rmap
+ * @page: Page or Hugepage to add to rmap
* @vma: VM area to add page to.
* @address: User virtual address of the mapping
* @exclusive: the page is exclusively owned by the current process
@@ -1921,27 +1921,10 @@ void rmap_walk_locked(struct page *page, struct rmap_walk_control *rwc)
#ifdef CONFIG_HUGETLB_PAGE
/*
- * The following three functions are for anonymous (private mapped) hugepages.
+ * The following two functions are for anonymous (private mapped) hugepages.
* Unlike common anonymous pages, anonymous hugepages have no accounting code
* and no lru code, because we handle hugepages differently from common pages.
*/
-static void __hugepage_set_anon_rmap(struct page *page,
- struct vm_area_struct *vma, unsigned long address, int exclusive)
-{
- struct anon_vma *anon_vma = vma->anon_vma;
-
- BUG_ON(!anon_vma);
-
- if (PageAnon(page))
- return;
- if (!exclusive)
- anon_vma = anon_vma->root;
-
- anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;
- page->mapping = (struct address_space *) anon_vma;
- page->index = linear_page_index(vma, address);
-}
-
void hugepage_add_anon_rmap(struct page *page,
struct vm_area_struct *vma, unsigned long address)
{
@@ -1953,7 +1936,7 @@ void hugepage_add_anon_rmap(struct page *page,
/* address might be in next vma when migration races vma_adjust */
first = atomic_inc_and_test(compound_mapcount_ptr(page));
if (first)
- __hugepage_set_anon_rmap(page, vma, address, 0);
+ __page_set_anon_rmap(page, vma, address, 0);
}
void hugepage_add_new_anon_rmap(struct page *page,
@@ -1961,6 +1944,6 @@ void hugepage_add_new_anon_rmap(struct page *page,
{
BUG_ON(address < vma->vm_start || address >= vma->vm_end);
atomic_set(compound_mapcount_ptr(page), 0);
- __hugepage_set_anon_rmap(page, vma, address, 1);
+ __page_set_anon_rmap(page, vma, address, 1);
}
#endif /* CONFIG_HUGETLB_PAGE */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: Remove __hugepage_set_anon_rmap()
2018-12-17 12:13 [PATCH] mm: Remove __hugepage_set_anon_rmap() Kirill Tkhai
@ 2018-12-17 12:36 ` Kirill A. Shutemov
2018-12-17 22:52 ` Mike Kravetz
1 sibling, 0 replies; 3+ messages in thread
From: Kirill A. Shutemov @ 2018-12-17 12:36 UTC (permalink / raw)
To: Kirill Tkhai
Cc: akpm, kirill.shutemov, mike.kravetz, jglisse, linux-mm, linux-kernel
On Mon, Dec 17, 2018 at 03:13:51PM +0300, Kirill Tkhai wrote:
> This function is identical to __page_set_anon_rmap()
> since the time, when it was introduced (8 years ago).
> The patch removes the function, and makes its users
> to use __page_set_anon_rmap() instead.
>
> Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mm: Remove __hugepage_set_anon_rmap()
2018-12-17 12:13 [PATCH] mm: Remove __hugepage_set_anon_rmap() Kirill Tkhai
2018-12-17 12:36 ` Kirill A. Shutemov
@ 2018-12-17 22:52 ` Mike Kravetz
1 sibling, 0 replies; 3+ messages in thread
From: Mike Kravetz @ 2018-12-17 22:52 UTC (permalink / raw)
To: Kirill Tkhai, akpm, kirill.shutemov, jglisse, linux-mm, linux-kernel
On 12/17/18 4:13 AM, Kirill Tkhai wrote:
> This function is identical to __page_set_anon_rmap()
> since the time, when it was introduced (8 years ago).
> The patch removes the function, and makes its users
> to use __page_set_anon_rmap() instead.
>
> Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Thanks for cleaning this up!
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
--
Mike Kravetz
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-17 22:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-17 12:13 [PATCH] mm: Remove __hugepage_set_anon_rmap() Kirill Tkhai
2018-12-17 12:36 ` Kirill A. Shutemov
2018-12-17 22:52 ` Mike Kravetz
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).