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;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Sergey Senozhatsky <senozhatsky@chromium.org>,
        Petr Mladek <pmladek@suse.com>
Cc:     Arnd Bergmann <arnd@arndb.de>,
        Steven Rostedt <rostedt@goodmis.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Stephen Brennan <stephen.s.brennan@oracle.com>,
        Sebastian Reichel <sre@kernel.org>,
        John Ogness <john.ogness@linutronix.de>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Luis Chamberlain <mcgrof@kernel.org>,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2 4/4] printk: Drop console_sem during panic
Date:   Wed, 26 Jan 2022 15:02:36 -0800
Message-Id: <20220126230236.750229-5-stephen.s.brennan@oracle.com>
In-Reply-To: <20220126230236.750229-1-stephen.s.brennan@oracle.com>
References: <20220126230236.750229-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H2vMvD5jZl0CCfnrosCxJq7SeN9Fth7LbbQoDJbcNrx3f6AD8y4KBwCn/V7M?=
 =?us-ascii?Q?H8TvMjUkM0u+SOupDsKnTtGSTCS0crzDkFPNj2qVq9xmHq3ECAxypaBF9d+y?=
 =?us-ascii?Q?2JKtp6t1PpbS/S9pSwftRoRaxiw3o5W2R12daLD0KGhwFbVfev2apuDSaftv?=
 =?us-ascii?Q?eUxNB01/YbpmWV+V6lLFoe23zA9/8LiZ2n2t/a5jfS/sex6ekVcTBP2ki85W?=
 =?us-ascii?Q?ZN8lz+jmh0zqQ7CiQxJkw0P/f2bMsf11sM3Xtyhc6briyT1E3KyiW9bTn0un?=
 =?us-ascii?Q?FVwBlhmiAqQ5CUaUlX+4sVc3B82Rc+afiB3mTeigBhrbvj5+h2AZ11sVDqFf?=
 =?us-ascii?Q?Lk2d1olt6amb01zJlkw9kdRdjH31aVJ/Drp2xfQF8ck51p7HhicW1BidQKAY?=
 =?us-ascii?Q?48CcBST5NBMY7AY9fEN4xq4hoz7yqqvWbTolct3dn24HqIcvr8EVNW25bDF5?=
 =?us-ascii?Q?HICA60u4oP1TkZ2HdiYnyLXMLTUBdIPaDSPCuVlZoXxON1BqcJEUKDdxml/6?=
 =?us-ascii?Q?tgGyY245lsShORzXM17TRc4Y5EOU7iN9PRtoQbXXdNgwPVZW8APQMVyd937P?=
 =?us-ascii?Q?w9vXXNC4AcT20iB+0R1XLPDOExo6S2Bn3StWp7liZg3W88a8LPY4K5psHn2I?=
 =?us-ascii?Q?87EtyjYjBpblZKgoSfokEDNU47xPVZ+/QqiOhbmkx1GTc1qxcB4b6wyyGc1b?=
 =?us-ascii?Q?XFU3Oa76gMfn4pY7t91PKqT9rcGP9HgC6VjkhR/mR+c+dY1FxddvG6/K8nMe?=
 =?us-ascii?Q?HfrZoM1IhLeUGSa8uQZzQorqesnr3ZshN5sVSpRQIp7qcCPquzQD8HmsVFHV?=
 =?us-ascii?Q?f2tpYjtMWHzopWdjS7GPrlkgiWuxEyBUtoeYSTZHZjS2QvbE20XfhAWQFzUG?=
 =?us-ascii?Q?zqOea0vnVEjP1ifUx08DDnCo5ndUptQX31a9FMfpWChfc6tXHSxvGcJuvo+Q?=
 =?us-ascii?Q?MpUpneFtHQMQxSyhtN1bSVmvTjAaBy2/xxsC3wOjA4uLFSI/BKZttFsvvVLB?=
 =?us-ascii?Q?+THveXj6Uh4MXxio+ByMUkQ4ASmF7bKy3cZwG7BZp1/At4PPDtx8YaXCYVFd?=
 =?us-ascii?Q?q3Uk4+yBLNysGT2TvDn/MbkuHOrIqV+nXwWxC7+k5fnaDh5i2ZNFZaTRfoDX?=
 =?us-ascii?Q?NXApOoZF/Ji4MDgwXN7kAXBp4N7joDLi7SbhZ1RwlHJZR4UL+aZF4SOLmviR?=
 =?us-ascii?Q?2OdH0fga0dXOsdh4QX0XUjMytBGukMUyxKn2f0YP/HYdgTVah7lqCdmdjJV7?=
 =?us-ascii?Q?K3kxUzN+bkcSPt0kvds+yC3KcvgjIopUca6MMZQXKI68eBI6p/vh+rm76E5E?=
 =?us-ascii?Q?QwNSgvkMCpS/lX9YDBEMC8A0pu7/UptL3Mw3ozX8OwwBe4Jjwr7udwzB8nuk?=
 =?us-ascii?Q?t++9YLYkS7XpA3VnQXU0R/rqB8dQW7sHQzQouctDlWqtnGfHSF/G3R/yXcLL?=
 =?us-ascii?Q?kjLzj+995Zr0/t1rZJbeF3LqvkI62FZsMBov8QcOfFl8nrJ/yJuFOiq/nOoQ?=
 =?us-ascii?Q?b26UxYt35KFXctqEqfsnT/gzXLsmtNKt/ojkEMP/h/01GZGLmhNB6y07QTna?=
 =?us-ascii?Q?FSP3sO6FBTpXIM8MWDvyTUK4Arab/3PcMY/U+Rxi9tNExHKx/7ucvOXa82r3?=
 =?us-ascii?Q?lKp4SRZr2a746kDmhC5QmmPzPTISy/oaJGMFipZMMvY5qpiP0eFY8N0wvJdO?=
 =?us-ascii?Q?0EILCA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ae66c91-193f-4d29-a71e-08d9e11ff609
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 23:02:43.8480
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: kOEWEpssSnhckGhim2NHWAy98mTDvtTWx6c0b5ByOrUdkHlsXk1+O9TwACqQA+zjckI51fPTFxCokW7H1MVPrSzsMldgn5fdOO4vON4sF7E=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2350
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10239 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 malwarescore=0
 spamscore=0 phishscore=0 suspectscore=0 adultscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2201260131
X-Proofpoint-ORIG-GUID: 2s41U2Q95kwGHQukx2LxenAdkaoNDJo1
X-Proofpoint-GUID: 2s41U2Q95kwGHQukx2LxenAdkaoNDJo1
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If another CPU is in panic, we are about to be halted. Try to gracefully
abandon the console_sem, leaving it free for the panic CPU to grab.

Suggested-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---

Notes:
    v2: Factor check out to a helper, and check at the end of
    console_unlock() to prevent retry as well.

 kernel/printk/printk.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 18107db118d4..572363ff716f 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2593,6 +2593,25 @@ static int have_callable_console(void)
 	return 0;
 }
 
+/*
+ * Return true when this CPU should unlock console_sem without pushing all
+ * messages to the console. This reduces the chance that the console is
+ * locked when the panic CPU tries to use it.
+ */
+static bool abandon_console_lock_in_panic(void)
+{
+	if (!panic_in_progress())
+		return false;
+
+	/*
+	 * We can use raw_smp_processor_id() here because it is impossible for
+	 * the task to be migrated to the panic_cpu, or away from it. If
+	 * panic_cpu has already been set, and we're not currently executing on
+	 * that CPU, then we never will be.
+	 */
+	return atomic_read(&panic_cpu) != raw_smp_processor_id();
+}
+
 /*
  * Can we actually use the console at this time on this cpu?
  *
@@ -2742,6 +2761,10 @@ void console_unlock(void)
 		if (handover)
 			return;
 
+		/* Allow panic_cpu to take over the consoles safely */
+		if (abandon_console_lock_in_panic())
+			break;
+
 		if (do_cond_resched)
 			cond_resched();
 	}
@@ -2759,7 +2782,7 @@ void console_unlock(void)
 	 * flush, no worries.
 	 */
 	retry = prb_read_valid(prb, next_seq, NULL);
-	if (retry && console_trylock())
+	if (retry && !abandon_console_lock_in_panic() && console_trylock())
 		goto again;
 }
 EXPORT_SYMBOL(console_unlock);
-- 
2.30.2