[v5,29/33] sh: Convert pte_free_tlb() to use ptdescs

Message ID	20230622205745.79707-30-vishal.moola@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.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>, Mike Rapoport <rppt@kernel.org> Subject: [PATCH v5 29/33] sh: Convert pte_free_tlb() to use ptdescs Date: Thu, 22 Jun 2023 13:57:41 -0700 Message-Id: <20230622205745.79707-30-vishal.moola@gmail.com> In-Reply-To: <20230622205745.79707-1-vishal.moola@gmail.com> References: <20230622205745.79707-1-vishal.moola@gmail.com> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org> Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org
Series	Split ptdesc from struct page \| expand [v5,00/33] Split ptdesc from struct page [v5,01/33] mm: Add PAGE_TYPE_OP folio functions [v5,02/33] s390: Use _pt_s390_gaddr for gmap address tracking [v5,03/33] pgtable: Create struct ptdesc [v5,04/33] mm: add utility functions for ptdesc [v5,05/33] mm: Convert pmd_pgtable_page() to pmd_ptdesc() [v5,06/33] mm: Convert ptlock_alloc() to use ptdescs [v5,07/33] mm: Convert ptlock_ptr() to use ptdescs [v5,08/33] mm: Convert pmd_ptlock_init() to use ptdescs [v5,09/33] mm: Convert ptlock_init() to use ptdescs [v5,10/33] mm: Convert pmd_ptlock_free() to use ptdescs [v5,11/33] mm: Convert ptlock_free() to use ptdescs [v5,12/33] mm: Create ptdesc equivalents for pgtable_{pte,pmd}_page_{ctor,dtor} [v5,13/33] powerpc: Convert various functions to use ptdescs [v5,14/33] x86: Convert various functions to use ptdescs [v5,15/33] s390: Convert various gmap functions to use ptdescs [v5,16/33] s390: Convert various pgalloc functions to use ptdescs [v5,17/33] mm: Remove page table members from struct page [v5,18/33] pgalloc: Convert various functions to use ptdescs [v5,19/33] arm: Convert various functions to use ptdescs [v5,20/33] arm64: Convert various functions to use ptdescs [v5,21/33] csky: Convert __pte_free_tlb() to use ptdescs [v5,22/33] hexagon: Convert __pte_free_tlb() to use ptdescs [v5,23/33] loongarch: Convert various functions to use ptdescs [v5,24/33] m68k: Convert various functions to use ptdescs [v5,25/33] mips: Convert various functions to use ptdescs [v5,26/33] nios2: Convert __pte_free_tlb() to use ptdescs [v5,27/33] openrisc: Convert __pte_free_tlb() to use ptdescs [v5,28/33] riscv: Convert alloc_{pmd, pte}_late() to use ptdescs [v5,29/33] sh: Convert pte_free_tlb() to use ptdescs [v5,30/33] sparc64: Convert various functions to use ptdescs [v5,31/33] sparc: Convert pgtable_pte_page_{ctor, dtor}() to ptdesc equivalents [v5,32/33] um: Convert {pmd, pte}_free_tlb() to use ptdescs [v5,33/33] mm: Remove pgtable_{pmd, pte}_page_{ctor, dtor}() wrappers

Message ID

20230622205745.79707-30-vishal.moola@gmail.com (mailing list archive)

State

Superseded

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>,
	Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v5 29/33] sh: Convert pte_free_tlb() to use ptdescs
Date: Thu, 22 Jun 2023 13:57:41 -0700
Message-Id: <20230622205745.79707-30-vishal.moola@gmail.com>
In-Reply-To: <20230622205745.79707-1-vishal.moola@gmail.com>
References: <20230622205745.79707-1-vishal.moola@gmail.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org>
Errors-To: 
 linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org

Series

Split ptdesc from struct page | expand

Context	Check	Description
conchuod/tree_selection	fail	Failed to apply to next/pending-fixes, riscv/for-next or riscv/master

Context

Check

Description

conchuod/tree_selection

fail

Failed to apply to next/pending-fixes, riscv/for-next or riscv/master

Commit Message

Vishal Moola (Oracle) June 22, 2023, 8:57 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>
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 */

[v5,29/33] sh: Convert pte_free_tlb() to use ptdescs

Checks

Commit Message

Patch