s390/mm: add missing conversion to use ptdescs

Alexander Gordeev · Vasily Gorbik · commit 0547e0bd9b95 · 2023-11-05T22:34:57.000+01:00
Commit 6326c26 ("s390: convert various pgalloc functions to use ptdescs") missed to convert tlb_remove_table() into tlb_remove_ptdesc() in few locations. Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h
@@ -112,7 +112,7 @@ static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,
 	__tlb_adjust_range(tlb, address, PAGE_SIZE);
 	tlb->mm->context.flush_mm = 1;
 	tlb->freed_tables = 1;
-	tlb_remove_table(tlb, p4d);
+	tlb_remove_ptdesc(tlb, p4d);
 }
 
 /*
@@ -130,7 +130,7 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud,
 	tlb->mm->context.flush_mm = 1;
 	tlb->freed_tables = 1;
 	tlb->cleared_p4ds = 1;
-	tlb_remove_table(tlb, pud);
+	tlb_remove_ptdesc(tlb, pud);
 }
 
 
diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
@@ -412,7 +412,7 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table,
 	}
 	spin_unlock_bh(&mm->context.lock);
 	table = (unsigned long *) ((unsigned long) table | (0x01U << bit));
-	tlb_remove_table(tlb, table);
+	tlb_remove_ptdesc(tlb, table);
 }
 
 void __tlb_remove_table(void *_table)

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static inline void p4d_free_tlb(struct mmu_gather tlb, p4d_t p4d,`
`112`	`112`	`__tlb_adjust_range(tlb, address, PAGE_SIZE);`
`113`	`113`	`tlb->mm->context.flush_mm = 1;`
`114`	`114`	`tlb->freed_tables = 1;`
`115`		`- tlb_remove_table(tlb, p4d);`
	`115`	`+ tlb_remove_ptdesc(tlb, p4d);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/*`
`@@ -130,7 +130,7 @@ static inline void pud_free_tlb(struct mmu_gather tlb, pud_t pud,`
`130`	`130`	`tlb->mm->context.flush_mm = 1;`
`131`	`131`	`tlb->freed_tables = 1;`
`132`	`132`	`tlb->cleared_p4ds = 1;`
`133`		`- tlb_remove_table(tlb, pud);`
	`133`	`+ tlb_remove_ptdesc(tlb, pud);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ void page_table_free_rcu(struct mmu_gather tlb, unsigned long table,`
`412`	`412`	`}`
`413`	`413`	`spin_unlock_bh(&mm->context.lock);`
`414`	`414`	`table = (unsigned long *) ((unsigned long) table \| (0x01U << bit));`
`415`		`- tlb_remove_table(tlb, table);`
	`415`	`+ tlb_remove_ptdesc(tlb, table);`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`void __tlb_remove_table(void *_table)`