linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: "Alastair D'Silva" <alastair@d-silva.org>,
	Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
	Balbir Singh <bsingharora@gmail.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Christophe Leroy <christophe.leroy@c-s.fr>,
	Cyril Bur <cyrilbur@gmail.com>,
	"Eric W . Biederman" <ebiederm@xmission.com>,
	Joe Perches <joe@perches.com>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Michael Neuling <mikey@neuling.org>,
	Murilo Opsfelder Araujo <muriloo@linux.ibm.com>,
	Nicholas Piggin <npiggin@gmail.com>,
	Paul Mackerras <paulus@samba.org>,
	Simon Guo <wei.guo.simon@gmail.com>,
	Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>,
	"Tobin C . Harding" <me@tobin.cc>,
	linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v3 2/9] powerpc/traps: Return early in show_signal_msg()
Date: Tue, 31 Jul 2018 11:50:13 -0300	[thread overview]
Message-ID: <20180731145020.14009-3-muriloo@linux.ibm.com> (raw)
In-Reply-To: <20180731145020.14009-1-muriloo@linux.ibm.com>

Modify the logic of show_signal_msg() to return early, if possible.
Replace printk_ratelimited() by printk() and a default rate limit burst to
limit displaying unhandled signals messages.

Mainly reason of this change is to improve readability of the function.
The conditions to display the message were coupled together in one single
`if` statement.

Splitting out the rate limit check outside show_signal_msg() makes it
easier to the caller decide if it wants to respect a printk rate limit or
not.

Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
---
 arch/powerpc/kernel/traps.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index cbd3dc365193..4faab4705774 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -301,6 +301,13 @@ void user_single_step_siginfo(struct task_struct *tsk,
 	info->si_addr = (void __user *)regs->nip;
 }
 
+static bool show_unhandled_signals_ratelimited(void)
+{
+	static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL,
+				      DEFAULT_RATELIMIT_BURST);
+	return show_unhandled_signals && __ratelimit(&rs);
+}
+
 static void show_signal_msg(int signr, struct pt_regs *regs, int code,
 			    unsigned long addr)
 {
@@ -309,11 +316,12 @@ static void show_signal_msg(int signr, struct pt_regs *regs, int code,
 	const char fmt64[] = KERN_INFO "%s[%d]: unhandled signal %d " \
 		"at %016lx nip %016lx lr %016lx code %x\n";
 
-	if (show_unhandled_signals && unhandled_signal(current, signr)) {
-		printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32,
-				   current->comm, current->pid, signr,
-				   addr, regs->nip, regs->link, code);
-	}
+	if (!unhandled_signal(current, signr))
+		return;
+
+	printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
+	       current->comm, current->pid, signr,
+	       addr, regs->nip, regs->link, code);
 }
 
 void _exception_pkey(int signr, struct pt_regs *regs, int code,
@@ -326,7 +334,8 @@ void _exception_pkey(int signr, struct pt_regs *regs, int code,
 		return;
 	}
 
-	show_signal_msg(signr, regs, code, addr);
+	if (show_unhandled_signals_ratelimited())
+		show_signal_msg(signr, regs, code, addr);
 
 	if (arch_irqs_disabled() && !arch_irq_disabled_regs(regs))
 		local_irq_enable();
-- 
2.17.1


  parent reply	other threads:[~2018-07-31 14:50 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-31 14:50 [PATCH v3 0/9] powerpc: Modernize unhandled signals message Murilo Opsfelder Araujo
2018-07-31 14:50 ` [PATCH v3 1/9] powerpc/traps: Print unhandled signals in a separate function Murilo Opsfelder Araujo
2018-07-31 14:50 ` Murilo Opsfelder Araujo [this message]
2018-07-31 14:50 ` [PATCH v3 3/9] powerpc/traps: Use %lx format in show_signal_msg() Murilo Opsfelder Araujo
2018-07-31 14:50 ` [PATCH v3 4/9] powerpc/traps: Print VMA for unhandled signals Murilo Opsfelder Araujo
2018-07-31 14:50 ` [PATCH v3 5/9] powerpc/traps: Print signal name " Murilo Opsfelder Araujo
2018-08-01  6:37   ` Christophe LEROY
2018-08-01  7:03     ` Joe Perches
2018-08-01  7:49       ` Segher Boessenkool
2018-08-01 14:44         ` Murilo Opsfelder Araujo
2018-08-01 14:42       ` Murilo Opsfelder Araujo
2018-07-31 14:50 ` [PATCH v3 6/9] powerpc: Do not call __kernel_text_address() in show_instructions() Murilo Opsfelder Araujo
2018-07-31 14:50 ` [PATCH v3 7/9] powerpc: Add stacktrace.h header Murilo Opsfelder Araujo
2018-07-31 14:50 ` [PATCH v3 8/9] powerpc/traps: Show instructions on exceptions Murilo Opsfelder Araujo
2018-07-31 14:50 ` [PATCH v3 9/9] powerpc/traps: Add line prefix in show_instructions() Murilo Opsfelder Araujo
2018-08-01  6:41   ` Christophe LEROY
2018-08-01 14:14     ` Michael Ellerman
2018-08-01 15:03     ` Murilo Opsfelder Araujo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180731145020.14009-3-muriloo@linux.ibm.com \
    --to=muriloo@linux.ibm.com \
    --cc=alastair@d-silva.org \
    --cc=andrew.donnellan@au1.ibm.com \
    --cc=benh@kernel.crashing.org \
    --cc=bsingharora@gmail.com \
    --cc=christophe.leroy@c-s.fr \
    --cc=cyrilbur@gmail.com \
    --cc=ebiederm@xmission.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=me@tobin.cc \
    --cc=mikey@neuling.org \
    --cc=mpe@ellerman.id.au \
    --cc=npiggin@gmail.com \
    --cc=paulus@samba.org \
    --cc=sukadev@linux.vnet.ibm.com \
    --cc=wei.guo.simon@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).