Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2553351lqp; Mon, 25 Mar 2024 02:20:38 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWCAbM2eU/HVz8Z0ZZ34WxGyU4qmIH5c807ZxIzCz9fIbSyRuR0U/7xj7m3npUrW030PDK1ylgmz0+xn2ExNu//RK+eYAxpbKl3IUN9jg== X-Google-Smtp-Source: AGHT+IG8CsrGPYQa08TyYV6/rYt7D4FzOtXx6pmR+IdAaL4ZYyWNW5y8+iMx8sPbqkf4u0djIZjr X-Received: by 2002:a05:6a21:2d88:b0:1a3:bb8b:de7a with SMTP id ty8-20020a056a212d8800b001a3bb8bde7amr7200147pzb.54.1711358438063; Mon, 25 Mar 2024 02:20:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711358438; cv=pass; d=google.com; s=arc-20160816; b=aDFglnS/up5cx6U8cmZWZq4gWS/H+9LaQQ2Ler7f0QOHoH68sJEBs9KxJuYXfWvQnO rGTOKXwokY3/g6/92XgwBY8WEIsPMi7xA9n86PleU/ES0IlDaDhz6sQgOCjBpPnP3tDg sovHD3LX/pAdDkvl1xkBwLJLQ7K0W+DVXPTaFwRukS0nCbenCtvKGLi5rvjw0rrzTbS4 RuTUc6j0/XLPazWKwL3lBGP+R+vk/oS3ryY9yne+y0QCUaOP7O1WNhKwZ3dNS9gXyCWP 400ZY8Yu6iaeSixiUEi+R4TYWnlIqtpQE4P6EzUo/T3QZmLEsqW1adOirKx4S2DEyvlP FGXA== 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=8d/2crAtelwop/UY8tmFndXsLuVgfzg9/lIYO9/ix64=; fh=+7pZWAjodxrBlDbtq8cBmoNlNtwqVE2NOu3zhXseepE=; b=0JNLbMra8C1Z9OEyrvtWP4S7NC/tukF3xyFneky5nTNCZ0TeNQ8GhkX12Gocpz4U75 ZBSujXwSJBo0TybVnHOYyMl9HiIcgvlJzAKUDZU+2rqevD+Y/UrL21pgrZreaLIOdX97 +WJepuu+cb9z73+Ouzym3wutkjzYgIqWlF1Ib3mR5x35ZnU9cYzEy9kL8dgfwNQwwj0H OqvvgsGZ+opT8Gl3lTRM1iki/cklJQYIc+p3RNELs3oRqG+4E+kkfcgD1Q6JhHnjqqTb eSYu4jT61N97NaLxl+ub21BvM7ngptoIZNyReOx9hSaBrYJzA0PjDKDGT5C26Kjcd5YX 9y2w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UDVwD2R7; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115843-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115843-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. [147.75.48.161]) by mx.google.com with ESMTPS id e1-20020a170902cf4100b001da15580d4bsi4931377plg.90.2024.03.25.02.20.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 02:20:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115843-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UDVwD2R7; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115843-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115843-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 543BAB3A825 for ; Mon, 25 Mar 2024 08:07:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E442520FAA1; Mon, 25 Mar 2024 03:01:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UDVwD2R7" 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 BB0E1145FFD; Sun, 24 Mar 2024 23:14:18 +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=1711322058; cv=none; b=TYxYdjPTFe+Lrz+wUbY/afZGqwf2vCS2FaJOPGwHm+X2rDlCmJ3VGJ5KVstdD4BqrKRtl4wDV7bekcVw4nnG9k4pK80CP3alo5e4ZCXcadfiIkCmLlpUaGzQ0mtgmzlkGRmPAxWYVCqS87U1DKlm23tHVYDYSOwK7fen6qXAywI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322058; c=relaxed/simple; bh=kHvAj5Exwy/HdBqTXaGhsB0NkokkTU+SfCPdSR18a9c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=izT6A7LvBsmjJD+sWpQ9iAaBe0bNP3P+aoohbUBysjAFPurA83zYgFw6vQNHcZ0HMU9nDbJOsDvliFyPNsRZECvcWmzhKTEFEagGmln3Xg+Q+hcE3I1I9CQsuLBUhetgboVQ6ZdED3IsIo4YZ+tOdugbPRrwo0HHZ/S/7j3MK9I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UDVwD2R7; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02B5BC433A6; Sun, 24 Mar 2024 23:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322058; bh=kHvAj5Exwy/HdBqTXaGhsB0NkokkTU+SfCPdSR18a9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UDVwD2R78kn2u8X0gEdBQqUgeFLT0sZ9JYTJ+GFUiGxFnVJ54kiqsROxCsWzKTdIR zfG79pJaSsEOQrG7rIhKGx8oUD1Yr/y9D1qrIYBj7yVTHdesGGAmZwO2oT+ImMyvEG 0LE/DVpvQrUPOH4HUqbTacwzb2Kp3GH317gUO/YFYoTicbzpDqYhXLMzasIY7iOJC5 pNBoXWR1NG+LIM9My3kwD5zXoMBkg0kvFjvgWNlZW9R5DoZLgJoBd/u2gdjmWo2XTL pbcIQiDiejyYSWDbLMUJK0E0hd3PvrBzgJmdLLpcA3I2Z909w8QnKtvMrvGUwb0nPS 5R6/oxpw8owhw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Petr Mladek , John Ogness , Sasha Levin Subject: [PATCH 6.1 131/451] printk: Disable passing console lock owner completely during panic() Date: Sun, 24 Mar 2024 19:06:47 -0400 Message-ID: <20240324231207.1351418-132-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-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 cc53fb77f77cc..981cdb00b8722 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1797,10 +1797,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_); } @@ -1824,6 +1837,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