Commit e7a9af8c authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Fix size of allocated PGDIR 



Commit 6b0e8279 ("powerpc/e500: switch to 64 bits PGD on 85xx
(32 bits)") increased the size of PGD entries but failed to increase
the PGD directory.

Use the size of pgd_t instead of the size of pointers to calculate
the allocated size.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Fixes: 6b0e8279 ("powerpc/e500: switch to 64 bits PGD on 85xx (32 bits)")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/1cdaacb391cbd3e0240f0e0faf691202874e9422.1723109462.git.christophe.leroy@csgroup.eu
parent 06ce0af3

arch/powerpc/mm/init-common.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void setup_kup(void) 


#define CTOR(shift) static void ctor_##shift(void *addr) \

{							\

	memset(addr, 0, sizeof(void *) << (shift));	\

	memset(addr, 0, sizeof(pgd_t) << (shift));	\

}



CTOR(0); CTOR(1); CTOR(2); CTOR(3); CTOR(4); CTOR(5); CTOR(6); CTOR(7);
@@ -117,7 +117,7 @@ EXPORT_SYMBOL_GPL(pgtable_cache); /* used by kvm_hv module */ 
void pgtable_cache_add(unsigned int shift)

{

	char *name;

	unsigned long table_size = sizeof(void *) << shift;

	unsigned long table_size = sizeof(pgd_t) << shift;

	unsigned long align = table_size;



	/* When batching pgtable pointers for RCU freeing, we store