Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp261340pxu; Fri, 4 Dec 2020 02:38:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJx2bafR61kzYf6tWn+VHK0W7CxrSQRYQN4e9GzuTum5PRLqX+0w0bWjOGfeYFslYJJmB72H X-Received: by 2002:aa7:c44b:: with SMTP id n11mr3886682edr.216.1607078313890; Fri, 04 Dec 2020 02:38:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607078313; cv=none; d=google.com; s=arc-20160816; b=v8mHrfBT8NPd4CCm/RMj7AzuBwLdgLVbq8qpe6NsTBYAH7QTM3X9q+CZrbPeEHxv2Y GNrKqUi8FccL18uRnlwTJnk1Xu4URBrzPFE4Ll199OP8V4zg2FeMUrEPEF0PjYyfST5e 2a/H9spAMDfmJotUskkQkGSXviJU0ntR8yIjyh0DvqPLOciaRQJUTWN2ZnF7Iv8qdi6f G9L3mZbGnZsv4+lUFmWcJs+SrldOrHan7NkLZm0+7SqAR/v0f4fTGtr5kpjZAYUVr/pw SZ0P1+BfE44WYxva0rU1BoVAjJsd31srpiuqHvysKZplckymBNn20gGdQb4v0cnxI4kw JT3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=aUS6CIuJ2nQKKqvZodksHViJN4Lv2CSfAIJfuIXWbk8=; b=t1FPr4YGqTzT3342o3RwIuSrjY+c92sGKBvoO46J1W5ObmxfGsgg+CpT4QbSmH4bSQ tc00m5i4X+xV0tXy5J8pJYxRlfQc08PlwQ3s5IBkdByrpdQpEmfnXiF3yWQLYed2xciE A37XncigSy4HhceVMIyIZ9i8bnPnGz4DJLTGU5n3mjV63KucD4AVxMW0CymWdzTRnQr/ AYcgrensC3+lixIorXEuK3WCPNi0cYro+lxbn7wD6Mjkb0EamuzMCgCHJL0Q4rmCDAG0 qHxsHr3F29DSgdH1Dnt2A59N7BQrVyYMd+ZqQ8EDg3zHbpV/lRn1WZNdD4zjeKQJx/jf 8oJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bi25si2712285edb.487.2020.12.04.02.38.02; Fri, 04 Dec 2020 02:38:33 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729032AbgLDKgX (ORCPT + 99 others); Fri, 4 Dec 2020 05:36:23 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:19940 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727096AbgLDKgX (ORCPT ); Fri, 4 Dec 2020 05:36:23 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4CnTcp2bvVz9v9kB; Fri, 4 Dec 2020 11:35:38 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id yFNFjPTzBE2g; Fri, 4 Dec 2020 11:35:38 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4CnTcp1XRKz9v9k9; Fri, 4 Dec 2020 11:35:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 639DF8B800; Fri, 4 Dec 2020 11:35:39 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 6ASh_IQLGVmY; Fri, 4 Dec 2020 11:35:39 +0100 (CET) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 0BF1A8B7FE; Fri, 4 Dec 2020 11:35:39 +0100 (CET) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id DA1EA66914; Fri, 4 Dec 2020 10:35:38 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/xmon: Change printk() to pr_cont() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 4 Dec 2020 10:35:38 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since some time now, printk() adds carriage return, leading to unusable xmon output: [ 54.288722] sysrq: Entering xmon [ 54.292209] Vector: 0 at [cace3d2c] [ 54.292274] pc: [ 54.292331] c0023650 [ 54.292468] : xmon+0x28/0x58 [ 54.292519] [ 54.292574] lr: [ 54.292630] c0023724 [ 54.292749] : sysrq_handle_xmon+0xa4/0xfc [ 54.292801] [ 54.292867] sp: cace3de8 [ 54.292931] msr: 9032 [ 54.292999] current = 0xc28d0000 [ 54.293072] pid = 377, comm = sh [ 54.293157] Linux version 5.10.0-rc6-s3k-dev-01364-gedf13f0ccd76-dirty (root@po17688vm.idsi0.si.c-s.fr) (powerpc64-linux-gcc (GCC) 10.1.0, GNU ld (GNU Binutils) 2.34) #4211 PREEMPT Fri Dec 4 09:32:11 UTC 2020 [ 54.293287] enter ? for help [ 54.293470] [cace3de8] [ 54.293532] c0023724 [ 54.293654] sysrq_handle_xmon+0xa4/0xfc [ 54.293711] (unreliable) [ 54.293859] [cace3e18] [ 54.293918] c03885a8 [ 54.294056] __handle_sysrq+0xe4/0x1d4 [ 54.294108] [ 54.294255] [cace3e48] [ 54.294314] c0388704 [ 54.294441] write_sysrq_trigger+0x34/0x74 [ 54.294493] [ 54.294641] [cace3e68] [ 54.294700] c01f65d0 [ 54.294822] proc_reg_write+0xac/0x11c [ 54.294875] [ 54.295023] [cace3e88] [ 54.295082] c0179910 [ 54.295198] vfs_write+0x134/0x46c [ 54.295250] [ 54.295396] [cace3f08] [ 54.295455] c0179de8 [ 54.295567] ksys_write+0x78/0x11c [ 54.295619] [ 54.295766] [cace3f38] [ 54.295825] c00110d0 [ 54.295951] ret_from_syscall+0x0/0x34 [ 54.296002] [ 54.296159] --- Exception: c01 (System Call) at [ 54.296217] 0fd4e784 [ 54.296303] [ 54.296375] SP (7fca6ff0) is in userspace [ 54.296431] mon> [ 54.296484] Use pr_cont() instead. Signed-off-by: Christophe Leroy Fixes: 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing continuation lines") Cc: stable@vger.kernel.org --- arch/powerpc/xmon/nonstdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/xmon/nonstdio.c b/arch/powerpc/xmon/nonstdio.c index 5c1a50912229..9b0d85bff021 100644 --- a/arch/powerpc/xmon/nonstdio.c +++ b/arch/powerpc/xmon/nonstdio.c @@ -178,7 +178,7 @@ void xmon_printf(const char *format, ...) if (n && rc == 0) { /* No udbg hooks, fallback to printk() - dangerous */ - printk("%s", xmon_outbuf); + pr_cont("%s", xmon_outbuf); } } -- 2.25.0