Received-SPF: pass (google.com: domain of linux-kernel+bounces-67911-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Stephen Brennan <stephen.s.brennan@oracle.com>
To: linux-kernel@vger.kernel.org
Cc: Petr Mladek <pmladek@suse.com>, Steven Rostedt <rostedt@goodmis.org>,
        John Ogness <john.ogness@linutronix.de>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        Stephen Brennan <stephen.s.brennan@oracle.com>
Subject: [PATCH] printk: save loglevel before console_verbose()
Date: Thu, 15 Feb 2024 16:51:28 -0800
Message-Id: <20240216005128.1045812-1-stephen.s.brennan@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?5bTanKj88XHNudLN7rZI5WZn3ErjK78qVgtcWkLdUvaGKPWY+tL4g/D/pwaI?=
 =?us-ascii?Q?5fTObyBRpEDsXqMgTV57l4FBEvjaPORVSucnnh0FDT5rOzrPnfhRU1UJm6ey?=
 =?us-ascii?Q?DrmmJGuVHXJWHb74F8Hp9jtgIS46GvvdWYw5sbW4NBBClJbF+Ayoq301efl7?=
 =?us-ascii?Q?83wFIuUyMLN439MZyM5ledlx2+TswjllHveVc+WyAJ5D75u/KELesEdrr6WV?=
 =?us-ascii?Q?5zDZYq1YshyDS03G4+bjy+q38zbYBD+ZWSYGTDJ7DyS2pTQAb1fQmJ5x/aY+?=
 =?us-ascii?Q?oksXvLC207BcAzJwWd35yYMMweiC/hv50dFwtrjPq0NpVknL/9e4+m1CsFpP?=
 =?us-ascii?Q?pBfmeMBn14AtOmyc6Cyg92JeeHKlO96LWuWWw6eLQKyYOyVaIC6eX19HEyil?=
 =?us-ascii?Q?0PChK2EVtiF6iBIH/Y+/CFsFTUd+brpd0mJsp9mMAaK0MTCbJhOOv10ODm08?=
 =?us-ascii?Q?v9cjWVyMu4wSc0m8Rv9n+Mw2vykaFPDYwSrm1OM0kipgfcD0/jqFumajxqUk?=
 =?us-ascii?Q?Nd77Xd2x/1ulp7BLYnEbnt56cVSYOIIkiND9bm5ca48WeFIX9xYdeML5+NvP?=
 =?us-ascii?Q?ZciVvjiVhjm69EvpZb4Ch2tMwgKDZRuvvK8mZXKXguDNshDN31YHWImJSur8?=
 =?us-ascii?Q?jLztfSJCz2vm6dnqcc/hPzJkL+AGhXWvdkQRXruCuUacBEak166k5sqAvsY3?=
 =?us-ascii?Q?j3U0ZKGk+VUX7G+lh+bfwoeyoXzlXE/xLB38UeETjNu6k4xkrZkiMZRaSoyi?=
 =?us-ascii?Q?8ZPgUNT7/I5M+Nq4/winTgtFWyO5nbsJ6GcbRHXOQmuoe2e4xcOFFeSRqFVl?=
 =?us-ascii?Q?Wg8QKUp8AhhC4UJe3SlaPM2pZmEQ06PD1lEqRQoi7WXJ42fqYAIHWMptT5lT?=
 =?us-ascii?Q?Ak0BxIDuRleAg1YYL7VpH1r4vzp3y7osp5JS04Fk7nCtJ00AipVqBKzH6Gha?=
 =?us-ascii?Q?JkpgUeRRs0fE7mkq0KNu+DRV13s/+TXLtENAdlFnJL1aZjytVHgekgCsuOr/?=
 =?us-ascii?Q?izwG2StB+DIQg8pQgsbEkGgQLT7Q4pAgi//stj6Tcr3uUvZebzN4+nRYW9V2?=
 =?us-ascii?Q?BTOPckfq+Yef8i+UezQehxoRrJ8rbfOllGn9mbxyVsJl6TRTVKiSuMcD/tnw?=
 =?us-ascii?Q?Fs7t/D+IY0+aLnlt/elKNraqCECRv07fYYKgQRObFFH7b78jxfl0c7/lls0/?=
 =?us-ascii?Q?QtBdvfoT/7S50a5xP41FGS1iR2DOTwyOW0/4VomeccyPo2Os82S8Tjx3vGTl?=
 =?us-ascii?Q?OdgHYzBM9z2aWitBAo+whaj3H/RjEfEwWeWgfJMaf+o90Caz2e+0xP2VlNAY?=
 =?us-ascii?Q?J+OeVCmPdVOgEohQ6R/gsJucp5pJxImOC03dHn981IOFHLjrAu4JEmN5ftQs?=
 =?us-ascii?Q?w22xlMwVnzWkQFllV7R4hJ0oApP204bRMjC1nGztqfZg2F4FKTo91q1HbUyA?=
 =?us-ascii?Q?I0u173hYJHsIuaG1XfVixI0ES/Ah8DRBWSGa2NbyfgCtKoarHE/ZbDroNSMg?=
 =?us-ascii?Q?wYPIToyJN9uWraemeUSCWpkABj1TyOAc4vdZ/HO2yeZ2T6QXwP0L/ijikJU4?=
 =?us-ascii?Q?gYpfdIh1jnqKriGPpJuEn8GkoUyNEL48FcrvMI1UD9OYkpilaszqmaBzcwhn?=
 =?us-ascii?Q?/yMuNFjjO4OdK1YskEdleac=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	xgvEXo3UO4jP4TK9S6sPF6/lGPiKiCVnaG/fx2B4ynvqJ2xUMl+C9FFIwoPTIsjvHBPZ1JWRVC2lOwL6LNcqIdACQRRD9hzXZOIlfhWRrjVSvTkrLF0yd6KEJELXo/5TvdtquSKigVjYGI8XSz6FM3ILjNEedQWhab1BtCl3kw9DzBcb4v4IqJBvJVEbdweUZFJ5Jum5PxCrHA5BAEfguq2urm/qDYr3qsNgCxAG1+i0yQA7/A8IiNh/p9ZIPlGPrxCBW9WWaZ74BxQBGpnQbi/uYPI8Kc6FKud/2dmViW5X/GnBBlruPr+dNiPlIham/sJBmrdMgaSjFE4xsa3RfWmQIJOOY00eDZCRWtvkvW2Yla17/OWmY89R3hpxyPwXOdowQSvkBALSwIEBZS+zVZpuREVZVi5cdfwDeT1+/6+SBORKNu6xAPFWJMOYoRPUvrupAi15ORRS6stFJUeYhM7dRlIn1KMRkikkEFnLXsUJZqs5Fm2sFP6GWR3/IKPH5GW0hgYdv6eig+KDQAQfAEWAb6l/mNFsZzr2oxutlUuSh+xVkucEz/fS9ge+H7AqRGS7wUU98YK5xhuGN0JvUknFRA7fbytZ8K7013tb/Ik=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: da5b571e-f39a-43a2-ce71-08dc2e896919
X-MS-Exchange-CrossTenant-AuthSource: PH8PR10MB6597.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2024 00:51:29.0393
 (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: 1cQpAcx2ap9+lqPO0M60Ymuvjb5ddO6+v4+sza3pCf1vwqNARBDWaTUvNP8i01TbHrykKFjw5F7z6ZY6Oa9EuIc6PnfSSZy0F14spxbenFg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6905
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-15_24,2024-02-14_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 mlxscore=0
 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2402160005
X-Proofpoint-ORIG-GUID: t5ShvSU3ErPIYz0XwPinNdQpBHlMvK2A
X-Proofpoint-GUID: t5ShvSU3ErPIYz0XwPinNdQpBHlMvK2A

In panic() cases, console_verbose() is called, clobbering the
console_loglevel value. If the bug which led to the panic related to
printk, it can be useful to know the log level prior to the
console_verbose() call. Save it to allow debugging these cases.

Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
---
 kernel/printk/printk.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index f2444b581e16..97bd9427f118 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2521,11 +2521,19 @@ MODULE_PARM_DESC(console_suspend, "suspend console during suspend"
 	" and hibernate operations");
 
 static bool printk_console_no_auto_verbose;
+int saved_console_loglevel;
 
 void console_verbose(void)
 {
-	if (console_loglevel && !printk_console_no_auto_verbose)
+	if (console_loglevel && !printk_console_no_auto_verbose) {
+		/*
+		 * Save the prior log level for later debugging. Avoid
+		 * clobbering in case of multiple console_verbose() calls.
+		 */
+		if (console_loglevel != CONSOLE_LOGLEVEL_MOTORMOUTH)
+			saved_console_loglevel = console_loglevel;
 		console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
+	}
 }
 EXPORT_SYMBOL_GPL(console_verbose);
 
-- 
2.39.3