Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Stephen Brennan <stephen.s.brennan@oracle.com>
To:     Sergey Senozhatsky <senozhatsky@chromium.org>,
        Petr Mladek <pmladek@suse.com>
Cc:     Steven Rostedt <rostedt@goodmis.org>, linux-kernel@vger.kernel.org,
        John Ogness <john.ogness@linutronix.de>,
        Stephen Brennan <stephen.s.brennan@oracle.com>
Subject: [PATCH v3 4/4] printk: Drop console_sem during panic
Date:   Tue,  1 Feb 2022 10:58:02 -0800
Message-Id: <20220201185802.98345-5-stephen.s.brennan@oracle.com>
In-Reply-To: <20220201185802.98345-1-stephen.s.brennan@oracle.com>
References: <20220201185802.98345-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?dMsIoKBYdwLYMb8HO6WniJ4dezSJreCweCJ6MuZI1JCIhadp4jpCdEmg5q3P?=
 =?us-ascii?Q?AWGEIUBsa9b7teat9+qlpvqfG+Z0JrEdHT9+Wevg/OH5WoVDe5c3pOrhObx6?=
 =?us-ascii?Q?uZuDjGBPD0B5rzZkbfz2kImydbzJMc+Jp1lc16iMgDM+kSjWqKGPfhnI7B6d?=
 =?us-ascii?Q?yaq++j/lNZkBtALtEHw1axXq0vJSurdbnXDXe3T6/RJuCmrEnS8QuJjvfKvZ?=
 =?us-ascii?Q?Mr4Tt+EhMYDbFhX0t6FX0w6XU9cs36nOmJDNqvZrnTYYrLRaVnV9bMF1+Csw?=
 =?us-ascii?Q?pDWiXTTFzaAWX73WFICNwLaP28zsN+k9BgWGb8frIwr/AOzklweKxMN/tEbr?=
 =?us-ascii?Q?jrmqbPbZ3Xt2EmIXTrHS37eVDLFWR/CwaxT97epZ4Ea6wv7FIhn/W89982H/?=
 =?us-ascii?Q?jupBUJ9AO92p09OUKFZ+dMR5G7nl9G4ButDpXvHm+JAL73xRHpR1XFWFEJrN?=
 =?us-ascii?Q?rZVdERTCDPIxMZeeqM0/KY2nLqH3n+OJ7N6L48m8udu73a8D1gkUcaiXeHnv?=
 =?us-ascii?Q?1Po3aJHlWYp6iMTxy7cTx89yv2HY43E8NCoCtHzn3Jsj5CmPaqCPG5zy/gSi?=
 =?us-ascii?Q?JQRhH6GcNGvjt9zLW99SIk3fKuI6t2dO4YJC2i7gwje+zzNy+qUXtrl21iBi?=
 =?us-ascii?Q?b8Jf54yAwF7JvKFxTHVbeIu0MTiu/F3b0TVikvFT4XF0qqk7yPm+Y5p0gsWG?=
 =?us-ascii?Q?pPkaE/3rl5e8ImHWzA+gch0N0IlvstiDxL82hNf+TABrrk5/LBCn4MdKX6k6?=
 =?us-ascii?Q?8MI9ckkwlxdr54wE9P9DOzGtRud9T/+qxNEuJwY4Pr/f+T/KRUZcw7SpkivS?=
 =?us-ascii?Q?nvls7dGWD41+N/ly7adF9NkRJcH6daPsbk4oIQXlr+ugG1tYn5DBgPqsKMja?=
 =?us-ascii?Q?I5rcfI6HqkebWNvRahcUdvgN6+DkyHSoQMOKQbzGFGYjM3AoiW87+i2+NFAo?=
 =?us-ascii?Q?nuwS4DrMzP8TfOQPB4KJQ8Mtxbxa6klJTknztcSaivk3nwbdp56SbtUt8K4j?=
 =?us-ascii?Q?B7WDw68lrfuSueV6n07cNGTXR9/x8LezUi9MxncT87A21HiX3eZ8udmuh9jN?=
 =?us-ascii?Q?xjdNV8ChFGw6R86/mP1Saq+qPYRm/gPYUKy6XYgyppMVByIhARCTPD4PmsxF?=
 =?us-ascii?Q?mSMYPuZRs7ZhLBEP7H5fSEhZG5mzlL0ROq5aFxLkS4YHTzJ1c0JLTjzJv472?=
 =?us-ascii?Q?R7r/C1kcymx3SEGo5m7jHMW7BuvhJCcT1a7JXlvBWcbb0EdsBpGE6F61wMW/?=
 =?us-ascii?Q?4ADPSlExwEv2WX097pCvisgRK7P13bMVuLUGzd7aNTjur6md6WN+t2sFiSjp?=
 =?us-ascii?Q?tFRSOK+lykaUopNsy9V8C8jknTDjhw26m4Cd+NgmGnc+D74pxLjincXYluHq?=
 =?us-ascii?Q?sob6tEmJWpsr7wspvO+4slibxLABzQp0JPqE8dHKkoFnLoELjd6dZsj+1WDC?=
 =?us-ascii?Q?4/nHSv6jMxaIvx4Sd/D3t4mxQu5VdwJupS85hetZHhS6aa0m37utuDzGh2Oj?=
 =?us-ascii?Q?FEMcozYV7lZDQapRMLStB5zRDfE2YzVFPAETZc1aiXQTICKrXB279Tz8Nh88?=
 =?us-ascii?Q?xmU/vNF4I/+jgNODFN22AJMzmEuo7EHCtHR8jsYmqA5YUYxSRWl1UPj8yeiU?=
 =?us-ascii?Q?0bKqBMq5ot7I8tjbaLeyNEW1FMR6g0AsJdNAHQw8QdhZ2lSS25h/SFGr7UaB?=
 =?us-ascii?Q?3QqKPA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d174507a-f399-4b11-4c61-08d9e5b4cf19
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 18:58:18.2457
 (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: nQ7iK4VprEt/l28Kz/efZPrqMXA/m/J3p+98jlV3qGm3LUcJZp+7f9mQFoC+lqxDPYr9XJic785dMAPkKBDUnU2j/Y6HgTrfUBYi/9RpVn0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5156
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2202010106
X-Proofpoint-ORIG-GUID: 6V8wlBlEEhS3Blt-A6wnpuNRZt81btnQ
X-Proofpoint-GUID: 6V8wlBlEEhS3Blt-A6wnpuNRZt81btnQ
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 cc7bb86f7bfe..35676e76482e 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2598,6 +2598,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?
  *
@@ -2746,6 +2765,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();
 	}
@@ -2763,7 +2786,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