Received-SPF: pass (google.com: domain of linux-kernel+bounces-97833-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Sat, 9 Mar 2024 09:57:04 +0000
From: "Russell King (Oracle)" <linux@armlinux.org.uk>
To: Stefan Wiehler <stefan.wiehler@nokia.com>,
	Will Deacon <will@kernel.org>
Cc: Joel Fernandes <joel@joelfernandes.org>,
	"Paul E. McKenney" <paulmck@kernel.org>,
	Josh Triplett <josh@joshtriplett.org>,
	Boqun Feng <boqun.feng@gmail.com>,
	Steven Rostedt <rostedt@goodmis.org>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	Lai Jiangshan <jiangshanlai@gmail.com>,
	Zqiang <qiang.zhang1211@gmail.com>,
	linux-arm-kernel@lists.infradead.org, rcu@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] arm: smp: Avoid false positive CPU hotplug Lockdep-RCU
 splat
Message-ID: <ZewycILled+mZhwe@shell.armlinux.org.uk>
References: <20240307160951.3607374-1-stefan.wiehler@nokia.com>
 <bce79497-52c5-4241-aaf6-2a95dc459041@joelfernandes.org>
 <66fdce3a-c7f6-4ef4-ab56-7c9ece0b00e2@nokia.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <66fdce3a-c7f6-4ef4-ab56-7c9ece0b00e2@nokia.com>
Sender: Russell King (Oracle) <linux@armlinux.org.uk>

On Sat, Mar 09, 2024 at 08:45:35AM +0100, Stefan Wiehler wrote:
> > I agree with the problem but disagree with the patch because it feels like a
> > terrible workaround.
> > 
> > Can we just use arch_spin_lock() for the cpu_asid_lock? This might require
> > acquiring the raw_lock within the raw_spinlock_t, but there is precedent:
> > 
> > arch/powerpc/kvm/book3s_hv_rm_mmu.c:245:
> > arch_spin_lock(&kvm->mmu_lock.rlock.raw_lock);
> > 
> > IMO, lockdep tracking of this lock is not necessary or possible considering the
> > hotplug situation.
> > 
> > Or is there a reason you need lockdep working for the cpu_asid_lock?
> 
> I was not aware of this possibility to bypass lockdep tracing, but this seems
> to work and indeed looks like less of a workaround:
> 
> diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
> index 4204ffa2d104..4fc2c559f1b6 100644
> --- a/arch/arm/mm/context.c
> +++ b/arch/arm/mm/context.c
> @@ -254,7 +254,8 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
>             && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
>                 goto switch_mm_fastpath;
> 
> -       raw_spin_lock_irqsave(&cpu_asid_lock, flags);
> +       local_irq_save(flags);
> +       arch_spin_lock(&cpu_asid_lock.raw_lock);
>         /* Check that our ASID belongs to the current generation. */
>         asid = atomic64_read(&mm->context.id);
>         if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
> @@ -269,7 +270,8 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
> 
>         atomic64_set(&per_cpu(active_asids, cpu), asid);
>         cpumask_set_cpu(cpu, mm_cpumask(mm));
> -       raw_spin_unlock_irqrestore(&cpu_asid_lock, flags);
> +       arch_spin_unlock(&cpu_asid_lock.raw_lock);
> +       local_irq_restore(flags);
> 
>  switch_mm_fastpath:
>         cpu_switch_mm(mm->pgd, mm);
> 
> @Russell, what do you think?

I think this is Will Deacon's code, so we ought to hear from Will...

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!