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:     Petr Mladek <pmladek@suse.com>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        John Ogness <john.ogness@linutronix.de>
Cc:     Stephen Brennan <stephen.s.brennan@oracle.com>,
        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH 4/4] printk: Drop console_sem during panic
Date:   Fri, 21 Jan 2022 11:02:22 -0800
Message-Id: <20220121190222.572694-5-stephen.s.brennan@oracle.com>
In-Reply-To: <20220121190222.572694-1-stephen.s.brennan@oracle.com>
References: <20220121190222.572694-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?3uE0KKRr7tU68QkiEMzd6T06qG+Vi1aYkuCn1aul4PQLlXEcsX6a6u/vqHHW?=
 =?us-ascii?Q?bTtSeE/RYVwli/e3mIPuOqLg+NJ08ZP6cSxnGpo2PFp6RzaczFFuxePXNw8g?=
 =?us-ascii?Q?fnFkaaCS+/5qTaEwbFcoZ7UJFJPIzzSiMCsdUDnB1jbII5jqO6iETGqZNzAf?=
 =?us-ascii?Q?KIuqosQ1f0AJBP0G7cEFBhi4h5CJMsksDpn0/ST1OYzQWU2pSSjyul67q0pN?=
 =?us-ascii?Q?A1NACU0gT05a+FHzNXAyGqtVfDSQXxNUwDdAlBB6bMDPm5wgrBuWg/GG32nZ?=
 =?us-ascii?Q?+yJdWGxagpIRpQFS95QMCcQ3xPT5j9MzQxFLqgH6qP+dOWx7ZqKgXGk3H1Rd?=
 =?us-ascii?Q?rlXG3VX9/Myf0d/QROzZSIdqXu1gDfOwzosJ+KEFocwHRAw5fbmWbjWNzuFR?=
 =?us-ascii?Q?Vr6bRfYSpJUPwKjgIcE/X2v/lE+VVRxPgg0odBo2ONCKRfz5O7AY63/HVmiY?=
 =?us-ascii?Q?TWuDUAnUgxaI+fnu/PtuEEukwJ2b1xJrz8ocM4nD+axoegaLNj1hD+HRo6h9?=
 =?us-ascii?Q?V2qwRQ4IxlVbbVZ5xdO2jNiAhg9JN41r5m1clh+V1/S2oS6i76byrQTPovZe?=
 =?us-ascii?Q?AWBe4FCPMVaevt50LTZFWoJP/MibZwu0/gSAUhaF5LY4lFpiibxtHIe9l4lt?=
 =?us-ascii?Q?0nHKjJVXxnXuNonTpdHVrlehzOgQ/jQZjmYgHb6JHaeHsg5x53vdJH4yLULz?=
 =?us-ascii?Q?WUcKkETar9x+SXXJsZBTONlFEFIcpeziYOYfqHEGfS5cKS9g3WkhKzibny1p?=
 =?us-ascii?Q?XfOX5Yd3E5+KTwnmybI4AIEoby6RCwgfuVzVnKVOk+FKPcWj0ic/hZxZAe0H?=
 =?us-ascii?Q?LMTPzcsYW+NmFMq1NTNXowZ2klPjinLWoUz6SMiJLuW38SSWPV8AE8elW4pn?=
 =?us-ascii?Q?G9TeYWfIHZ/iNOLwqijr6kqhg+QeOsF5jdup3xN0nad4X1aZe1nBj8XO9bBS?=
 =?us-ascii?Q?hRmU6SGjEhSKVFVOThi7s+rXrYSO1Ot05JlBM/quleXrdE5w8Pcm6+OOwa8r?=
 =?us-ascii?Q?CxEMpAPqtuiYCybwcNImsFAW+dZU3UMqg/xoMIIeE3b5Ort3RynjUkfi9rN7?=
 =?us-ascii?Q?xZfxkQQH9lfmrhFhtJclHxVdo1EHo2wH6u+lgGaD4sLXdRiDd3ag2mLCIW2j?=
 =?us-ascii?Q?tONU5+ImXM7ZHjKSRO1ipju3QI+ACVm5coQ16f6xOuQgicqjvqnslRk2dJ1l?=
 =?us-ascii?Q?FK/3Ox1Plwa+hxqTQjbrMjlQLGu/5As0ZGU5WC5FVajypWE1b008xtfLoKII?=
 =?us-ascii?Q?GELw+txZPyrwZE6fB4wz7xrHvFfG6HT6bOetb07J4mxW3kf2amTDKQP/H9cC?=
 =?us-ascii?Q?GK9OUHV6YgXcaAr89pjiqmt6ru/71pjwhxNXPy3CRtC20ADInVwo5iFuoj4o?=
 =?us-ascii?Q?XD7gmKX+6bxQvq6dtKiCNBruLCu3OugBhLek0f6noIY3A6+SJGhDYfuQR4Sw?=
 =?us-ascii?Q?RH872K+z1xkz+IWkfQd76+uBPV3/uqWU5XEGlYqYlnuPTMLeSouCZ1LIYT6R?=
 =?us-ascii?Q?w4bb0UgjuGrIhd19dEzzG4Ua2P9ujgajiAztbZpVwpFKakQWicvyImpobHyg?=
 =?us-ascii?Q?2zjX19iiOAxb74GwZVQdUEBla/cYWi87WD3vsrKb9IuYdX+uLkDxQp/2K0Rd?=
 =?us-ascii?Q?bIVCtH7ZCxLC9iC4eSD9a688gBszEZMCco1QP/P5ecGD3KzbJ2oYR/a00+tT?=
 =?us-ascii?Q?+Pigxw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 74a31c96-226f-4ffe-0f69-08d9dd109726
X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4166.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2022 19:02:37.5954
 (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: dSCrsduLmf8mUCA2pm6WKs0M/qDeRBALRI+dLZEOZx+PtudL2RaVdBKIq6CRA9hxwpvl2bVq3WT6UL7e6LKH4D1gMz80rb0jzW5nGQeCDK4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3434
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10234 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 spamscore=0
 suspectscore=0 mlxlogscore=826 phishscore=0 malwarescore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2201210124
X-Proofpoint-ORIG-GUID: 1kHmDSndQWwlKHBis7vndhf1egauh7zq
X-Proofpoint-GUID: 1kHmDSndQWwlKHBis7vndhf1egauh7zq
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
drop console_sem and allow the panic CPU to grab it easily.

Suggested-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 kernel/printk/printk.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index ca253ac07615..c2dc8ebd9509 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2668,7 +2668,7 @@ void console_unlock(void)
 
 	for (;;) {
 		size_t ext_len = 0;
-		int handover;
+		int handover, pcpu;
 		size_t len;
 
 skip:
@@ -2739,6 +2739,12 @@ void console_unlock(void)
 		if (handover)
 			return;
 
+		/* Allow panic_cpu to take over the consoles safely */
+		pcpu = atomic_read(&panic_cpu);
+		if (unlikely(pcpu != PANIC_CPU_INVALID &&
+		    pcpu != raw_smp_processor_id()))
+			break;
+
 		if (do_cond_resched)
 			cond_resched();
 	}
-- 
2.30.2