Merge tag 'asm-generic-fixes-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

torvalds · torvalds · commit f448dda895ed · 2022-09-09T07:23:29.000-04:00
Pull SOFTIRQ_ON_OWN_STACK rework from Arnd Bergmann: "Just one fixup patch, reworking the softirq_on_own_stack logic for preempt-rt kernels as discussed in https://lore.kernel.org/all/CAHk-=wgZSD3W2y6yczad2Am=EfHYyiPzTn3CfXxrriJf9i5W5w@mail.gmail.com/" * tag 'asm-generic-fixes-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: asm-generic: Conditionally enable do_softirq_own_stack() via Kconfig.
diff --git a/arch/Kconfig b/arch/Kconfig
@@ -923,6 +923,9 @@ config HAVE_SOFTIRQ_ON_OWN_STACK
 	  Architecture provides a function to run __do_softirq() on a
 	  separate stack.
 
+config SOFTIRQ_ON_OWN_STACK
+	def_bool HAVE_SOFTIRQ_ON_OWN_STACK && !PREEMPT_RT
+
 config ALTERNATE_USER_ADDRESS_SPACE
 	bool
 	help
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
@@ -70,7 +70,7 @@ static void __init init_irq_stacks(void)
 	}
 }
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 static void ____do_softirq(void *arg)
 {
 	__do_softirq();
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
@@ -480,7 +480,7 @@ static void execute_on_irq_stack(void *func, unsigned long param1)
 	*irq_stack_in_use = 1;
 }
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 void do_softirq_own_stack(void)
 {
 	execute_on_irq_stack(__do_softirq, 0);
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
@@ -199,7 +199,7 @@ static inline void check_stack_overflow(unsigned long sp)
 	}
 }
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 static __always_inline void call_do_softirq(const void *sp)
 {
 	/* Temporarily switch r1 to sp, call __do_softirq() then restore r1. */
@@ -335,7 +335,7 @@ void *mcheckirq_ctx[NR_CPUS] __read_mostly;
 void *softirq_ctx[NR_CPUS] __read_mostly;
 void *hardirq_ctx[NR_CPUS] __read_mostly;
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 void do_softirq_own_stack(void)
 {
 	call_do_softirq(softirq_ctx[smp_processor_id()]);
diff --git a/arch/s390/include/asm/softirq_stack.h b/arch/s390/include/asm/softirq_stack.h
@@ -5,7 +5,7 @@
 #include <asm/lowcore.h>
 #include <asm/stacktrace.h>
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 static inline void do_softirq_own_stack(void)
 {
 	call_on_stack(0, S390_lowcore.async_stack, void, __do_softirq);
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
@@ -149,7 +149,7 @@ void irq_ctx_exit(int cpu)
 	hardirq_ctx[cpu] = NULL;
 }
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 void do_softirq_own_stack(void)
 {
 	struct thread_info *curctx;
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
@@ -855,7 +855,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs)
 	set_irq_regs(old_regs);
 }
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 void do_softirq_own_stack(void)
 {
 	void *orig_sp, *sp = softirq_stack[smp_processor_id()];
diff --git a/arch/x86/include/asm/irq_stack.h b/arch/x86/include/asm/irq_stack.h
@@ -203,7 +203,7 @@
 			      IRQ_CONSTRAINTS, regs, vector);		\
 }
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 /*
  * Macro to invoke __do_softirq on the irq stack. This is only called from
  * task context when bottom halves are about to be reenabled and soft
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
@@ -132,7 +132,7 @@ int irq_init_percpu_irqstack(unsigned int cpu)
 	return 0;
 }
 
-#ifndef CONFIG_PREEMPT_RT
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 void do_softirq_own_stack(void)
 {
 	struct irq_stack *irqstk;
diff --git a/include/asm-generic/softirq_stack.h b/include/asm-generic/softirq_stack.h
@@ -2,7 +2,7 @@
 #ifndef __ASM_GENERIC_SOFTIRQ_STACK_H
 #define __ASM_GENERIC_SOFTIRQ_STACK_H
 
-#if defined(CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK) && !defined(CONFIG_PREEMPT_RT)
+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
 void do_softirq_own_stack(void);
 #else
 static inline void do_softirq_own_stack(void)

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ static void __init init_irq_stacks(void)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`-#ifndef CONFIG_PREEMPT_RT`
	`73`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`74`	`74`	`static void ____do_softirq(void *arg)`
`75`	`75`	`{`
`76`	`76`	`__do_softirq();`
Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ static void execute_on_irq_stack(void *func, unsigned long param1)`
`480`	`480`	`*irq_stack_in_use = 1;`
`481`	`481`	`}`
`482`	`482`
`483`		`-#ifndef CONFIG_PREEMPT_RT`
	`483`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`484`	`484`	`void do_softirq_own_stack(void)`
`485`	`485`	`{`
`486`	`486`	`execute_on_irq_stack(__do_softirq, 0);`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ static inline void check_stack_overflow(unsigned long sp)`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`		`-#ifndef CONFIG_PREEMPT_RT`
	`202`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`203`	`203`	`static __always_inline void call_do_softirq(const void *sp)`
`204`	`204`	`{`
`205`	`205`	`/* Temporarily switch r1 to sp, call __do_softirq() then restore r1. */`
`@@ -335,7 +335,7 @@ void *mcheckirq_ctx[NR_CPUS] __read_mostly;`
`335`	`335`	`void *softirq_ctx[NR_CPUS] __read_mostly;`
`336`	`336`	`void *hardirq_ctx[NR_CPUS] __read_mostly;`
`337`	`337`
`338`		`-#ifndef CONFIG_PREEMPT_RT`
	`338`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`339`	`339`	`void do_softirq_own_stack(void)`
`340`	`340`	`{`
`341`	`341`	`call_do_softirq(softirq_ctx[smp_processor_id()]);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <asm/lowcore.h>`
`6`	`6`	`#include <asm/stacktrace.h>`
`7`	`7`
`8`		`-#ifndef CONFIG_PREEMPT_RT`
	`8`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`9`	`9`	`static inline void do_softirq_own_stack(void)`
`10`	`10`	`{`
`11`	`11`	`call_on_stack(0, S390_lowcore.async_stack, void, __do_softirq);`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ void irq_ctx_exit(int cpu)`
`149`	`149`	`hardirq_ctx[cpu] = NULL;`
`150`	`150`	`}`
`151`	`151`
`152`		`-#ifndef CONFIG_PREEMPT_RT`
	`152`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`153`	`153`	`void do_softirq_own_stack(void)`
`154`	`154`	`{`
`155`	`155`	`struct thread_info *curctx;`
Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs)`
`855`	`855`	`set_irq_regs(old_regs);`
`856`	`856`	`}`
`857`	`857`
`858`		`-#ifndef CONFIG_PREEMPT_RT`
	`858`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`859`	`859`	`void do_softirq_own_stack(void)`
`860`	`860`	`{`
`861`	`861`	`void orig_sp, sp = softirq_stack[smp_processor_id()];`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@`
`203`	`203`	`IRQ_CONSTRAINTS, regs, vector); \`
`204`	`204`	`}`
`205`	`205`
`206`		`-#ifndef CONFIG_PREEMPT_RT`
	`206`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`207`	`207`	`/*`
`208`	`208`	`* Macro to invoke __do_softirq on the irq stack. This is only called from`
`209`	`209`	`* task context when bottom halves are about to be reenabled and soft`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ int irq_init_percpu_irqstack(unsigned int cpu)`
`132`	`132`	`return 0;`
`133`	`133`	`}`
`134`	`134`
`135`		`-#ifndef CONFIG_PREEMPT_RT`
	`135`	`+#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK`
`136`	`136`	`void do_softirq_own_stack(void)`
`137`	`137`	`{`
`138`	`138`	`struct irq_stack *irqstk;`