From d42f90cb085ecf793470b60ec814e14ecca62a28 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue, 17 Aug 2021 09:48:31 +0200 Subject: [PATCH 087/158] locking: Allow to include asm/spinlock_types.h from linux/spinlock_types_raw.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The printk header file includes ratelimit_types.h for its __ratelimit() based usage. It requires it for the static initializer used in printk_ratelimited(). It uses a raw_spinlock_t and includes the spinlock_types.h. It makes no difference on non PREEMPT-RT builds but PREEMPT-RT replaces the inner part of some locks and therefore includes rtmutex.h and atomic.h which leads to recursive includes where defines are missing. By including only the raw_spinlock_t defines it avoids the atomic.h related includes at this stage. An example on powerpc: | CALL scripts/atomic/check-atomics.sh |In file included from include/linux/bug.h:5, | from include/linux/page-flags.h:10, | from kernel/bounds.c:10: |arch/powerpc/include/asm/page_32.h: In function ‘clear_page’: |arch/powerpc/include/asm/bug.h:87:4: error: implicit declaration of function ‘__WARN’ [-Werror=implicit-function-declaration] | 87 | __WARN(); \ | | ^~~~~~ |arch/powerpc/include/asm/page_32.h:48:2: note: in expansion of macro ‘WARN_ON’ | 48 | WARN_ON((unsigned long)addr & (L1_CACHE_BYTES - 1)); | | ^~~~~~~ |arch/powerpc/include/asm/bug.h:58:17: error: invalid application of ‘sizeof’ to incomplete type ‘struct bug_entry’ | 58 | "i" (sizeof(struct bug_entry)), \ | | ^~~~~~ |arch/powerpc/include/asm/bug.h:89:3: note: in expansion of macro ‘BUG_ENTRY’ | 89 | BUG_ENTRY(PPC_TLNEI " %4, 0", \ | | ^~~~~~~~~ |arch/powerpc/include/asm/page_32.h:48:2: note: in expansion of macro ‘WARN_ON’ | 48 | WARN_ON((unsigned long)addr & (L1_CACHE_BYTES - 1)); | | ^~~~~~~ |In file included from arch/powerpc/include/asm/ptrace.h:298, | from arch/powerpc/include/asm/hw_irq.h:12, | from arch/powerpc/include/asm/irqflags.h:12, | from include/linux/irqflags.h:16, | from include/asm-generic/cmpxchg-local.h:6, | from arch/powerpc/include/asm/cmpxchg.h:526, | from arch/powerpc/include/asm/atomic.h:11, | from include/linux/atomic.h:7, | from include/linux/rwbase_rt.h:6, | from include/linux/rwlock_types.h:55, | from include/linux/spinlock_types.h:74, | from include/linux/ratelimit_types.h:7, | from include/linux/printk.h:10, | from include/asm-generic/bug.h:22, | from arch/powerpc/include/asm/bug.h:109, | from include/linux/bug.h:5, | from include/linux/page-flags.h:10, | from kernel/bounds.c:10: |include/linux/thread_info.h: In function ‘copy_overflow’: |include/linux/thread_info.h:210:2: error: implicit declaration of function ‘WARN’ [-Werror=implicit-function-declaration] | 210 | WARN(1, "Buffer overflow detected (%d < %lu)!\n", size, count); | | ^~~~ The WARN / BUG include pulls in printk.h and then ptrace.h expects WARN (from bug.h) which is not yet complete. Even hw_irq.h has WARN_ON() statements. On POWERPC64 there are missing atomic64 defines while building 32bit VDSO: | VDSO32C arch/powerpc/kernel/vdso32/vgettimeofday.o |In file included from include/linux/atomic.h:80, | from include/linux/rwbase_rt.h:6, | from include/linux/rwlock_types.h:55, | from include/linux/spinlock_types.h:74, | from include/linux/ratelimit_types.h:7, | from include/linux/printk.h:10, | from include/linux/kernel.h:19, | from arch/powerpc/include/asm/page.h:11, | from arch/powerpc/include/asm/vdso/gettimeofday.h:5, | from include/vdso/datapage.h:137, | from lib/vdso/gettimeofday.c:5, | from <command-line>: |include/linux/atomic-arch-fallback.h: In function ‘arch_atomic64_inc’: |include/linux/atomic-arch-fallback.h:1447:2: error: implicit declaration of function ‘arch_atomic64_add’; did you mean ‘arch_atomic_add’? [-Werror=impl |icit-function-declaration] | 1447 | arch_atomic64_add(1, v); | | ^~~~~~~~~~~~~~~~~ | | arch_atomic_add The generic fallback is not included, atomics itself are not used. If kernel.h does not include printk.h then it comes later from the bug.h include. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- arch/alpha/include/asm/spinlock_types.h | 2 +- arch/arm/include/asm/spinlock_types.h | 2 +- arch/arm64/include/asm/spinlock_types.h | 2 +- arch/csky/include/asm/spinlock_types.h | 2 +- arch/hexagon/include/asm/spinlock_types.h | 2 +- arch/ia64/include/asm/spinlock_types.h | 2 +- arch/powerpc/include/asm/simple_spinlock_types.h | 2 +- arch/powerpc/include/asm/spinlock_types.h | 2 +- arch/riscv/include/asm/spinlock_types.h | 2 +- arch/s390/include/asm/spinlock_types.h | 2 +- arch/sh/include/asm/spinlock_types.h | 2 +- arch/xtensa/include/asm/spinlock_types.h | 2 +- include/linux/ratelimit_types.h | 2 +- include/linux/spinlock_types_up.h | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) Index: linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h =================================================================== @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef _ALPHA_SPINLOCK_TYPES_H #define _ALPHA_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/arm/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/arm/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/arm/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef __ASM_SPINLOCK_TYPES_H #define __ASM_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/arm64/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/arm64/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/arm64/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:8 @ #ifndef __ASM_SPINLOCK_TYPES_H #define __ASM_SPINLOCK_TYPES_H -#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__ASM_SPINLOCK_H) +#if !defined(__LINUX_SPINLOCK_TYPES_RAW_H) && !defined(__ASM_SPINLOCK_H) # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/csky/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/csky/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/csky/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:6 @ #ifndef __ASM_CSKY_SPINLOCK_TYPES_H #define __ASM_CSKY_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/hexagon/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/hexagon/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/hexagon/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:11 @ #ifndef _ASM_SPINLOCK_TYPES_H #define _ASM_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/ia64/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/ia64/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/ia64/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef _ASM_IA64_SPINLOCK_TYPES_H #define _ASM_IA64_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/powerpc/include/asm/simple_spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/powerpc/include/asm/simple_spinlock_types.h +++ linux-5.15.19-rt29/arch/powerpc/include/asm/simple_spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef _ASM_POWERPC_SIMPLE_SPINLOCK_TYPES_H #define _ASM_POWERPC_SIMPLE_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/powerpc/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/powerpc/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/powerpc/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef _ASM_POWERPC_SPINLOCK_TYPES_H #define _ASM_POWERPC_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/riscv/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/riscv/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/riscv/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:9 @ #ifndef _ASM_RISCV_SPINLOCK_TYPES_H #define _ASM_RISCV_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/s390/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/s390/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/s390/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef __ASM_SPINLOCK_TYPES_H #define __ASM_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/sh/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/sh/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/sh/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef __ASM_SH_SPINLOCK_TYPES_H #define __ASM_SH_SPINLOCK_TYPES_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/arch/xtensa/include/asm/spinlock_types.h =================================================================== --- linux-5.15.19-rt29.orig/arch/xtensa/include/asm/spinlock_types.h +++ linux-5.15.19-rt29/arch/xtensa/include/asm/spinlock_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:5 @ #ifndef __ASM_SPINLOCK_TYPES_H #define __ASM_SPINLOCK_TYPES_H -#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__ASM_SPINLOCK_H) +#if !defined(__LINUX_SPINLOCK_TYPES_RAW_H) && !defined(__ASM_SPINLOCK_H) # error "please don't include this file directly" #endif Index: linux-5.15.19-rt29/include/linux/ratelimit_types.h =================================================================== --- linux-5.15.19-rt29.orig/include/linux/ratelimit_types.h +++ linux-5.15.19-rt29/include/linux/ratelimit_types.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:7 @ #include <linux/bits.h> #include <linux/param.h> -#include <linux/spinlock_types.h> +#include <linux/spinlock_types_raw.h> #define DEFAULT_RATELIMIT_INTERVAL (5 * HZ) #define DEFAULT_RATELIMIT_BURST 10 Index: linux-5.15.19-rt29/include/linux/spinlock_types_up.h =================================================================== --- linux-5.15.19-rt29.orig/include/linux/spinlock_types_up.h +++ linux-5.15.19-rt29/include/linux/spinlock_types_up.h @ linux-5.15.19-rt29/arch/alpha/include/asm/spinlock_types.h:4 @ #ifndef __LINUX_SPINLOCK_TYPES_UP_H #define __LINUX_SPINLOCK_TYPES_UP_H -#ifndef __LINUX_SPINLOCK_TYPES_H +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H # error "please don't include this file directly" #endif