2022-06-23 09:33:26

by Christophe Leroy

Subject: [PATCH] powerpc/64e: Rewrite p4d_populate() as a static inline function

Rewrite p4d_populate() as a static inline function instead of
a macro.

This change allows typechecking and would have helped detecting
a recently found bug in map_kernel_page().

Cc: Mike Rapoport <[email protected]>
Signed-off-by: Christophe Leroy <[email protected]>
---
arch/powerpc/include/asm/nohash/64/pgalloc.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/nohash/64/pgalloc.h b/arch/powerpc/include/asm/nohash/64/pgalloc.h
index 668aee6017e7..e50b211becb3 100644
--- a/arch/powerpc/include/asm/nohash/64/pgalloc.h
+++ b/arch/powerpc/include/asm/nohash/64/pgalloc.h
@@ -15,7 +15,10 @@ struct vmemmap_backing {
};
extern struct vmemmap_backing *vmemmap_list;

-#define p4d_populate(MM, P4D, PUD) p4d_set(P4D, (unsigned long)PUD)
+static inline void p4d_populate(struct mm_struct *mm, p4d_t *p4d, pud_t *pud)
+{
+ p4d_set(p4d, (unsigned long)pud);
+}

static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
{
--
2.36.1

2022-06-23 19:14:27

by Mike Rapoport

Subject: Re: [PATCH] powerpc/64e: Rewrite p4d_populate() as a static inline function

On Thu, Jun 23, 2022 at 10:56:57AM +0200, Christophe Leroy wrote:
> Rewrite p4d_populate() as a static inline function instead of
> a macro.
>
> This change allows typechecking and would have helped detecting
> a recently found bug in map_kernel_page().
>
> Cc: Mike Rapoport <[email protected]>
> Signed-off-by: Christophe Leroy <[email protected]>

Acked-by: Mike Rapoport <[email protected]>

> ---
> arch/powerpc/include/asm/nohash/64/pgalloc.h | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/include/asm/nohash/64/pgalloc.h b/arch/powerpc/include/asm/nohash/64/pgalloc.h
> index 668aee6017e7..e50b211becb3 100644
> --- a/arch/powerpc/include/asm/nohash/64/pgalloc.h
> +++ b/arch/powerpc/include/asm/nohash/64/pgalloc.h
> @@ -15,7 +15,10 @@ struct vmemmap_backing {
> };
> extern struct vmemmap_backing *vmemmap_list;
>
> -#define p4d_populate(MM, P4D, PUD) p4d_set(P4D, (unsigned long)PUD)
> +static inline void p4d_populate(struct mm_struct *mm, p4d_t *p4d, pud_t *pud)
> +{
> + p4d_set(p4d, (unsigned long)pud);
> +}
>
> static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
> {
> --
> 2.36.1
>

--
Sincerely yours,
Mike.

2022-07-04 11:42:14

by Michael Ellerman

Subject: Re: [PATCH] powerpc/64e: Rewrite p4d_populate() as a static inline function

On Thu, 23 Jun 2022 10:56:57 +0200, Christophe Leroy wrote:
> Rewrite p4d_populate() as a static inline function instead of
> a macro.
>
> This change allows typechecking and would have helped detecting
> a recently found bug in map_kernel_page().
>
>
> [...]

Applied to powerpc/next.

[1/1] powerpc/64e: Rewrite p4d_populate() as a static inline function
https://git.kernel.org/powerpc/c/2db2008e636327a3caa648ef1e34a9d501d20e2e

cheers