From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5D3D91E6DCF; Thu, 30 Jan 2025 14:20:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738246826; cv=none; b=rfmMymrliU8h3oQ/QVAHWQi5MdpmCxwf+ayVBkj1nrKq3rJ34FVDS8ApmFrq468QEF9yflGIzCZbafkH3SKAxFkfzbXSJ2Nx7VvWD5RCaUdd5fzqiobfTiZPm4Od8Ju8e7ytgLsOURqv7SMTZ640mfgfGT21Lqpx7Y1b83xbibM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738246826; c=relaxed/simple; bh=7ZdkU8b2bqz8FZeYZtnQS2eVtseggYO0NQ6Q2u1EJXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QWm0+lyW8O+oNJ93TVU0/UZJc8XRgM5FnBmJM42jhnZuqR3aNolM5sTYInbPH8r97IijKEmZW/nFePmZm/+/ZBETnsMP7BiZWHrmcBv8x2WXC27DKvMtpHhaayCNGZOtWk7baxQ0wjQvgc0KENXktpGND3H9Uk6UuVZWLldrO60= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Dl7kOJ7U; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Dl7kOJ7U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D76FCC4CED2; Thu, 30 Jan 2025 14:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738246826; bh=7ZdkU8b2bqz8FZeYZtnQS2eVtseggYO0NQ6Q2u1EJXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dl7kOJ7UQ2Uu0XpcviIuQKH7qgQ4idGrpd9O+aGtGd75y1aVnjmfHwCHPTV00ze1W Y6hrwb6Q33R9VI2ZzuEGYhnZz/w89FX+Rggi1SckxYFe1SHaYyM7fcDOCEkFo21Yf0 aBp4csYb6GVGDow3xAsvo+eTngVBmkDQXfr8fvho= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Nam Cao , Sebastian Andrzej Siewior , Palmer Dabbelt , Sasha Levin Subject: [PATCH 5.4 51/91] riscv: Fix sleeping in invalid context in die() Date: Thu, 30 Jan 2025 15:01:10 +0100 Message-ID: <20250130140135.711640722@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250130140133.662535583@linuxfoundation.org> References: <20250130140133.662535583@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nam Cao [ Upstream commit 6a97f4118ac07cfdc316433f385dbdc12af5025e ] die() can be called in exception handler, and therefore cannot sleep. However, die() takes spinlock_t which can sleep with PREEMPT_RT enabled. That causes the following warning: BUG: sleeping function called from invalid context at kernel/locking/spinlock_rt.c:48 in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 285, name: mutex preempt_count: 110001, expected: 0 RCU nest depth: 0, expected: 0 CPU: 0 UID: 0 PID: 285 Comm: mutex Not tainted 6.12.0-rc7-00022-ge19049cf7d56-dirty #234 Hardware name: riscv-virtio,qemu (DT) Call Trace: dump_backtrace+0x1c/0x24 show_stack+0x2c/0x38 dump_stack_lvl+0x5a/0x72 dump_stack+0x14/0x1c __might_resched+0x130/0x13a rt_spin_lock+0x2a/0x5c die+0x24/0x112 do_trap_insn_illegal+0xa0/0xea _new_vmalloc_restore_context_a0+0xcc/0xd8 Oops - illegal instruction [#1] Switch to use raw_spinlock_t, which does not sleep even with PREEMPT_RT enabled. Fixes: 76d2a0493a17 ("RISC-V: Init and Halt Code") Signed-off-by: Nam Cao Cc: stable@vger.kernel.org Reviewed-by: Sebastian Andrzej Siewior Link: https://lore.kernel.org/r/20241118091333.1185288-1-namcao@linutronix.de Signed-off-by: Palmer Dabbelt Signed-off-by: Sasha Levin --- arch/riscv/kernel/traps.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index d255d88cf522..fbc918f127dc 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -23,7 +23,7 @@ int show_unhandled_signals = 1; -static DEFINE_SPINLOCK(die_lock); +static DEFINE_RAW_SPINLOCK(die_lock); void die(struct pt_regs *regs, const char *str) { @@ -34,7 +34,7 @@ void die(struct pt_regs *regs, const char *str) oops_enter(); - spin_lock_irqsave(&die_lock, flags); + raw_spin_lock_irqsave(&die_lock, flags); console_verbose(); bust_spinlocks(1); @@ -51,7 +51,7 @@ void die(struct pt_regs *regs, const char *str) bust_spinlocks(0); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); - spin_unlock_irqrestore(&die_lock, flags); + raw_spin_unlock_irqrestore(&die_lock, flags); oops_exit(); if (in_interrupt()) -- 2.39.5