Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2615786lqp; Mon, 25 Mar 2024 04:39:36 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXKLSHA7r/oTatDdasmgFmzbSkAbun676VJoFQDtje8zZ263IL1jkliIFPiSp3IGpoHNwrBFaOoFlLjjZX/iaNnxE6RGbyPWnhma8Gp8A== X-Google-Smtp-Source: AGHT+IEmGAw9xfI6xpT/+RKOn+bnUF7c52upDeUtleOGyLZoX4Lh4nJ0L8KiwWcWYaqy0+zldl7h X-Received: by 2002:a17:902:d551:b0:1dc:3d5:bdcc with SMTP id z17-20020a170902d55100b001dc03d5bdccmr7884178plf.42.1711366776492; Mon, 25 Mar 2024 04:39:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711366776; cv=pass; d=google.com; s=arc-20160816; b=S6Snk7Nf4DzBDef9u1UUpw9DnRcqXyQuQrGiTMoh5h3Kzc8aekBY2g1PgKmeTsaC4F fc6iapRRXJ29oinRWyJee5IKuDtfYbGBuqMgL6Yct0yckclHZGO95OotgycJoQRdMpZv JGIIoxbsFfgdL+xY6FC2IwRIUcm1vpMhrhE7N7FwtFTIWJxWQiUHDccKfBo9N0u8eyVG aIyvpViYpZpFzEyYHs9B2vW2z99YhTPdvWZD8b2LbBj+1QGXHpvfyrTTSlkPBRrBeNWT PbPGWEGYsvdf2804yLJOq7yupwCjxYMuSZQ3uUN03QgenzEzt8KIXhnXUtJZqesc0VIN q4uw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TFPvlhDcu6Bk43disvm07ySJ54TTN3bwPZ2ZLURrJPE=; fh=+7pZWAjodxrBlDbtq8cBmoNlNtwqVE2NOu3zhXseepE=; b=McQ9a+8EN+sW3R4GYDY7nZPKproUd8tf2/d/OKDmhRMRsWks6tZ1hM/VjhF4t1gLZu 5F4Pkv1KK8t6hC8giRV1iu3ss0rptaEPvCFbgE92EPPtL4qDQnRr9PDyIwrpCUMWESOU ySZFYzRqnAiE7DymUrVHDM1ByhauQNv+fEs9TSNp5EXJ1D3ZkjGaBbifkXoePtQ3scty eWFFfrljImrThS9+6u+TRWxNE3oN6Kb+vWwSBug9kPIrx5Ti/6QfHYE/WTiGpidUY7EC ihEu3Xyle2WgZ2hZ0B4BFosGo85LG3FOgRDiphnOAkSISu3TartWdMfzYvH0h0ohR/ag tBcg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Z/YEbClp"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116139-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116139-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id d16-20020a170902b71000b001dcb654d1b6si4758725pls.168.2024.03.25.04.39.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 04:39:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-116139-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="Z/YEbClp"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-116139-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-116139-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id ED70BB276BB for ; Mon, 25 Mar 2024 10:13:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF4253AFAC7; Mon, 25 Mar 2024 03:32:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z/YEbClp" 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 57DD317A903; Sun, 24 Mar 2024 23:41:28 +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=1711323690; cv=none; b=SK/YuKEnpAAbckf2bZ0NzP5Q1Wb9lwfmaqfcn/Y0XZB9OGB11bl6G8QY2ahPxZm7ZkzkBY2w44H8b2woMBYmhiqCzQXm/hMAAzqltdylVnXCLxOEjC9CPeAYvfR2Z0OnJH8DUEkAFtOrUO3QGiRtbdRanRBV0zA8JFe2Jxube+o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711323690; c=relaxed/simple; bh=Ml/gtYfi61s3A8PLBWk0zIxaNJs6FKIYlP18FdEQ12w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FI5D/3Lzb8fLuNAvhGmpCf1DdFJ3MTe7EaSCL1ijypLDA4Wm6IdI/f5c1c7TmrT726a5xSjYdXF3llf9pCkugLLccxxPNc3PEAPw0r+UE+OcYkiEJiwcQXIHvFChkLyROi99Yl/RK7rP7GwUJBlGdKg0lMc2mp4Vvf17x/h7ATs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z/YEbClp; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CE85C433F1; Sun, 24 Mar 2024 23:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711323688; bh=Ml/gtYfi61s3A8PLBWk0zIxaNJs6FKIYlP18FdEQ12w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z/YEbClp0RYFIEjpYwILYOli2jp/8hJuPWEvO0Ik3AFjT7aH2yzdwq+YNkRwhghq5 vGqKryi7yUXtXRicKJnQ/26GZGtEa0gS589p85fSGhANvYfIoiRTZVCeHPzmkZeA1r vQqRIuwj+9/kverQ4nzzymrMGHXY8BJgVfD4Cy2q5SVGN4fVnc5ITUvpTCHTC8/TpU a43EqaME2JvgsXE6tWPY22FnfNg3ScIWNBuadhC7AL9485UqTB+AgOduIZkfAKxEqK I94bLznruOdwFjErx/hsAMttISBMzUfdyf3wwhI2kgUwQbwBD3DPsjBFU3Ko5YTXu8 IdlxzJYUpuVuA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Petr Mladek , John Ogness , Sasha Levin Subject: [PATCH 5.10 061/238] printk: Disable passing console lock owner completely during panic() Date: Sun, 24 Mar 2024 19:37:29 -0400 Message-ID: <20240324234027.1354210-62-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324234027.1354210-1-sashal@kernel.org> References: <20240324234027.1354210-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Petr Mladek [ Upstream commit d04d5882cd678b898a9d7c5aee6afbe9e6e77fcd ] The commit d51507098ff91 ("printk: disable optimistic spin during panic") added checks to avoid becoming a console waiter if a panic is in progress. However, the transition to panic can occur while there is already a waiter. The current owner should not pass the lock to the waiter because it might get stopped or blocked anytime. Also the panic context might pass the console lock owner to an already stopped waiter by mistake. It might happen when console_flush_on_panic() ignores the current lock owner, for example: CPU0 CPU1 ---- ---- console_lock_spinning_enable() console_trylock_spinning() [CPU1 now console waiter] NMI: panic() panic_other_cpus_shutdown() [stopped as console waiter] console_flush_on_panic() console_lock_spinning_enable() [print 1 record] console_lock_spinning_disable_and_check() [handover to stopped CPU1] This results in panic() not flushing the panic messages. Fix these problems by disabling all spinning operations completely during panic(). Another advantage is that it prevents possible deadlocks caused by "console_owner_lock". The panic() context does not need to take it any longer. The lockless checks are safe because the functions become NOPs when they see the panic in progress. All operations manipulating the state are still synchronized by the lock even when non-panic CPUs would notice the panic synchronously. The current owner might stay spinning. But non-panic() CPUs would get stopped anyway and the panic context will never start spinning. Fixes: dbdda842fe96 ("printk: Add console owner and waiter logic to load balance console writes") Signed-off-by: John Ogness Link: https://lore.kernel.org/r/20240207134103.1357162-12-john.ogness@linutronix.de Signed-off-by: Petr Mladek Signed-off-by: Sasha Levin --- kernel/printk/printk.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 94af80b7fa9b5..d109411f108f9 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1760,10 +1760,23 @@ static bool console_waiter; */ static void console_lock_spinning_enable(void) { + /* + * Do not use spinning in panic(). The panic CPU wants to keep the lock. + * Non-panic CPUs abandon the flush anyway. + * + * Just keep the lockdep annotation. The panic-CPU should avoid + * taking console_owner_lock because it might cause a deadlock. + * This looks like the easiest way how to prevent false lockdep + * reports without handling races a lockless way. + */ + if (panic_in_progress()) + goto lockdep; + raw_spin_lock(&console_owner_lock); console_owner = current; raw_spin_unlock(&console_owner_lock); +lockdep: /* The waiter may spin on us after setting console_owner */ spin_acquire(&console_owner_dep_map, 0, 0, _THIS_IP_); } @@ -1787,6 +1800,22 @@ static int console_lock_spinning_disable_and_check(void) { int waiter; + /* + * Ignore spinning waiters during panic() because they might get stopped + * or blocked at any time, + * + * It is safe because nobody is allowed to start spinning during panic + * in the first place. If there has been a waiter then non panic CPUs + * might stay spinning. They would get stopped anyway. The panic context + * will never start spinning and an interrupted spin on panic CPU will + * never continue. + */ + if (panic_in_progress()) { + /* Keep lockdep happy. */ + spin_release(&console_owner_dep_map, _THIS_IP_); + return 0; + } + raw_spin_lock(&console_owner_lock); waiter = READ_ONCE(console_waiter); console_owner = NULL; -- 2.43.0