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=unavailable 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 D8888C5DF62 for ; Wed, 6 Nov 2019 03:06:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B3E7222C2 for ; Wed, 6 Nov 2019 03:06:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="NNsMqgzi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731041AbfKFDGY (ORCPT ); Tue, 5 Nov 2019 22:06:24 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34242 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730892AbfKFDGX (ORCPT ); Tue, 5 Nov 2019 22:06:23 -0500 Received: by mail-pg1-f194.google.com with SMTP id e4so16136260pgs.1 for ; Tue, 05 Nov 2019 19:06:21 -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=C8o6k5HWaBmjOtIiyLS1jMJRfXwPjLrMrjWhuU8k/BM=; b=NNsMqgziiD5TEdzTHs5dTOcWPVLiWT088RdD8H1NWbCgwJYQ7BYsKRQxF0fuAsnFST HXVPw9I8Dn1hvrpsc6xv9fDeZuSUi5M4GCryJJ3dUOtRKeFNa8qcjU9+XJdYPAYWX4AD APfHsYzdO+9V5PT0FgiH27mvseraRDwOLsY1FweIZPhgXw/qLRnYn++t/r32bMygeZjq JgfYLgNTlqT/WcVk6ZoPyRZn2w2PtBrM5gfvjTf/DapqwzqOXfVy7VcWP7xxXbyaaAGd TYDs0J9RVZ3NMPHu3wgllojn9Jqfx49jtZD9E2YX1qswngFFEeMvkgW6XHZre8EV8Lw9 czdg== 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=C8o6k5HWaBmjOtIiyLS1jMJRfXwPjLrMrjWhuU8k/BM=; b=QwI14ZVTN2tyxc4qv94SLA6+Dc5WyiGXIURATeWGeUxNw3DZ0aJecaBXgD7rOU8bYA ASc+v2nTYnHSR3Kb1NAWlVYprVslcAjWw8ezkS3dsGym0RsxY1P0uA0+2URJ/PRnMb6u oUzUoAU3eXl5QYUsN8adaAwGTYAEDz1uuxMB4aIMoILhRCzzFZ+0pWnFmHzIE8qNHfRo +AjnJKAeWHU87kga+Hid9369S7F6mqWIOWse0lXSiKUngIEzv8HqLXEN/RjyPIbOV9Tu 3O7LpJSuQHMVIfUfiOgJb++z5JsObN14PgsPIruMii4y/EDoH8mU4lfoFqu8BHd2JZjt uwUA== X-Gm-Message-State: APjAAAXWBpP6bpF+8ziGXRu+AzTGkpi7RjMpIzaantnbgFYorhlQnPfs qHDtyTlktXEZ6sGi3uKztCQrZMB33bg= X-Google-Smtp-Source: APXvYqyohr/a4KMIETeKCaTuNUm50JlxwfJtth6i4ALZ9N3BFDL5XthYfoNjHdGd1xd+voPRxQOr1g== X-Received: by 2002:a63:3d8f:: with SMTP id k137mr167264pga.195.1573009580120; Tue, 05 Nov 2019 19:06:20 -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.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 19:06:18 -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 , Vineet Gupta , linux-snps-arc@lists.infradead.org Subject: [PATCH 03/50] arc: Add show_stack_loglvl() Date: Wed, 6 Nov 2019 03:04:54 +0000 Message-Id: <20191106030542.868541-4-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. Introduce show_stack_loglvl(), that eventually will substitute show_stack(). As a good side-effect header "Stack Trace:" is now printed with the same log level as the rest of backtrace. Cc: Vineet Gupta Cc: linux-snps-arc@lists.infradead.org [1]: https://lore.kernel.org/lkml/20190528002412.1625-1-dima@arista.com/T/#u Signed-off-by: Dmitry Safonov --- arch/arc/include/asm/bug.h | 3 ++- arch/arc/kernel/stacktrace.c | 21 +++++++++++++++------ arch/arc/kernel/troubleshoot.c | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/arch/arc/include/asm/bug.h b/arch/arc/include/asm/bug.h index 0be19fd1a412..4c453ba96c51 100644 --- a/arch/arc/include/asm/bug.h +++ b/arch/arc/include/asm/bug.h @@ -13,7 +13,8 @@ struct task_struct; void show_regs(struct pt_regs *regs); -void show_stacktrace(struct task_struct *tsk, struct pt_regs *regs); +void show_stacktrace(struct task_struct *tsk, struct pt_regs *regs, + const char *loglvl); void show_kernel_fault_diag(const char *str, struct pt_regs *regs, unsigned long address); void die(const char *str, struct pt_regs *regs, unsigned long address); diff --git a/arch/arc/kernel/stacktrace.c b/arch/arc/kernel/stacktrace.c index 1e440bbfa876..24f9cd8a12c9 100644 --- a/arch/arc/kernel/stacktrace.c +++ b/arch/arc/kernel/stacktrace.c @@ -158,9 +158,11 @@ arc_unwind_core(struct task_struct *tsk, struct pt_regs *regs, /* Call-back which plugs into unwinding core to dump the stack in * case of panic/OOPs/BUG etc */ -static int __print_sym(unsigned int address, void *unused) +static int __print_sym(unsigned int address, void *arg) { - printk(" %pS\n", (void *)address); + const char *loglvl = arg; + + printk("%s %pS\n", loglvl, (void *)address); return 0; } @@ -217,17 +219,24 @@ static int __get_first_nonsched(unsigned int address, void *unused) *------------------------------------------------------------------------- */ -noinline void show_stacktrace(struct task_struct *tsk, struct pt_regs *regs) +noinline void show_stacktrace(struct task_struct *tsk, struct pt_regs *regs, + const char *loglvl) { - pr_info("\nStack Trace:\n"); - arc_unwind_core(tsk, regs, __print_sym, NULL); + printk("%s\nStack Trace:\n", loglvl); + arc_unwind_core(tsk, regs, __print_sym, (void *)loglvl); } EXPORT_SYMBOL(show_stacktrace); /* Expected by sched Code */ +void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp, + const char *loglvl) +{ + show_stacktrace(tsk, NULL, loglvl); +} + void show_stack(struct task_struct *tsk, unsigned long *sp) { - show_stacktrace(tsk, NULL); + show_stack_loglvl(tsk, sp, KERN_DEFAULT); } /* Another API expected by schedular, shows up in "ps" as Wait Channel diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c index b79886a6cec8..3f8fc1efcb60 100644 --- a/arch/arc/kernel/troubleshoot.c +++ b/arch/arc/kernel/troubleshoot.c @@ -245,5 +245,5 @@ void show_kernel_fault_diag(const char *str, struct pt_regs *regs, /* Show stack trace if this Fatality happened in kernel mode */ if (!user_mode(regs)) - show_stacktrace(current, regs); + show_stacktrace(current, regs, KERN_DEFAULT); } -- 2.23.0