[v4,30/34] sh: Convert pte_free_tlb() to use ptdescs

Message ID	20230612210423.18611-31-vishal.moola@gmail.com
State	New
Headers	show Return-Path: <SRS0=Ca7u=CA=vger.kernel.org=sparclinux-owner@ozlabs.org> From: "Vishal Moola (Oracle)" <vishal.moola@gmail.com> To: Andrew Morton <akpm@linux-foundation.org>, Matthew Wilcox <willy@infradead.org> Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, Hugh Dickins <hughd@google.com>, "Vishal Moola (Oracle)" <vishal.moola@gmail.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Geert Uytterhoeven <geert+renesas@glider.be>, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Subject: [PATCH v4 30/34] sh: Convert pte_free_tlb() to use ptdescs Date: Mon, 12 Jun 2023 14:04:19 -0700 Message-Id: <20230612210423.18611-31-vishal.moola@gmail.com> In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com> References: <20230612210423.18611-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Split ptdesc from struct page \| expand [v4,00/34] Split ptdesc from struct page [v4,01/34] mm: Add PAGE_TYPE_OP folio functions [v4,02/34] s390: Use _pt_s390_gaddr for gmap address tracking [v4,03/34] s390: Use pt_frag_refcount for pagetables [v4,04/34] pgtable: Create struct ptdesc [v4,05/34] mm: add utility functions for ptdesc [v4,06/34] mm: Convert pmd_pgtable_page() to pmd_ptdesc() [v4,07/34] mm: Convert ptlock_alloc() to use ptdescs [v4,08/34] mm: Convert ptlock_ptr() to use ptdescs [v4,09/34] mm: Convert pmd_ptlock_init() to use ptdescs [v4,10/34] mm: Convert ptlock_init() to use ptdescs [v4,11/34] mm: Convert pmd_ptlock_free() to use ptdescs [v4,12/34] mm: Convert ptlock_free() to use ptdescs [v4,13/34] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} [v4,14/34] powerpc: Convert various functions to use ptdescs [v4,15/34] x86: Convert various functions to use ptdescs [v4,16/34] s390: Convert various gmap functions to use ptdescs [v4,17/34] s390: Convert various pgalloc functions to use ptdescs [v4,18/34] mm: Remove page table members from struct page [v4,19/34] pgalloc: Convert various functions to use ptdescs [v4,20/34] arm: Convert various functions to use ptdescs [v4,21/34] arm64: Convert various functions to use ptdescs [v4,22/34] csky: Convert __pte_free_tlb() to use ptdescs [v4,23/34] hexagon: Convert __pte_free_tlb() to use ptdescs [v4,24/34] loongarch: Convert various functions to use ptdescs [v4,25/34] m68k: Convert various functions to use ptdescs [v4,26/34] mips: Convert various functions to use ptdescs [v4,27/34] nios2: Convert __pte_free_tlb() to use ptdescs [v4,28/34] openrisc: Convert __pte_free_tlb() to use ptdescs [v4,29/34] riscv: Convert alloc_{pmd, pte}_late() to use ptdescs [v4,30/34] sh: Convert pte_free_tlb() to use ptdescs [v4,31/34] sparc64: Convert various functions to use ptdescs [v4,32/34] sparc: Convert pgtable_pte_page_{ctor, dtor}() to ptdesc equivalents [v4,33/34] um: Convert {pmd, pte}_free_tlb() to use ptdescs [v4,34/34] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers

Message ID

20230612210423.18611-31-vishal.moola@gmail.com

State

New

Headers

From: "Vishal Moola (Oracle)" <vishal.moola@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
        Matthew Wilcox <willy@infradead.org>
Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org,
        linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev,
        linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
        linux-openrisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
        linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org,
        linux-sh@vger.kernel.org, sparclinux@vger.kernel.org,
        linux-um@lists.infradead.org, xen-devel@lists.xenproject.org,
        kvm@vger.kernel.org, Hugh Dickins <hughd@google.com>,
        "Vishal Moola (Oracle)" <vishal.moola@gmail.com>,
        Yoshinori Sato <ysato@users.sourceforge.jp>,
        Geert Uytterhoeven <geert+renesas@glider.be>,
        John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Subject: [PATCH v4 30/34] sh: Convert pte_free_tlb() to use ptdescs
Date: Mon, 12 Jun 2023 14:04:19 -0700
Message-Id: <20230612210423.18611-31-vishal.moola@gmail.com>
In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com>
References: <20230612210423.18611-1-vishal.moola@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Split ptdesc from struct page | expand

Commit Message

Vishal Moola June 12, 2023, 9:04 p.m. UTC

Part of the conversions to replace pgtable constructor/destructors with
ptdesc equivalents. Also cleans up some spacing issues.

Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
---
 arch/sh/include/asm/pgalloc.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Mike Rapoport June 14, 2023, 3:19 p.m. UTC | #1

On Mon, Jun 12, 2023 at 02:04:19PM -0700, Vishal Moola (Oracle) wrote:
> Part of the conversions to replace pgtable constructor/destructors with
> ptdesc equivalents. Also cleans up some spacing issues.
> 
> Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>

> ---
>  arch/sh/include/asm/pgalloc.h | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
> index a9e98233c4d4..5d8577ab1591 100644
> --- a/arch/sh/include/asm/pgalloc.h
> +++ b/arch/sh/include/asm/pgalloc.h
> @@ -2,6 +2,7 @@
>  #ifndef __ASM_SH_PGALLOC_H
>  #define __ASM_SH_PGALLOC_H
>  
> +#include <linux/mm.h>
>  #include <asm/page.h>
>  
>  #define __HAVE_ARCH_PMD_ALLOC_ONE
> @@ -31,10 +32,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
>  	set_pmd(pmd, __pmd((unsigned long)page_address(pte)));
>  }
>  
> -#define __pte_free_tlb(tlb,pte,addr)			\
> -do {							\
> -	pgtable_pte_page_dtor(pte);			\
> -	tlb_remove_page((tlb), (pte));			\
> +#define __pte_free_tlb(tlb, pte, addr)				\
> +do {								\
> +	pagetable_pte_dtor(page_ptdesc(pte));			\
> +	tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));	\
>  } while (0)
>  
>  #endif /* __ASM_SH_PGALLOC_H */
> -- 
> 2.40.1
> 
>

diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
index a9e98233c4d4..5d8577ab1591 100644
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h
@@ -2,6 +2,7 @@ 
 #ifndef __ASM_SH_PGALLOC_H
 #define __ASM_SH_PGALLOC_H
 
+#include <linux/mm.h>
 #include <asm/page.h>
 
 #define __HAVE_ARCH_PMD_ALLOC_ONE
@@ -31,10 +32,10 @@  static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
 	set_pmd(pmd, __pmd((unsigned long)page_address(pte)));
 }
 
-#define __pte_free_tlb(tlb,pte,addr)			\
-do {							\
-	pgtable_pte_page_dtor(pte);			\
-	tlb_remove_page((tlb), (pte));			\
+#define __pte_free_tlb(tlb, pte, addr)				\
+do {								\
+	pagetable_pte_dtor(page_ptdesc(pte));			\
+	tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte)));	\
 } while (0)
 
 #endif /* __ASM_SH_PGALLOC_H */

[v4,30/34] sh: Convert pte_free_tlb() to use ptdescs

Commit Message

Comments

Patch