From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A77B1C5DF62 for ; Wed, 6 Nov 2019 03:09:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C79D20659 for ; Wed, 6 Nov 2019 03:09:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="lyd/0jBo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731220AbfKFDJq (ORCPT ); Tue, 5 Nov 2019 22:09:46 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:42564 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388326AbfKFDId (ORCPT ); Tue, 5 Nov 2019 22:08:33 -0500 Received: by mail-pf1-f195.google.com with SMTP id s5so9474257pfh.9 for ; Tue, 05 Nov 2019 19:08:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1fWf0t1ZEiecsyLWHnRHbkgUwMXQ6HckHwQs+C+i1j4=; b=lyd/0jBowCwGHyfeFlOE0KSibdCZP3sXje7h/WNFzWUyST1vC+ND5tZuL+udHFkUiG PkB985gz/fxpRJcz8pB/Cj6tDAhEVALdZ2UqOoM11ZFcsDwnBQgPF0ZyMvV3TVJyalop na/dCz6NlryHduq9C/wptDjvAx1S12nXT8lSsnd/Nl92B/SE1MgnPxhL5h5NAaGhdIgH TeX0v7j7fyvzztWe4PTAwLmhtdTyh3MTxSAFO01HcwfIJATDS98Fy0bE7FRFtIa6mcNc CG6RQz561j5GdhvziCQVQWtidwVxsrmGUSzUhnzMJjju6k44aeYwRjA4uY5JbUvpb36N UrVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1fWf0t1ZEiecsyLWHnRHbkgUwMXQ6HckHwQs+C+i1j4=; b=WW8lCqzqFdtKegE54BjrhPCM9z9gCgt97VIRaU6JjD2aiXgFJIMu+VxGnmKLNFHJ8I s6zeWuTWElfPdxoibjBnGcJDDlyEPQxWlRtqlU/YUeJiDWDzKYMBxNyl9MpC38xZixQU ocZDt6S9CDcPi41lrG1aJBQWXmQYXv+Zp2/GK43chW4VG1lOAxiYuSkrYN/Rqw+Br+1I WV4I3pzA4ROSCuJ1TkdWDPIldi9M4gMllgbxHt9jius+9U0sMBCpbHK5wawqFjMLNXVQ 6vK0A8LD2ytLlXx87HKF5qjOExrJXGjWqK/Bv2Oe4P+C0K4s2cIZdNucsNKc/VwZ3kHt SYnw== X-Gm-Message-State: APjAAAUGzHbsyht5DvkBj3q1VzwBDJECctD4CwbZwVzE/h9CFoNXnTSz 0A2kiVSE+ZfrYrfe08Dc33ODjBv/qb0= X-Google-Smtp-Source: APXvYqz9ljNPD+mB1odD7eum0CIizE3ZnPjr+cSrQNIu3J7r4i+D0QLAb9RQSKDN5q1UPwDLdLf9CA== X-Received: by 2002:a63:eb08:: with SMTP id t8mr199649pgh.49.1573009711773; Tue, 05 Nov 2019 19:08:31 -0800 (PST) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id k24sm19570487pgl.6.2019.11.05.19.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 19:08:31 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Andrew Morton , Greg Kroah-Hartman , Ingo Molnar , Jiri Slaby , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , Tetsuo Handa , Guan Xuetao Subject: [PATCH 38/50] unicore32: Add loglvl to c_backtrace() Date: Wed, 6 Nov 2019 03:05:29 +0000 Message-Id: <20191106030542.868541-39-dima@arista.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191106030542.868541-1-dima@arista.com> References: <20191106030542.868541-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the log-level of show_stack() depends on a platform realization. It creates situations where the headers are printed with lower log level or higher than the stacktrace (depending on a platform or user). Furthermore, it forces the logic decision from user to an architecture side. In result, some users as sysrq/kdb/etc are doing tricks with temporary rising console_loglevel while printing their messages. And in result it not only may print unwanted messages from other CPUs, but also omit printing at all in the unlucky case where the printk() was deferred. Introducing log-level parameter and KERN_UNSUPPRESSED [1] seems an easier approach than introducing more printk buffers. Also, it will consolidate printings with headers. Add log level parameter to c_backtrace() as a preparation for introducing show_stack_loglvl() Cc: Guan Xuetao [1]: https://lore.kernel.org/lkml/20190528002412.1625-1-dima@arista.com/T/#u Signed-off-by: Dmitry Safonov --- arch/unicore32/kernel/setup.h | 2 +- arch/unicore32/kernel/traps.c | 2 +- arch/unicore32/lib/backtrace.S | 24 ++++++++++++++++-------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h index 03e70e37f472..967352323185 100644 --- a/arch/unicore32/kernel/setup.h +++ b/arch/unicore32/kernel/setup.h @@ -29,7 +29,7 @@ extern void kernel_thread_helper(void); extern void __init early_signal_init(void); extern asmlinkage void __backtrace(void); -extern asmlinkage void c_backtrace(unsigned long fp); +extern asmlinkage void c_backtrace(unsigned long fp, const char *loglvl); extern void __show_regs(struct pt_regs *); diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c index 3682a4c5d927..2b7d73456865 100644 --- a/arch/unicore32/kernel/traps.c +++ b/arch/unicore32/kernel/traps.c @@ -163,7 +163,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) printk("\n"); if (ok) - c_backtrace(fp); + c_backtrace(fp, KERN_DEFAULT); } void show_stack(struct task_struct *tsk, unsigned long *sp) diff --git a/arch/unicore32/lib/backtrace.S b/arch/unicore32/lib/backtrace.S index f303671e2a4e..6221944b81f3 100644 --- a/arch/unicore32/lib/backtrace.S +++ b/arch/unicore32/lib/backtrace.S @@ -16,6 +16,7 @@ #define sv_fp v5 #define sv_pc v6 #define offset v8 +#define loglvl v9 ENTRY(__backtrace) mov r0, fp @@ -27,10 +28,11 @@ ENTRY(c_backtrace) ENDPROC(__backtrace) ENDPROC(c_backtrace) #else - stm.w (v4 - v8, lr), [sp-] @ Save an extra register + stm.w (v4 - v10, lr), [sp-] @ Save an extra register @ so we have a location... mov.a frame, r0 @ if frame pointer is zero beq no_frame @ we have no stack frames + mov loglvl, r1 1: stm.w (pc), [sp-] @ calculate offset of PC stored ldw.w r0, [sp]+, #4 @ by stmfd for this CPU @@ -95,9 +97,10 @@ for_each_frame: bua for_each_frame 1006: adr r0, .Lbad - mov r1, frame + mov r1, loglvl + mov r2, frame b.l printk -no_frame: ldm.w (v4 - v8, pc), [sp]+ +no_frame: ldm.w (v4 - v10, pc), [sp]+ ENDPROC(__backtrace) ENDPROC(c_backtrace) @@ -128,8 +131,11 @@ ENDPROC(c_backtrace) add v7, v7, #1 cxor.a v7, #6 cmoveq v7, #1 - cmoveq r1, #'\n' - cmovne r1, #' ' + bne 201f + adr r0, .Lcr + mov r1, loglvl + b.l printk +201: ldw.w r3, [stack]+, #-4 mov r2, reg csub.a r2, #8 @@ -141,18 +147,20 @@ ENDPROC(c_backtrace) add r2, r2, #0x10 @ so r2 need add 16 201: adr r0, .Lfp + mov r1, loglvl b.l printk 2: sub.a reg, reg, #1 bns 1b cxor.a v7, #0 beq 201f adr r0, .Lcr + mov r1, loglvl b.l printk 201: ldm.w (instr, reg, stack, v7, pc), [sp]+ -.Lfp: .asciz "%cr%d:%08x" -.Lcr: .asciz "\n" -.Lbad: .asciz "Backtrace aborted due to bad frame pointer <%p>\n" +.Lfp: .asciz "%sr%d:%08x " +.Lcr: .asciz "%s\n" +.Lbad: .asciz "%sBacktrace aborted due to bad frame pointer <%p>\n" .align .Ldsi: .word 0x92eec000 >> 14 @ stm.w sp, (... fp, ip, lr, pc) .word 0x92e10000 >> 14 @ stm.w sp, () -- 2.23.0