powerpc/mm: Fix size of allocated PGDIR

[PATCH] powerpc/mm: Fix size of allocated PGDIR

Posted by Christophe Leroy 1 year, 6 months ago

Commit 6b0e82791bd0 ("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: Guenter Roeck <linux@roeck-us.net>
Fixes: 6b0e82791bd0 ("powerpc/e500: switch to 64 bits PGD on 85xx (32 bits)")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/mm/init-common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c
index 9b4a675eb8f8..2978fcbe307e 100644
--- a/arch/powerpc/mm/init-common.c
+++ b/arch/powerpc/mm/init-common.c
@@ -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
-- 
2.44.0

Re: [PATCH] powerpc/mm: Fix size of allocated PGDIR

Posted by Michael Ellerman 1 year, 6 months ago

On Thu, 08 Aug 2024 11:32:47 +0200, Christophe Leroy wrote:
> Commit 6b0e82791bd0 ("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.
> 
> [...]

Applied to powerpc/fixes.

[1/1] powerpc/mm: Fix size of allocated PGDIR
      https://git.kernel.org/powerpc/c/e7a9af8c93aa9f408f9972809b642faeec5287e1

cheers

Re: [PATCH] powerpc/mm: Fix size of allocated PGDIR

Posted by Guenter Roeck 1 year, 6 months ago

On 8/8/24 02:32, Christophe Leroy wrote:
> Commit 6b0e82791bd0 ("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: Guenter Roeck <linux@roeck-us.net>
> Fixes: 6b0e82791bd0 ("powerpc/e500: switch to 64 bits PGD on 85xx (32 bits)")
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>

Tested-by: Guenter Roeck <linux@roeck-us.net>

> ---
>   arch/powerpc/mm/init-common.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/mm/init-common.c b/arch/powerpc/mm/init-common.c
> index 9b4a675eb8f8..2978fcbe307e 100644
> --- a/arch/powerpc/mm/init-common.c
> +++ b/arch/powerpc/mm/init-common.c
> @@ -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