--- v6
+++ v9
@@ -1,139 +1,35 @@
-Introduce utility functions setting the foundation for ptdescs. These
-will also assist in the splitting out of ptdesc from struct page.
+Converts internal pmd_pgtable_page() callers to use pmd_ptdesc(). This
+removes some direct accesses to struct page, working towards splitting
+out struct ptdesc from struct page.
-Functions that focus on the descriptor are prefixed with ptdesc_* while
-functions that focus on the pagetable are prefixed with pagetable_*.
-
-pagetable_alloc() is defined to allocate new ptdesc pages as compound
-pages. This is to standardize ptdescs by allowing for one allocation
-and one free function, in contrast to 2 allocation and 2 free functions.
-
+Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
---
- include/asm-generic/tlb.h | 11 ++++++++
- include/linux/mm.h | 56 +++++++++++++++++++++++++++++++++++++++
- include/linux/pgtable.h | 12 +++++++++
- 3 files changed, 79 insertions(+)
+ include/linux/mm.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
-index b46617207c93..6bade9e0e799 100644
---- a/include/asm-generic/tlb.h
-+++ b/include/asm-generic/tlb.h
-@@ -481,6 +481,17 @@ static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
- return tlb_remove_page_size(tlb, page, PAGE_SIZE);
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index 54dc176b90ea..f6d14a5fe747 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -2990,7 +2990,7 @@ static inline struct ptdesc *pmd_ptdesc(pmd_t *pmd)
+
+ static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd)
+ {
+- return ptlock_ptr(pmd_pgtable_page(pmd));
++ return ptlock_ptr(ptdesc_page(pmd_ptdesc(pmd)));
}
-+static inline void tlb_remove_ptdesc(struct mmu_gather *tlb, void *pt)
-+{
-+ tlb_remove_table(tlb, pt);
-+}
-+
-+/* Like tlb_remove_ptdesc, but for page-like page directories. */
-+static inline void tlb_remove_page_ptdesc(struct mmu_gather *tlb, struct ptdesc *pt)
-+{
-+ tlb_remove_page(tlb, ptdesc_page(pt));
-+}
-+
- static inline void tlb_change_page_size(struct mmu_gather *tlb,
- unsigned int page_size)
- {
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 0dad5f40ef96..14d95d494958 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -2744,6 +2744,57 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long a
- }
- #endif /* CONFIG_MMU */
-
-+static inline struct ptdesc *virt_to_ptdesc(const void *x)
-+{
-+ return page_ptdesc(virt_to_page(x));
-+}
-+
-+static inline void *ptdesc_to_virt(const struct ptdesc *pt)
-+{
-+ return page_to_virt(ptdesc_page(pt));
-+}
-+
-+static inline void *ptdesc_address(const struct ptdesc *pt)
-+{
-+ return folio_address(ptdesc_folio(pt));
-+}
-+
-+static inline bool pagetable_is_reserved(struct ptdesc *pt)
-+{
-+ return folio_test_reserved(ptdesc_folio(pt));
-+}
-+
-+/**
-+ * pagetable_alloc - Allocate pagetables
-+ * @gfp: GFP flags
-+ * @order: desired pagetable order
-+ *
-+ * pagetable_alloc allocates memory for page tables as well as a page table
-+ * descriptor to describe that memory.
-+ *
-+ * Return: The ptdesc describing the allocated page tables.
-+ */
-+static inline struct ptdesc *pagetable_alloc(gfp_t gfp, unsigned int order)
-+{
-+ struct page *page = alloc_pages(gfp | __GFP_COMP, order);
-+
-+ return page_ptdesc(page);
-+}
-+
-+/**
-+ * pagetable_free - Free pagetables
-+ * @pt: The page table descriptor
-+ *
-+ * pagetable_free frees the memory of all page tables described by a page
-+ * table descriptor and the memory for the descriptor itself.
-+ */
-+static inline void pagetable_free(struct ptdesc *pt)
-+{
-+ struct page *page = ptdesc_page(pt);
-+
-+ __free_pages(page, compound_order(page));
-+}
-+
- #if USE_SPLIT_PTE_PTLOCKS
- #if ALLOC_SPLIT_PTLOCKS
- void __init ptlock_cache_init(void);
-@@ -2981,6 +3032,11 @@ static inline void mark_page_reserved(struct page *page)
- adjust_managed_page_count(page, -1);
+ static inline bool pmd_ptlock_init(struct page *page)
+@@ -3009,7 +3009,7 @@ static inline void pmd_ptlock_free(struct page *page)
+ ptlock_free(page);
}
-+static inline void free_reserved_ptdesc(struct ptdesc *pt)
-+{
-+ free_reserved_page(ptdesc_page(pt));
-+}
-+
- /*
- * Default method to free all the __init memory into the buddy system.
- * The freed pages will be poisoned with pattern "poison" if it's within
-diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
-index d46cb709ce08..e9bb5f18cade 100644
---- a/include/linux/pgtable.h
-+++ b/include/linux/pgtable.h
-@@ -1055,6 +1055,18 @@ TABLE_MATCH(memcg_data, pt_memcg_data);
- #undef TABLE_MATCH
- static_assert(sizeof(struct ptdesc) <= sizeof(struct page));
+-#define pmd_huge_pte(mm, pmd) (pmd_pgtable_page(pmd)->pmd_huge_pte)
++#define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte)
-+#define ptdesc_page(pt) (_Generic((pt), \
-+ const struct ptdesc *: (const struct page *)(pt), \
-+ struct ptdesc *: (struct page *)(pt)))
-+
-+#define ptdesc_folio(pt) (_Generic((pt), \
-+ const struct ptdesc *: (const struct folio *)(pt), \
-+ struct ptdesc *: (struct folio *)(pt)))
-+
-+#define page_ptdesc(p) (_Generic((p), \
-+ const struct page *: (const struct ptdesc *)(p), \
-+ struct page *: (struct ptdesc *)(p)))
-+
- /*
- * No-op macros that just return the current protection value. Defined here
- * because these macros can be used even if CONFIG_MMU is not defined.
+ #else
+
--
2.40.1