From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
To: Thomas Gleixner <tglx@linutronix.de>,
LKML <linux-kernel@vger.kernel.org>
Cc: Marc Zyngier <maz@kernel.org>, Rich Felker <dalias@libc.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Paul McKenney <paulmck@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
linux-sh@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>,
Richard Weinberger <richard@nod.at>,
Frederic Weisbecker <frederic@kernel.org>,
Valentin Schneider <valentin.schneider@arm.com>,
Jeff Dike <jdike@addtoit.com>,
Russell King <linux@armlinux.org.uk>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
linux-parisc@vger.kernel.org, Helge Deller <deller@gmx.de>,
linux-um@lists.infradead.org, Will Deacon <will@kernel.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Anton Ivanov <anton.ivanov@cambridgegreys.com>
Subject: Re: [patch 02/19] sh: Get rid of nmi_count()
Date: Fri, 1 Jan 2021 15:27:57 +0100 [thread overview]
Message-ID: <b9275f62-45c2-2472-2c1d-00706c757a30@physik.fu-berlin.de> (raw)
In-Reply-To: <20201113141732.844232404@linutronix.de>
Hello Thomas!
On 11/13/20 3:02 PM, Thomas Gleixner wrote:
> nmi_count() is a historical leftover and SH is the only user. Replace it
> with regular per cpu accessors.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: linux-sh@vger.kernel.org
> ---
> arch/sh/kernel/irq.c | 2 +-
> arch/sh/kernel/traps.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- a/arch/sh/kernel/irq.c
> +++ b/arch/sh/kernel/irq.c
> @@ -44,7 +44,7 @@ int arch_show_interrupts(struct seq_file
>
> seq_printf(p, "%*s: ", prec, "NMI");
> for_each_online_cpu(j)
> - seq_printf(p, "%10u ", nmi_count(j));
> + seq_printf(p, "%10u ", per_cpu(irq_stat.__nmi_count, j);
> seq_printf(p, " Non-maskable interrupts\n");
>
> seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
> --- a/arch/sh/kernel/traps.c
> +++ b/arch/sh/kernel/traps.c
> @@ -186,7 +186,7 @@ BUILD_TRAP_HANDLER(nmi)
> arch_ftrace_nmi_enter();
>
> nmi_enter();
> - nmi_count(cpu)++;
> + this_cpu_inc(irq_stat.__nmi_count);
>
> switch (notify_die(DIE_NMI, "NMI", regs, 0, vec & 0xff, SIGINT)) {
> case NOTIFY_OK:
>
Just booted my SH7785LCR board with a kernel based on Linus' latest tree
and can confirm that this change does not cause any regressions.
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-01 14:30 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 14:02 [patch 00/19] softirq: Cleanups and RT awareness Thomas Gleixner
2020-11-13 14:02 ` [patch 01/19] parisc: Remove bogus __IRQ_STAT macro Thomas Gleixner
2020-11-13 14:02 ` [patch 02/19] sh: Get rid of nmi_count() Thomas Gleixner
2021-01-01 14:27 ` John Paul Adrian Glaubitz [this message]
2020-11-13 14:02 ` [patch 03/19] irqstat: Get rid of nmi_count() and __IRQ_STAT() Thomas Gleixner
2020-11-13 14:02 ` [patch 04/19] um/irqstat: Get rid of the duplicated declarations Thomas Gleixner
2020-11-13 14:02 ` [patch 05/19] ARM: irqstat: Get rid of duplicated declaration Thomas Gleixner
2020-11-16 18:19 ` Valentin Schneider
2020-11-13 14:02 ` [patch 06/19] arm64: " Thomas Gleixner
2020-11-16 10:01 ` Will Deacon
2020-11-16 10:51 ` Marc Zyngier
2020-11-13 14:02 ` [patch 07/19] asm-generic/irqstat: Add optional __nmi_count member Thomas Gleixner
2020-11-13 14:02 ` [patch 08/19] sh: irqstat: Use the generic irq_cpustat_t Thomas Gleixner
2020-11-13 14:02 ` [patch 09/19] irqstat: Move declaration into asm-generic/hardirq.h Thomas Gleixner
2020-11-13 14:02 ` [patch 10/19] preempt: Cleanup the macro maze a bit Thomas Gleixner
2020-11-16 12:17 ` Peter Zijlstra
2020-11-16 17:42 ` Thomas Gleixner
2020-11-17 10:21 ` Peter Zijlstra
2020-11-13 14:02 ` [patch 11/19] softirq: Move related code into one section Thomas Gleixner
2020-11-19 12:20 ` Frederic Weisbecker
2020-11-13 14:02 ` [patch 12/19] softirq: Add RT specific softirq accounting Thomas Gleixner
2020-11-19 12:18 ` Frederic Weisbecker
2020-11-19 18:34 ` Thomas Gleixner
2020-11-19 22:52 ` Frederic Weisbecker
2020-11-13 14:02 ` [patch 13/19] softirq: Move various protections into inline helpers Thomas Gleixner
2020-11-13 14:02 ` [patch 14/19] softirq: Make softirq control and processing RT aware Thomas Gleixner
2020-11-20 0:26 ` Frederic Weisbecker
2020-11-20 13:27 ` Thomas Gleixner
2020-11-23 13:44 ` Frederic Weisbecker
2020-11-23 19:27 ` Thomas Gleixner
2020-11-23 19:56 ` Frederic Weisbecker
2020-11-23 23:58 ` Frederic Weisbecker
2020-11-24 0:06 ` Thomas Gleixner
2020-11-24 0:13 ` Frederic Weisbecker
2020-11-24 0:22 ` Thomas Gleixner
2020-11-13 14:02 ` [patch 15/19] tick/sched: Prevent false positive softirq pending warnings on RT Thomas Gleixner
2020-11-13 14:02 ` [patch 16/19] rcu: Prevent false positive softirq warning " Thomas Gleixner
2020-11-13 14:02 ` [patch 17/19] softirq: Replace barrier() with cpu_relax() in tasklet_unlock_wait() Thomas Gleixner
2020-11-13 14:02 ` [patch 18/19] tasklets: Use static inlines for stub implementations Thomas Gleixner
2020-11-13 14:02 ` [patch 19/19] tasklets: Prevent kill/unlock_wait deadlock on RT Thomas Gleixner
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=b9275f62-45c2-2472-2c1d-00706c757a30@physik.fu-berlin.de \
--to=glaubitz@physik.fu-berlin.de \
--cc=James.Bottomley@HansenPartnership.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=arnd@arndb.de \
--cc=bigeasy@linutronix.de \
--cc=catalin.marinas@arm.com \
--cc=dalias@libc.org \
--cc=deller@gmx.de \
--cc=frederic@kernel.org \
--cc=jdike@addtoit.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=maz@kernel.org \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=richard@nod.at \
--cc=tglx@linutronix.de \
--cc=valentin.schneider@arm.com \
--cc=will@kernel.org \
--cc=ysato@users.sourceforge.jp \
/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).