* [PATCH 01/10] ia64: Convert local_softirq_pending() to per-cpu ops
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 02/10] sparc: Convert local_softirq_pending() to use per-cpu op Frederic Weisbecker
` (8 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
In order to consolidate and optimize generic softirq mask accesses, we
first need to convert architectures to use per-cpu operations when
possible.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/ia64/include/asm/hardirq.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/ia64/include/asm/hardirq.h b/arch/ia64/include/asm/hardirq.h
index bdc4669..22fae71 100644
--- a/arch/ia64/include/asm/hardirq.h
+++ b/arch/ia64/include/asm/hardirq.h
@@ -13,7 +13,7 @@
#define __ARCH_IRQ_STAT 1
-#define local_softirq_pending() (local_cpu_data->softirq_pending)
+#define local_softirq_pending() (*this_cpu_ptr(&ia64_cpu_info.softirq_pending))
#include <linux/threads.h>
#include <linux/irq.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 02/10] sparc: Convert local_softirq_pending() to use per-cpu op
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 01/10] ia64: Convert local_softirq_pending() to per-cpu ops Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 03/10] softirq: Turn default irq_cpustat_t to standard per-cpu Frederic Weisbecker
` (7 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
In order to consolidate and optimize generic softirq mask accesses, we
first need to convert architectures to use per-cpu operations when
possible.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/sparc/include/asm/hardirq_64.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/sparc/include/asm/hardirq_64.h b/arch/sparc/include/asm/hardirq_64.h
index f565402..6aba904 100644
--- a/arch/sparc/include/asm/hardirq_64.h
+++ b/arch/sparc/include/asm/hardirq_64.h
@@ -11,7 +11,7 @@
#define __ARCH_IRQ_STAT
#define local_softirq_pending() \
- (local_cpu_data().__softirq_pending)
+ (*this_cpu_ptr(&__cpu_data.__softirq_pending))
void ack_bad_irq(unsigned int irq);
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 03/10] softirq: Turn default irq_cpustat_t to standard per-cpu
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 01/10] ia64: Convert local_softirq_pending() to per-cpu ops Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 02/10] sparc: Convert local_softirq_pending() to use per-cpu op Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 04/10] softirq: Consolidate default local_softirq_pending() implementations Frederic Weisbecker
` (6 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
In order to optimize and consolidate softirq mask accesses, let's
convert the default irq_cpustat_t implementation to per-CPU standard API.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
include/linux/irq_cpustat.h | 4 ++--
kernel/softirq.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h
index 4954948..ddea03c 100644
--- a/include/linux/irq_cpustat.h
+++ b/include/linux/irq_cpustat.h
@@ -18,8 +18,8 @@
*/
#ifndef __ARCH_IRQ_STAT
-extern irq_cpustat_t irq_stat[]; /* defined in asm/hardirq.h */
-#define __IRQ_STAT(cpu, member) (irq_stat[cpu].member)
+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 */
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 177de36..c5fafd7 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -49,8 +49,8 @@
*/
#ifndef __ARCH_IRQ_STAT
-irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
-EXPORT_SYMBOL(irq_stat);
+DEFINE_PER_CPU_ALIGNED(irq_cpustat_t, irq_stat);
+EXPORT_PER_CPU_SYMBOL(irq_stat);
#endif
static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 04/10] softirq: Consolidate default local_softirq_pending() implementations
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
` (2 preceding siblings ...)
2018-04-24 14:09 ` [PATCH 03/10] softirq: Turn default irq_cpustat_t to standard per-cpu Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 05/10] ia64: Switch to generic local_softirq_pending() implementation Frederic Weisbecker
` (5 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
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>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
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 5426627..7a11f73 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 ddea03c..6e8895c 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 */
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 05/10] ia64: Switch to generic local_softirq_pending() implementation
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
` (3 preceding siblings ...)
2018-04-24 14:09 ` [PATCH 04/10] softirq: Consolidate default local_softirq_pending() implementations Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 06/10] parisc: " Frederic Weisbecker
` (4 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
Benefit from the generic softirq mask implementation that rely on per-CPU
mutators instead of working with raw operators on top of this_cpu_ptr().
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/ia64/include/asm/hardirq.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/ia64/include/asm/hardirq.h b/arch/ia64/include/asm/hardirq.h
index 22fae71..ccde7c2 100644
--- a/arch/ia64/include/asm/hardirq.h
+++ b/arch/ia64/include/asm/hardirq.h
@@ -13,7 +13,7 @@
#define __ARCH_IRQ_STAT 1
-#define local_softirq_pending() (*this_cpu_ptr(&ia64_cpu_info.softirq_pending))
+#define local_softirq_pending_ref ia64_cpu_info.softirq_pending
#include <linux/threads.h>
#include <linux/irq.h>
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 06/10] parisc: Switch to generic local_softirq_pending() implementation
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
` (4 preceding siblings ...)
2018-04-24 14:09 ` [PATCH 05/10] ia64: Switch to generic local_softirq_pending() implementation Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 07/10] powerpc: " Frederic Weisbecker
` (3 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
Remove the ad-hoc implementation, the generic code now allows us not to
reinvent the wheel.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/parisc/include/asm/hardirq.h | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/parisc/include/asm/hardirq.h b/arch/parisc/include/asm/hardirq.h
index 0778151..1a1235a 100644
--- a/arch/parisc/include/asm/hardirq.h
+++ b/arch/parisc/include/asm/hardirq.h
@@ -34,14 +34,6 @@ DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
#define __IRQ_STAT(cpu, member) (irq_stat[cpu].member)
#define inc_irq_stat(member) this_cpu_inc(irq_stat.member)
#define __inc_irq_stat(member) __this_cpu_inc(irq_stat.member)
-#define local_softirq_pending() this_cpu_read(irq_stat.__softirq_pending)
-
-#define __ARCH_SET_SOFTIRQ_PENDING
-
-#define set_softirq_pending(x) \
- this_cpu_write(irq_stat.__softirq_pending, (x))
-#define or_softirq_pending(x) this_cpu_or(irq_stat.__softirq_pending, (x))
-
#define ack_bad_irq(irq) WARN(1, "unexpected IRQ trap at vector %02x\n", irq)
#endif /* _PARISC_HARDIRQ_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 07/10] powerpc: Switch to generic local_softirq_pending() implementation
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
` (5 preceding siblings ...)
2018-04-24 14:09 ` [PATCH 06/10] parisc: " Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 08/10] sparc: " Frederic Weisbecker
` (2 subsequent siblings)
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
Remove the ad-hoc implementation, the generic code now allows us not to
reinvent the wheel.
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/powerpc/include/asm/hardirq.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/powerpc/include/asm/hardirq.h b/arch/powerpc/include/asm/hardirq.h
index 5986d47..383f628 100644
--- a/arch/powerpc/include/asm/hardirq.h
+++ b/arch/powerpc/include/asm/hardirq.h
@@ -25,15 +25,8 @@ typedef struct {
DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
#define __ARCH_IRQ_STAT
-
-#define local_softirq_pending() __this_cpu_read(irq_stat.__softirq_pending)
-
-#define __ARCH_SET_SOFTIRQ_PENDING
#define __ARCH_IRQ_EXIT_IRQS_DISABLED
-#define set_softirq_pending(x) __this_cpu_write(irq_stat.__softirq_pending, (x))
-#define or_softirq_pending(x) __this_cpu_or(irq_stat.__softirq_pending, (x))
-
static inline void ack_bad_irq(unsigned int irq)
{
printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 08/10] sparc: Switch to generic local_softirq_pending() implementation
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
` (6 preceding siblings ...)
2018-04-24 14:09 ` [PATCH 07/10] powerpc: " Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 09/10] x86: " Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 10/10] softirq/s390: Move default mutators of overwritten softirq mask to s390 Frederic Weisbecker
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
Benefit from the generic softirq mask implementation that rely on per-CPU
mutators instead of working with raw operators on top of this_cpu_ptr().
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/sparc/include/asm/hardirq_64.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/include/asm/hardirq_64.h b/arch/sparc/include/asm/hardirq_64.h
index 6aba904..75b92bf 100644
--- a/arch/sparc/include/asm/hardirq_64.h
+++ b/arch/sparc/include/asm/hardirq_64.h
@@ -10,8 +10,9 @@
#include <asm/cpudata.h>
#define __ARCH_IRQ_STAT
-#define local_softirq_pending() \
- (*this_cpu_ptr(&__cpu_data.__softirq_pending))
+
+#define local_softirq_pending_ref \
+ __cpu_data.__softirq_pending
void ack_bad_irq(unsigned int irq);
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 09/10] x86: Switch to generic local_softirq_pending() implementation
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
` (7 preceding siblings ...)
2018-04-24 14:09 ` [PATCH 08/10] sparc: " Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
2018-04-24 14:09 ` [PATCH 10/10] softirq/s390: Move default mutators of overwritten softirq mask to s390 Frederic Weisbecker
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
Remove the ad-hoc implementation, the generic code now allows us not to
reinvent the wheel.
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/x86/include/asm/hardirq.h | 8 --------
1 file changed, 8 deletions(-)
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index 5ea2afd..740a428a 100644
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -50,14 +50,6 @@ DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
#define inc_irq_stat(member) this_cpu_inc(irq_stat.member)
-#define local_softirq_pending() this_cpu_read(irq_stat.__softirq_pending)
-
-#define __ARCH_SET_SOFTIRQ_PENDING
-
-#define set_softirq_pending(x) \
- this_cpu_write(irq_stat.__softirq_pending, (x))
-#define or_softirq_pending(x) this_cpu_or(irq_stat.__softirq_pending, (x))
-
extern void ack_bad_irq(unsigned int irq);
extern u64 arch_irq_stat_cpu(unsigned int cpu);
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 10/10] softirq/s390: Move default mutators of overwritten softirq mask to s390
2018-04-24 14:09 [GIT PULL] softirq: Consolidate and optimize softirq mask v3 Frederic Weisbecker
` (8 preceding siblings ...)
2018-04-24 14:09 ` [PATCH 09/10] x86: " Frederic Weisbecker
@ 2018-04-24 14:09 ` Frederic Weisbecker
9 siblings, 0 replies; 13+ messages in thread
From: Frederic Weisbecker @ 2018-04-24 14:09 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar
Cc: LKML, Frederic Weisbecker, Sebastian Andrzej Siewior, Tony Luck,
Peter Zijlstra, David S . Miller, Michael Ellerman, Helge Deller,
Benjamin Herrenschmidt, Paul Mackerras, Martin Schwidefsky,
Fenghua Yu, Heiko Carstens, James E . J . Bottomley
s390 is now the last architecture that entirely overwrites
local_softirq_pending() and uses the according default definitions of
set_softirq_pending() and or_softirq_pending().
Just move these to s390 to debloat the generic code complexity.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
---
arch/s390/include/asm/hardirq.h | 2 ++
include/linux/interrupt.h | 7 -------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index a296c6a..dfbc3c6c0 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -14,6 +14,8 @@
#include <asm/lowcore.h>
#define local_softirq_pending() (S390_lowcore.softirq_pending)
+#define set_softirq_pending(x) (S390_lowcore.softirq_pending = (x))
+#define or_softirq_pending(x) (S390_lowcore.softirq_pending |= (x))
#define __ARCH_IRQ_STAT
#define __ARCH_HAS_DO_SOFTIRQ
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 7a11f73..eeceac3 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -442,13 +442,6 @@ extern bool force_irqthreads;
#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
--
2.7.4
^ permalink raw reply related [flat|nested] 13+ messages in thread