LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: tip-bot for Frederic Weisbecker <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: frederic@kernel.org, benh@kernel.crashing.org, deller@gmx.de,
	ysato@users.sourceforge.jp, peterz@infradead.org,
	torvalds@linux-foundation.org, fenghua.yu@intel.com,
	tony.luck@intel.com, mpe@ellerman.id.au,
	heiko.carstens@de.ibm.com, mingo@kernel.org, davem@davemloft.net,
	jejb@parisc-linux.org, linux-kernel@vger.kernel.org,
	hpa@zytor.com, schwidefsky@de.ibm.com, paulus@samba.org,
	dalias@libc.org, tglx@linutronix.de, bigeasy@linutronix.de
Subject: [tip:irq/core] softirq/core: Consolidate default local_softirq_pending() implementations
Date: Mon, 14 May 2018 05:49:23 -0700	[thread overview]
Message-ID: <tip-0fd7d86285290ccebc0dc6eb536b6b043dd6a1e4@git.kernel.org> (raw)
In-Reply-To: <1525786706-22846-6-git-send-email-frederic@kernel.org>

Commit-ID:  0fd7d86285290ccebc0dc6eb536b6b043dd6a1e4
Gitweb:     https://git.kernel.org/tip/0fd7d86285290ccebc0dc6eb536b6b043dd6a1e4
Author:     Frederic Weisbecker <frederic@kernel.org>
AuthorDate: Tue, 8 May 2018 15:38:20 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 14 May 2018 11:25:27 +0200

softirq/core: Consolidate default local_softirq_pending() implementations

Consolidate and optimize default softirq mask API implementations.
Per-CPU operations are expected to be faster and a few architectures
already rely on them to implement local_softirq_pending() and related
accessors/mutators. Those will be migrated to the new generic code.

Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/1525786706-22846-6-git-send-email-frederic@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 include/linux/interrupt.h   | 14 ++++++++++++++
 include/linux/irq_cpustat.h |  6 +-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5426627f9c55..7a11f73c5c3b 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -432,11 +432,25 @@ extern bool force_irqthreads;
 #define force_irqthreads	(0)
 #endif
 
+#ifndef local_softirq_pending
+
+#ifndef local_softirq_pending_ref
+#define local_softirq_pending_ref irq_stat.__softirq_pending
+#endif
+
+#define local_softirq_pending()	(__this_cpu_read(local_softirq_pending_ref))
+#define set_softirq_pending(x)	(__this_cpu_write(local_softirq_pending_ref, (x)))
+#define or_softirq_pending(x)	(__this_cpu_or(local_softirq_pending_ref, (x)))
+
+#else /* local_softirq_pending */
+
 #ifndef __ARCH_SET_SOFTIRQ_PENDING
 #define set_softirq_pending(x) (local_softirq_pending() = (x))
 #define or_softirq_pending(x)  (local_softirq_pending() |= (x))
 #endif
 
+#endif /* local_softirq_pending */
+
 /* Some architectures might implement lazy enabling/disabling of
  * interrupts. In some cases, such as stop_machine, we might want
  * to ensure that after a local_irq_disable(), interrupts have
diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h
index ddea03c7c39d..6e8895cd4d92 100644
--- a/include/linux/irq_cpustat.h
+++ b/include/linux/irq_cpustat.h
@@ -22,11 +22,7 @@ DECLARE_PER_CPU_ALIGNED(irq_cpustat_t, irq_stat);	/* defined in asm/hardirq.h */
 #define __IRQ_STAT(cpu, member)	(per_cpu(irq_stat.member, cpu))
 #endif
 
-  /* arch independent irq_stat fields */
-#define local_softirq_pending() \
-	__IRQ_STAT(smp_processor_id(), __softirq_pending)
-
-  /* arch dependent irq_stat fields */
+/* arch dependent irq_stat fields */
 #define nmi_count(cpu)		__IRQ_STAT((cpu), __nmi_count)	/* i386 */
 
 #endif	/* __irq_cpustat_h */

  reply	other threads:[~2018-05-14 12:50 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-08 13:38 [GIT PULL] Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 01/11] ia64: Convert local_softirq_pending() to per-cpu ops Frederic Weisbecker
2018-05-14 12:47   ` [tip:irq/core] softirq/ia64: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 02/11] sparc: Convert local_softirq_pending() to use per-cpu op Frederic Weisbecker
2018-05-14 12:47   ` [tip:irq/core] softirq/sparc: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 03/11] sh: Use nmi_count() on /proc/interrupts print out Frederic Weisbecker
2018-05-14 12:48   ` [tip:irq/core] softirq/sh: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 04/11] softirq: Turn default irq_cpustat_t to standard per-cpu Frederic Weisbecker
2018-05-14 12:48   ` [tip:irq/core] softirq/core: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 05/11] softirq: Consolidate default local_softirq_pending() implementations Frederic Weisbecker
2018-05-14 12:49   ` tip-bot for Frederic Weisbecker [this message]
2018-05-08 13:38 ` [PATCH 06/11] ia64: Switch to generic local_softirq_pending() implementation Frederic Weisbecker
2018-05-14 12:49   ` [tip:irq/core] softirq/ia64: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 07/11] parisc: " Frederic Weisbecker
2018-05-14 12:50   ` [tip:irq/core] softirq/parisc: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 08/11] powerpc: " Frederic Weisbecker
2018-05-14 12:50   ` [tip:irq/core] softirq/powerpc: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 09/11] sparc: " Frederic Weisbecker
2018-05-14 12:51   ` [tip:irq/core] softirq/sparc: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 10/11] x86: " Frederic Weisbecker
2018-05-14 12:51   ` [tip:irq/core] softirq/x86: " tip-bot for Frederic Weisbecker
2018-05-08 13:38 ` [PATCH 11/11] softirq/s390: Move default mutators of overwritten softirq mask to s390 Frederic Weisbecker
2018-05-14 12:52   ` [tip:irq/core] " tip-bot for Frederic Weisbecker
2018-05-08 13:46 ` [GIT PULL] softirq: Consolidate and optimize softirq mask v4 Frederic Weisbecker

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=tip-0fd7d86285290ccebc0dc6eb536b6b043dd6a1e4@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=benh@kernel.crashing.org \
    --cc=bigeasy@linutronix.de \
    --cc=dalias@libc.org \
    --cc=davem@davemloft.net \
    --cc=deller@gmx.de \
    --cc=fenghua.yu@intel.com \
    --cc=frederic@kernel.org \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hpa@zytor.com \
    --cc=jejb@parisc-linux.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    --cc=peterz@infradead.org \
    --cc=schwidefsky@de.ibm.com \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=torvalds@linux-foundation.org \
    --cc=ysato@users.sourceforge.jp \
    --subject='Re: [tip:irq/core] softirq/core: Consolidate default local_softirq_pending() implementations' \
    /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

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).