| Message ID | 20230613162119.4a7a7d3c@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | linux-next: build failure after merge of the mm tree | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_ppctests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_selftests | success | Successfully ran 8 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 6 jobs. |
Hi Stephen, On Tue, Jun 13, 2023 at 04:21:19PM +1000, Stephen Rothwell wrote: > After merging the mm tree, today's linux-next build (powerpc > ppc44x_defconfig) failed like this: > > In file included from arch/powerpc/include/asm/page.h:247, > from arch/powerpc/include/asm/thread_info.h:13, > from include/linux/thread_info.h:60, > from include/asm-generic/preempt.h:5, > from ./arch/powerpc/include/generated/asm/preempt.h:1, > from include/linux/preempt.h:78, > from include/linux/spinlock.h:56, > from include/linux/ipc.h:5, > from include/uapi/linux/sem.h:5, > from include/linux/sem.h:5, > from include/linux/compat.h:14, > from arch/powerpc/kernel/asm-offsets.c:12: > arch/powerpc/include/asm/page_32.h:16: warning: "ARCH_DMA_MINALIGN" redefined > 16 | #define ARCH_DMA_MINALIGN L1_CACHE_BYTES > | > In file included from include/linux/time.h:5, > from include/linux/compat.h:10: > include/linux/cache.h:104: note: this is the location of the previous definition > 104 | #define ARCH_DMA_MINALIGN __alignof__(unsigned long long) > | > > (lots of theses) > > Caused by commit > > cc7335787e73 ("mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN") > > I have applied the following hack for today - we need something better. I just posted this series fixing it for powerpc, microblaze and sh. I did not add the #ifndef __powerpc64__ line since CONFIG_NOT_COHERENT_CACHE should not be enabled for those builds. https://lore.kernel.org/r/20230613155245.1228274-1-catalin.marinas@arm.com > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Tue, 13 Jun 2023 16:07:16 +1000 > Subject: [PATCH] fix up for "mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN" > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > arch/powerpc/include/asm/cache.h | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h > index ae0a68a838e8..e9be1396dfd1 100644 > --- a/arch/powerpc/include/asm/cache.h > +++ b/arch/powerpc/include/asm/cache.h > @@ -142,5 +142,14 @@ static inline void iccci(void *addr) > } > > #endif /* !__ASSEMBLY__ */ > + > +#ifndef __powerpc64__ > +#ifdef CONFIG_NOT_COHERENT_CACHE > +#ifndef ARCH_DMA_MINALIGN > +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES > +#endif > +#endif > +#endif > + > #endif /* __KERNEL__ */ > #endif /* _ASM_POWERPC_CACHE_H */ I think it should also remove the ARCH_DMA_MINALIGN from asm/page.h (as I did in my series; sorry I did not cc you, only noticed now that you reported it as well).
diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h index ae0a68a838e8..e9be1396dfd1 100644 --- a/arch/powerpc/include/asm/cache.h +++ b/arch/powerpc/include/asm/cache.h @@ -142,5 +142,14 @@ static inline void iccci(void *addr) } #endif /* !__ASSEMBLY__ */ + +#ifndef __powerpc64__ +#ifdef CONFIG_NOT_COHERENT_CACHE +#ifndef ARCH_DMA_MINALIGN +#define ARCH_DMA_MINALIGN L1_CACHE_BYTES +#endif +#endif +#endif + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_CACHE_H */
Hi all, After merging the mm tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: In file included from arch/powerpc/include/asm/page.h:247, from arch/powerpc/include/asm/thread_info.h:13, from include/linux/thread_info.h:60, from include/asm-generic/preempt.h:5, from ./arch/powerpc/include/generated/asm/preempt.h:1, from include/linux/preempt.h:78, from include/linux/spinlock.h:56, from include/linux/ipc.h:5, from include/uapi/linux/sem.h:5, from include/linux/sem.h:5, from include/linux/compat.h:14, from arch/powerpc/kernel/asm-offsets.c:12: arch/powerpc/include/asm/page_32.h:16: warning: "ARCH_DMA_MINALIGN" redefined 16 | #define ARCH_DMA_MINALIGN L1_CACHE_BYTES | In file included from include/linux/time.h:5, from include/linux/compat.h:10: include/linux/cache.h:104: note: this is the location of the previous definition 104 | #define ARCH_DMA_MINALIGN __alignof__(unsigned long long) | (lots of theses) Caused by commit cc7335787e73 ("mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN") I have applied the following hack for today - we need something better. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 13 Jun 2023 16:07:16 +1000 Subject: [PATCH] fix up for "mm/slab: decouple ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/include/asm/cache.h | 9 +++++++++ 1 file changed, 9 insertions(+)