| Message ID | 1b416f8a8fe1bc3f4e01175680ce310b7eb3a1e4.1655974565.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | powerpc/64e: Rewrite p4d_populate() as a static inline function | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | fail | kernel (corenet64_smp_defconfig, korg-5.5.0, /linux/arch/powerpc/configs/ppc64e-qemu.config) failed at step build. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 10 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | fail | kernel (corenet64_smp, ubuntu-21.10, ppc64) failed at step build. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
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 <rppt@kernel.org> > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Acked-by: Mike Rapoport <rppt@linux.ibm.com> > --- > 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 >
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
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) {
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 <rppt@kernel.org> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/include/asm/nohash/64/pgalloc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)