Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp325097pxa; Tue, 4 Aug 2020 06:37:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUHTu0OOLXHLTa+7HZOVxLT85dg4QrBN9KQerAA8Iprf9M79leZzqDhFd5/VV0T255x2kB X-Received: by 2002:a17:906:9984:: with SMTP id af4mr22728992ejc.90.1596548247224; Tue, 04 Aug 2020 06:37:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596548247; cv=none; d=google.com; s=arc-20160816; b=qXiIykLX0zbL9UkGCNAjvqDrEdf9SKpOXURpM+lCAU6JLo/RimP1pB5mCihC4VZhDV 57AhWrfejcE0CRSpPNy9Ug4y8jcCJ8YNAc78Oivv6W5Qt3STbp+UaB009dTG9/gLM364 5UMKJyhgeOwmhiPU39mHZqc4bvQDxd7bXvfZjxifoLaq7GnKnxVZizCPit6RvDvYvxlQ WCjSWX7YN3aYHgAJMefnBC3l0sPNpt6URFmg5q400KUt4uFJLEtkgLonSV2cZHFzJCBr mQHCg0Gm9vHVcsDlcM7IvLJeE4KShm7m0ZH6z5ctNm8SvyhgtWPhTMG4mv31ng2y6/JU qj/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=TP1yuY+J7KEmkgmTgxCb3upBLyUkHbc2Ou8BpzfNTZM=; b=edsfojQ246Wdp9HhnjZDe+f5Wl07Y7Kp3dWLgt/9WtXCf0c5kt7bMWmDx6EC7MCSDC PiUBqrbuNePOemh3v/Nxp+MQudX2fcSHl4g5TuRJMZz5pm1icbbhoy/teWAVVBU58dlX 75HN1Q4B6TU2xKHhnyA9J2m6qfksOr/fi2/y809ch91IMBDF5D5MC8xZ+1cC1C8c2+og eUn6iKawFEVaX4EnlCDJcXnB0sjZ48l9nD7Koz5mQXriWeaCOci5LefpvjuJrsPZbwv0 efIetROOMc1NgWIcMtnyfAMRVC2K8DHN4bb1xVSP4Xe6pP0eTxUvOBtiuusqhvJMskbi lG+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=tjtrdh+E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a24si3865499edj.502.2020.08.04.06.37.04; Tue, 04 Aug 2020 06:37:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=casper.20170209 header.b=tjtrdh+E; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726536AbgHDNer (ORCPT + 99 others); Tue, 4 Aug 2020 09:34:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbgHDNeq (ORCPT ); Tue, 4 Aug 2020 09:34:46 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 370EAC06174A; Tue, 4 Aug 2020 06:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=TP1yuY+J7KEmkgmTgxCb3upBLyUkHbc2Ou8BpzfNTZM=; b=tjtrdh+EyWiwEBWCkdYds0zxgn zJqVMhVaCZrwcNSCeN97hqjzeyE15DtZXwkgpvoWd//FFTu3cXVlPfH9uyQBvV9Q45faQpwjCZJ3e u0W9OeqoouYaFAjQdA8pA7RKZSnD2sV2QxzzHB7ZQedK5xKXsfv8l1clCZWO8y9Fv9nA298Y7zyB0 UXYZdf1v/nZXS0CemnZ41WrIMIpMGeZe9YNe1wnMvaBxVWzkm21zdA/YGOd0wwGvpGzjcpMeP8d0B a3SyplAbBknFMeLqZ/ZD0VZVWCygkrX3fUhsLZro54/9+KuwPOGY8EzLhVRx0xF7glrxzGpWrb9hZ 0FNkuaHQ==; Received: from j217100.upc-j.chello.nl ([24.132.217.100] helo=noisy.programming.kicks-ass.net) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1k2x5V-0002dO-V9; Tue, 04 Aug 2020 13:34:42 +0000 Received: from hirez.programming.kicks-ass.net (hirez.programming.kicks-ass.net [192.168.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by noisy.programming.kicks-ass.net (Postfix) with ESMTPS id 63CAB301E02; Tue, 4 Aug 2020 15:34:38 +0200 (CEST) Received: by hirez.programming.kicks-ass.net (Postfix, from userid 1000) id 43FB02B622ED0; Tue, 4 Aug 2020 15:34:38 +0200 (CEST) Date: Tue, 4 Aug 2020 15:34:38 +0200 From: peterz@infradead.org To: Anatoly Pugachev Cc: Sparc kernel list , Linux Kernel list , Ingo Molnar Subject: Re: [sparc64] enabling CONFIG_PROVE_LOCKING makes kernel unable to build Message-ID: <20200804133438.GK2674@hirez.programming.kicks-ass.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 04, 2020 at 04:17:16PM +0300, Anatoly Pugachev wrote: > Hello! > > Linus git master sources: > > $ git desc > v5.8-2483-gc0842fbc1b18 > Ooh, it looks like that series wasn't cut back far enough :/ 859247d39fb0 ("seqlock: lockdep assert non-preemptibility on seqcount_t write") does indeed also introduce problems. I've been working on untangling the header mess for the full series and the below patch is what I currently have. --- Subject: seqlock,headers: Untangle the spaghetti monster From: Peter Zijlstra Date: Thu Jul 30 13:20:47 CEST 2020 By using lockdep_assert_*() from seqlock.h, the spaghetti monster attacked. Signed-off-by: Peter Zijlstra (Intel) --- arch/ia64/include/asm/smp.h | 35 -------------------------- arch/ia64/include/asm/xtp.h | 46 +++++++++++++++++++++++++++++++++++ arch/ia64/kernel/iosapic.c | 1 arch/ia64/kernel/irq.c | 1 arch/ia64/kernel/process.c | 1 arch/ia64/kernel/sal.c | 1 arch/ia64/kernel/setup.c | 1 arch/ia64/kernel/smp.c | 1 arch/parisc/include/asm/timex.h | 1 arch/sh/include/asm/io.h | 1 arch/sh/kernel/machvec.c | 1 arch/sparc/include/asm/timer_64.h | 1 arch/sparc/include/asm/vvar.h | 3 +- arch/sparc/kernel/vdso.c | 1 arch/x86/include/asm/fixmap.h | 2 - arch/x86/kernel/apic/apic_noop.c | 1 arch/x86/kernel/apic/hw_nmi.c | 1 arch/x86/kernel/apic/probe_64.c | 1 arch/x86/kernel/cpu/amd.c | 1 arch/x86/kernel/cpu/common.c | 1 arch/x86/kernel/cpu/hygon.c | 1 arch/x86/kernel/cpu/intel.c | 1 arch/x86/kernel/jailhouse.c | 1 arch/x86/kernel/tsc_msr.c | 1 arch/x86/mm/init_32.c | 1 arch/x86/xen/apic.c | 1 arch/x86/xen/smp_hvm.c | 1 arch/x86/xen/suspend_pv.c | 4 +-- include/linux/dynamic_queue_limits.h | 2 + include/linux/hrtimer.h | 1 include/linux/ktime.h | 1 include/linux/lockdep.h | 1 include/linux/mutex.h | 11 ++++++++ include/linux/sched.h | 1 include/linux/seqlock.h | 1 include/linux/time.h | 1 include/linux/videodev2.h | 1 include/linux/ww_mutex.h | 8 ------ 38 files changed, 91 insertions(+), 50 deletions(-) --- a/arch/ia64/include/asm/smp.h +++ b/arch/ia64/include/asm/smp.h @@ -18,7 +18,6 @@ #include #include -#include #include #include #include @@ -44,11 +43,6 @@ ia64_get_lid (void) #ifdef CONFIG_SMP -#define XTP_OFFSET 0x1e0008 - -#define SMP_IRQ_REDIRECTION (1 << 0) -#define SMP_IPI_REDIRECTION (1 << 1) - #define raw_smp_processor_id() (current_thread_info()->cpu) extern struct smp_boot_data { @@ -62,7 +56,6 @@ extern cpumask_t cpu_core_map[NR_CPUS]; DECLARE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); extern int smp_num_siblings; extern void __iomem *ipi_base_addr; -extern unsigned char smp_int_redirect; extern volatile int ia64_cpu_to_sapicid[]; #define cpu_physical_id(i) ia64_cpu_to_sapicid[i] @@ -84,34 +77,6 @@ cpu_logical_id (int cpuid) return i; } -/* - * XTP control functions: - * min_xtp : route all interrupts to this CPU - * normal_xtp: nominal XTP value - * max_xtp : never deliver interrupts to this CPU. - */ - -static inline void -min_xtp (void) -{ - if (smp_int_redirect & SMP_IRQ_REDIRECTION) - writeb(0x00, ipi_base_addr + XTP_OFFSET); /* XTP to min */ -} - -static inline void -normal_xtp (void) -{ - if (smp_int_redirect & SMP_IRQ_REDIRECTION) - writeb(0x08, ipi_base_addr + XTP_OFFSET); /* XTP normal */ -} - -static inline void -max_xtp (void) -{ - if (smp_int_redirect & SMP_IRQ_REDIRECTION) - writeb(0x0f, ipi_base_addr + XTP_OFFSET); /* Set XTP to max */ -} - /* Upping and downing of CPUs */ extern int __cpu_disable (void); extern void __cpu_die (unsigned int cpu); --- /dev/null +++ b/arch/ia64/include/asm/xtp.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_IA64_XTP_H +#define _ASM_IA64_XTP_H + +#include + +#ifdef CONFIG_SMP + +#define XTP_OFFSET 0x1e0008 + +#define SMP_IRQ_REDIRECTION (1 << 0) +#define SMP_IPI_REDIRECTION (1 << 1) + +extern unsigned char smp_int_redirect; + +/* + * XTP control functions: + * min_xtp : route all interrupts to this CPU + * normal_xtp: nominal XTP value + * max_xtp : never deliver interrupts to this CPU. + */ + +static inline void +min_xtp (void) +{ + if (smp_int_redirect & SMP_IRQ_REDIRECTION) + writeb(0x00, ipi_base_addr + XTP_OFFSET); /* XTP to min */ +} + +static inline void +normal_xtp (void) +{ + if (smp_int_redirect & SMP_IRQ_REDIRECTION) + writeb(0x08, ipi_base_addr + XTP_OFFSET); /* XTP normal */ +} + +static inline void +max_xtp (void) +{ + if (smp_int_redirect & SMP_IRQ_REDIRECTION) + writeb(0x0f, ipi_base_addr + XTP_OFFSET); /* Set XTP to max */ +} + +#endif /* CONFIG_SMP */ + +#endif /* _ASM_IA64_XTP_Hy */ --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c @@ -95,6 +95,7 @@ #include #include #include +#include #undef DEBUG_INTERRUPT_ROUTING --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -25,6 +25,7 @@ #include #include +#include /* * 'what should we do if we get a hw irq event on an illegal vector'. --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "entry.h" --- a/arch/ia64/kernel/sal.c +++ b/arch/ia64/kernel/sal.c @@ -18,6 +18,7 @@ #include #include #include +#include __cacheline_aligned DEFINE_SPINLOCK(sal_lock); unsigned long sal_platform_features; --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -65,6 +65,7 @@ #include #include #include +#include #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE) # error "struct cpuinfo_ia64 too big!" --- a/arch/ia64/kernel/smp.c +++ b/arch/ia64/kernel/smp.c @@ -46,6 +46,7 @@ #include #include #include +#include /* * Note: alignment of 4 entries/cacheline was empirically determined --- a/arch/parisc/include/asm/timex.h +++ b/arch/parisc/include/asm/timex.h @@ -7,6 +7,7 @@ #ifndef _ASMPARISC_TIMEX_H #define _ASMPARISC_TIMEX_H +#include #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ --- a/arch/sh/include/asm/io.h +++ b/arch/sh/include/asm/io.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include --- a/arch/sh/kernel/machvec.c +++ b/arch/sh/kernel/machvec.c @@ -15,6 +15,7 @@ #include #include #include +#include #define MV_NAME_SIZE 32 --- a/arch/sparc/include/asm/timer_64.h +++ b/arch/sparc/include/asm/timer_64.h @@ -7,6 +7,7 @@ #ifndef _SPARC64_TIMER_H #define _SPARC64_TIMER_H +#include #include #include --- a/arch/sparc/include/asm/vvar.h +++ b/arch/sparc/include/asm/vvar.h @@ -6,7 +6,8 @@ #define _ASM_SPARC_VVAR_DATA_H #include -#include +#include +#include #include #include --- a/arch/sparc/kernel/vdso.c +++ b/arch/sparc/kernel/vdso.c @@ -7,7 +7,6 @@ * a different vsyscall implementation for Linux/IA32 and for the name. */ -#include #include #include --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -26,9 +26,9 @@ #ifndef __ASSEMBLY__ #include -#include #include #include +#include #ifdef CONFIG_X86_32 #include #include --- a/arch/x86/kernel/apic/apic_noop.c +++ b/arch/x86/kernel/apic/apic_noop.c @@ -10,6 +10,7 @@ * like self-ipi, etc... */ #include +#include #include --- a/arch/x86/kernel/apic/hw_nmi.c +++ b/arch/x86/kernel/apic/hw_nmi.c @@ -9,6 +9,7 @@ * Bits copied from original nmi.c file * */ +#include #include #include --- a/arch/x86/kernel/apic/probe_64.c +++ b/arch/x86/kernel/apic/probe_64.c @@ -8,6 +8,7 @@ * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and * James Cleverdon. */ +#include #include #include "local.h" --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include --- a/arch/x86/kernel/cpu/hygon.c +++ b/arch/x86/kernel/cpu/hygon.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef CONFIG_X86_64 #include --- a/arch/x86/kernel/jailhouse.c +++ b/arch/x86/kernel/jailhouse.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include --- a/arch/x86/kernel/tsc_msr.c +++ b/arch/x86/kernel/tsc_msr.c @@ -7,6 +7,7 @@ */ #include +#include #include #include --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -52,6 +52,7 @@ #include #include #include +#include #include "mm_internal.h" --- a/arch/x86/xen/apic.c +++ b/arch/x86/xen/apic.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include #include --- a/arch/x86/xen/smp_hvm.c +++ b/arch/x86/xen/smp_hvm.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include #include --- a/arch/x86/xen/suspend_pv.c +++ b/arch/x86/xen/suspend_pv.c @@ -1,11 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 #include -#include - #include #include +#include + #include "xen-ops.h" void xen_pv_pre_suspend(void) --- a/include/linux/dynamic_queue_limits.h +++ b/include/linux/dynamic_queue_limits.h @@ -38,6 +38,8 @@ #ifdef __KERNEL__ +#include + struct dql { /* Fields accessed in enqueue path (dql_queued) */ unsigned int num_queued; /* Total ever queued */ --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include --- a/include/linux/ktime.h +++ b/include/linux/ktime.h @@ -23,6 +23,7 @@ #include #include +#include /* Nanosecond scalar representation for kernel time values */ typedef s64 ktime_t; --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -11,6 +11,7 @@ #define __LINUX_LOCKDEP_H #include +#include #include struct task_struct; --- a/include/linux/mutex.h +++ b/include/linux/mutex.h @@ -65,6 +65,17 @@ struct mutex { #endif }; +struct ww_class; +struct ww_acquire_ctx; + +struct ww_mutex { + struct mutex base; + struct ww_acquire_ctx *ctx; +#ifdef CONFIG_DEBUG_MUTEXES + struct ww_class *ww_class; +#endif +}; + /* * This is the control structure for tasks blocked on mutex, * which resides on the blocked task's kernel stack: --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -32,6 +32,7 @@ #include #include #include +#include #include /* task_struct member predeclarations (sorted alphabetically): */ --- a/include/linux/seqlock.h +++ b/include/linux/seqlock.h @@ -19,7 +19,6 @@ #include #include #include -#include #include --- a/include/linux/time.h +++ b/include/linux/time.h @@ -3,7 +3,6 @@ #define _LINUX_TIME_H # include -# include # include # include --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -57,6 +57,7 @@ #define __LINUX_VIDEODEV2_H #include /* need struct timeval */ +#include #include #endif /* __LINUX_VIDEODEV2_H */ --- a/include/linux/ww_mutex.h +++ b/include/linux/ww_mutex.h @@ -48,14 +48,6 @@ struct ww_acquire_ctx { #endif }; -struct ww_mutex { - struct mutex base; - struct ww_acquire_ctx *ctx; -#ifdef CONFIG_DEBUG_MUTEXES - struct ww_class *ww_class; -#endif -}; - #ifdef CONFIG_DEBUG_LOCK_ALLOC # define __WW_CLASS_MUTEX_INITIALIZER(lockname, class) \ , .ww_class = class