--- v7
+++ v3
@@ -1,227 +1,76 @@
-In order to split struct ptdesc from struct page, convert various
-functions to use ptdescs.
+This removes some direct accesses to struct page, working towards
+splitting out struct ptdesc from struct page.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
-Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
- arch/powerpc/mm/book3s64/mmu_context.c | 10 ++---
- arch/powerpc/mm/book3s64/pgtable.c | 32 +++++++--------
- arch/powerpc/mm/pgtable-frag.c | 56 +++++++++++++-------------
- 3 files changed, 49 insertions(+), 49 deletions(-)
+ include/linux/mm.h | 10 +++++-----
+ mm/memory.c | 4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
-diff --git a/arch/powerpc/mm/book3s64/mmu_context.c b/arch/powerpc/mm/book3s64/mmu_context.c
-index c766e4c26e42..1715b07c630c 100644
---- a/arch/powerpc/mm/book3s64/mmu_context.c
-+++ b/arch/powerpc/mm/book3s64/mmu_context.c
-@@ -246,15 +246,15 @@ static void destroy_contexts(mm_context_t *ctx)
- static void pmd_frag_destroy(void *pmd_frag)
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index ffc82355fea6..72725aa6c30d 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -2807,7 +2807,7 @@ static inline void pagetable_clear(void *x)
+ #if ALLOC_SPLIT_PTLOCKS
+ void __init ptlock_cache_init(void);
+ bool ptlock_alloc(struct ptdesc *ptdesc);
+-extern void ptlock_free(struct page *page);
++void ptlock_free(struct ptdesc *ptdesc);
+
+ static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc)
{
- int count;
-- struct page *page;
-+ struct ptdesc *ptdesc;
-
-- page = virt_to_page(pmd_frag);
-+ ptdesc = virt_to_ptdesc(pmd_frag);
- /* drop all the pending references */
- count = ((unsigned long)pmd_frag & ~PAGE_MASK) >> PMD_FRAG_SIZE_SHIFT;
- /* We allow PTE_FRAG_NR fragments from a PTE page */
-- if (atomic_sub_and_test(PMD_FRAG_NR - count, &page->pt_frag_refcount)) {
-- pgtable_pmd_page_dtor(page);
-- __free_page(page);
-+ if (atomic_sub_and_test(PMD_FRAG_NR - count, &ptdesc->pt_frag_refcount)) {
-+ pagetable_pmd_dtor(ptdesc);
-+ pagetable_free(ptdesc);
- }
+@@ -2823,7 +2823,7 @@ static inline bool ptlock_alloc(struct ptdesc *ptdesc)
+ return true;
}
-diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c
-index 85c84e89e3ea..1212deeabe15 100644
---- a/arch/powerpc/mm/book3s64/pgtable.c
-+++ b/arch/powerpc/mm/book3s64/pgtable.c
-@@ -306,22 +306,22 @@ static pmd_t *get_pmd_from_cache(struct mm_struct *mm)
- static pmd_t *__alloc_for_pmdcache(struct mm_struct *mm)
+-static inline void ptlock_free(struct page *page)
++static inline void ptlock_free(struct ptdesc *ptdesc)
{
- void *ret = NULL;
-- struct page *page;
-+ struct ptdesc *ptdesc;
- gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO;
-
- if (mm == &init_mm)
- gfp &= ~__GFP_ACCOUNT;
-- page = alloc_page(gfp);
-- if (!page)
-+ ptdesc = pagetable_alloc(gfp, 0);
-+ if (!ptdesc)
- return NULL;
-- if (!pgtable_pmd_page_ctor(page)) {
-- __free_pages(page, 0);
-+ if (!pagetable_pmd_ctor(ptdesc)) {
-+ pagetable_free(ptdesc);
- return NULL;
- }
-
-- atomic_set(&page->pt_frag_refcount, 1);
-+ atomic_set(&ptdesc->pt_frag_refcount, 1);
-
-- ret = page_address(page);
-+ ret = ptdesc_address(ptdesc);
- /*
- * if we support only one fragment just return the
- * allocated page.
-@@ -331,12 +331,12 @@ static pmd_t *__alloc_for_pmdcache(struct mm_struct *mm)
-
- spin_lock(&mm->page_table_lock);
- /*
-- * If we find pgtable_page set, we return
-+ * If we find ptdesc_page set, we return
- * the allocated page with single fragment
- * count.
- */
- if (likely(!mm->context.pmd_frag)) {
-- atomic_set(&page->pt_frag_refcount, PMD_FRAG_NR);
-+ atomic_set(&ptdesc->pt_frag_refcount, PMD_FRAG_NR);
- mm->context.pmd_frag = ret + PMD_FRAG_SIZE;
- }
- spin_unlock(&mm->page_table_lock);
-@@ -357,15 +357,15 @@ pmd_t *pmd_fragment_alloc(struct mm_struct *mm, unsigned long vmaddr)
-
- void pmd_fragment_free(unsigned long *pmd)
- {
-- struct page *page = virt_to_page(pmd);
-+ struct ptdesc *ptdesc = virt_to_ptdesc(pmd);
-
-- if (PageReserved(page))
-- return free_reserved_page(page);
-+ if (pagetable_is_reserved(ptdesc))
-+ return free_reserved_ptdesc(ptdesc);
-
-- BUG_ON(atomic_read(&page->pt_frag_refcount) <= 0);
-- if (atomic_dec_and_test(&page->pt_frag_refcount)) {
-- pgtable_pmd_page_dtor(page);
-- __free_page(page);
-+ BUG_ON(atomic_read(&ptdesc->pt_frag_refcount) <= 0);
-+ if (atomic_dec_and_test(&ptdesc->pt_frag_refcount)) {
-+ pagetable_pmd_dtor(ptdesc);
-+ pagetable_free(ptdesc);
- }
}
-diff --git a/arch/powerpc/mm/pgtable-frag.c b/arch/powerpc/mm/pgtable-frag.c
-index 0c6b68130025..4c899c9c0694 100644
---- a/arch/powerpc/mm/pgtable-frag.c
-+++ b/arch/powerpc/mm/pgtable-frag.c
-@@ -18,15 +18,15 @@
- void pte_frag_destroy(void *pte_frag)
+@@ -2864,7 +2864,7 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd)
+ }
+ static inline void ptlock_cache_init(void) {}
+ static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; }
+-static inline void ptlock_free(struct page *page) {}
++static inline void ptlock_free(struct ptdesc *ptdesc) {}
+ #endif /* USE_SPLIT_PTE_PTLOCKS */
+
+ static inline bool pgtable_pte_page_ctor(struct page *page)
+@@ -2878,7 +2878,7 @@ static inline bool pgtable_pte_page_ctor(struct page *page)
+
+ static inline void pgtable_pte_page_dtor(struct page *page)
{
- int count;
-- struct page *page;
-+ struct ptdesc *ptdesc;
-
-- page = virt_to_page(pte_frag);
-+ ptdesc = virt_to_ptdesc(pte_frag);
- /* drop all the pending references */
- count = ((unsigned long)pte_frag & ~PAGE_MASK) >> PTE_FRAG_SIZE_SHIFT;
- /* We allow PTE_FRAG_NR fragments from a PTE page */
-- if (atomic_sub_and_test(PTE_FRAG_NR - count, &page->pt_frag_refcount)) {
-- pgtable_pte_page_dtor(page);
-- __free_page(page);
-+ if (atomic_sub_and_test(PTE_FRAG_NR - count, &ptdesc->pt_frag_refcount)) {
-+ pagetable_pte_dtor(ptdesc);
-+ pagetable_free(ptdesc);
- }
+- ptlock_free(page);
++ ptlock_free(page_ptdesc(page));
+ __ClearPageTable(page);
+ dec_lruvec_page_state(page, NR_PAGETABLE);
+ }
+@@ -2936,7 +2936,7 @@ static inline void pmd_ptlock_free(struct ptdesc *ptdesc)
+ #ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ VM_BUG_ON_PAGE(ptdesc->pmd_huge_pte, ptdesc_page(ptdesc));
+ #endif
+- ptlock_free(ptdesc_page(ptdesc));
++ ptlock_free(ptdesc);
}
-@@ -55,25 +55,25 @@ static pte_t *get_pte_from_cache(struct mm_struct *mm)
- static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel)
- {
- void *ret = NULL;
-- struct page *page;
-+ struct ptdesc *ptdesc;
-
- if (!kernel) {
-- page = alloc_page(PGALLOC_GFP | __GFP_ACCOUNT);
-- if (!page)
-+ ptdesc = pagetable_alloc(PGALLOC_GFP | __GFP_ACCOUNT, 0);
-+ if (!ptdesc)
- return NULL;
-- if (!pgtable_pte_page_ctor(page)) {
-- __free_page(page);
-+ if (!pagetable_pte_ctor(ptdesc)) {
-+ pagetable_free(ptdesc);
- return NULL;
- }
- } else {
-- page = alloc_page(PGALLOC_GFP);
-- if (!page)
-+ ptdesc = pagetable_alloc(PGALLOC_GFP, 0);
-+ if (!ptdesc)
- return NULL;
- }
-
-- atomic_set(&page->pt_frag_refcount, 1);
-+ atomic_set(&ptdesc->pt_frag_refcount, 1);
-
-- ret = page_address(page);
-+ ret = ptdesc_address(ptdesc);
- /*
- * if we support only one fragment just return the
- * allocated page.
-@@ -82,12 +82,12 @@ static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel)
- return ret;
- spin_lock(&mm->page_table_lock);
- /*
-- * If we find pgtable_page set, we return
-+ * If we find ptdesc_page set, we return
- * the allocated page with single fragment
- * count.
- */
- if (likely(!pte_frag_get(&mm->context))) {
-- atomic_set(&page->pt_frag_refcount, PTE_FRAG_NR);
-+ atomic_set(&ptdesc->pt_frag_refcount, PTE_FRAG_NR);
- pte_frag_set(&mm->context, ret + PTE_FRAG_SIZE);
- }
- spin_unlock(&mm->page_table_lock);
-@@ -108,28 +108,28 @@ pte_t *pte_fragment_alloc(struct mm_struct *mm, int kernel)
-
- static void pte_free_now(struct rcu_head *head)
- {
-- struct page *page;
-+ struct ptdesc *ptdesc;
-
-- page = container_of(head, struct page, rcu_head);
-- pgtable_pte_page_dtor(page);
-- __free_page(page);
-+ ptdesc = container_of(head, struct ptdesc, pt_rcu_head);
-+ pagetable_pte_dtor(ptdesc);
-+ pagetable_free(ptdesc);
+ #define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte)
+diff --git a/mm/memory.c b/mm/memory.c
+index 8d37dd302f2f..df0251243dfa 100644
+--- a/mm/memory.c
++++ b/mm/memory.c
+@@ -5949,8 +5949,8 @@ bool ptlock_alloc(struct ptdesc *ptdesc)
+ return true;
}
- void pte_fragment_free(unsigned long *table, int kernel)
+-void ptlock_free(struct page *page)
++void ptlock_free(struct ptdesc *ptdesc)
{
-- struct page *page = virt_to_page(table);
-+ struct ptdesc *ptdesc = virt_to_ptdesc(table);
-
-- if (PageReserved(page))
-- return free_reserved_page(page);
-+ if (pagetable_is_reserved(ptdesc))
-+ return free_reserved_ptdesc(ptdesc);
-
- BUG_ON(atomic_read(&page->pt_frag_refcount) <= 0);
-- if (atomic_dec_and_test(&page->pt_frag_refcount)) {
-+ if (atomic_dec_and_test(&ptdesc->pt_frag_refcount)) {
- if (kernel)
-- __free_page(page);
-- else if (TestClearPageActive(page))
-- call_rcu(&page->rcu_head, pte_free_now);
-+ pagetable_free(ptdesc);
-+ else if (folio_test_clear_active(ptdesc_folio(ptdesc)))
-+ call_rcu(&ptdesc->pt_rcu_head, pte_free_now);
- else
-- pte_free_now(&page->rcu_head);
-+ pte_free_now(&ptdesc->pt_rcu_head);
- }
+- kmem_cache_free(page_ptl_cachep, page->ptl);
++ kmem_cache_free(page_ptl_cachep, ptdesc->ptl);
}
-
+ #endif
--
2.40.1