powerpc-convert-various-functions-to-use-ptdescs.patch removed from -mm tree
The quilt patch titled
Subject: powerpc: convert various functions to use ptdescs
has been removed from the -mm tree. Its filename was
powerpc-convert-various-functions-to-use-ptdescs.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Vishal Moola (Oracle)" <[email protected]>
Subject: powerpc: convert various functions to use ptdescs
Date: Mon, 7 Aug 2023 16:04:54 -0700
In order to split struct ptdesc from struct page, convert various functions to use ptdescs.
Signed-off-by Vishal Moola (Oracle) <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Claudio Imbrenda <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Guo Ren <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Jonas Bonn <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Yoshinori Sato <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/powerpc/mm/book3s64/mmu_context.c | 10 +-- arch/powerpc/mm/book3s64/pgtable.c | 32 ++++++------ arch/powerpc/mm/pgtable-frag.c | 58 +++++++++++------------ 3 files changed, 50 insertions(+), 50 deletions(-)
arch/powerpc/mm/book3s64/mmu_context.c renamed from arch/powerpc/mm/book3s64/mmu_context.c~powerpc-convert-various-functions-to-use-ptdescs +5 -5
@@ -246,15 +246,15 @@ static void destroy_contexts(mm_context_static void pmd_frag_destroy (void *pmd_frag) {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); } }
arch/powerpc/mm/book3s64/pgtable.c renamed from arch/powerpc/mm/book3s64/pgtable.c~powerpc-convert-various-functions-to-use-ptdescs +16 -16
@@ -384,22 +384,22 @@ static pmd_t *get_pmd_from_cache(structstatic pmd_t *__alloc_for_pmdcache (struct mm_struct *mm) {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.
@@ -409,12 +409,12 @@ static pmd_t *__alloc_for_pmdcache(strucspin_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);
@@ -435,15 +435,15 @@ pmd_t *pmd_fragment_alloc(struct mm_struvoid 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); } }
arch/powerpc/mm/pgtable-frag.c renamed from arch/powerpc/mm/pgtable-frag.c~powerpc-convert-various-functions-to-use-ptdescs +29 -29
109 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are