riscv: panic if IRQ handler stacks cannot be allocated
PATCH v2 1/1 riscv: panic if IRQ handler stacks cannot be allocated
init_irq_stacks() and init_irq_scs() may fail when arch_alloc_vmap_stack or scs_alloc return NULL, call panic() in this case.
---
v2:
- call panic() in place instead of return -ENOMEM
--- arch/riscv/kernel/irq.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
arch/riscv/kernel/irq.c +14 -8
@@ -75,28 +75,34 @@ DECLARE_PER_CPU(ulong *, irq_shadow_call_stack_ptr); DEFINE_PER_CPU(ulong *, irq_shadow_call_stack_ptr);#endif -static void init_irq_scs (void ) +static void __init init_irq_scs (void ) {int cpu; +void *s;if (!scs_is_enabled ())return ; -for_each_possible_cpu (cpu) -per_cpu (irq_shadow_call_stack_ptr, cpu) = -scs_alloc (cpu_to_node (cpu)); +for_each_possible_cpu (cpu) { + s =scs_alloc (cpu_to_node (cpu)); +if (!s) +panic ("Failed to allocate IRQ shadow call stack resources\n" ); +per_cpu (irq_shadow_call_stack_ptr, cpu) = s; + } } DEFINE_PER_CPU(ulong *, irq_stack_ptr);#ifdef CONFIG_VMAP_STACK -static void init_irq_stacks (void ) +static void __init init_irq_stacks (void ) {int cpu;ulong *p;for_each_possible_cpu (cpu) { p =arch_alloc_vmap_stack (IRQ_STACK_SIZE ,cpu_to_node (cpu)); +if (!p) +panic ("Failed to allocate IRQ stack resources\n" );per_cpu (irq_stack_ptr, cpu) = p; } }
@@ -104,7 +110,7 @@ static void init_irq_stacks(void)/* irq stack only needs to be 16 byte aligned - not IRQ_STACK_SIZE aligned. */ DEFINE_PER_CPU_ALIGNED (ulong [IRQ_STACK_SIZE /sizeof (ulong)], irq_stack); -static void init_irq_stacks (void ) +static void __init init_irq_stacks (void ) {int cpu;
@@ -129,8 +135,8 @@ void do_softirq_own_stack(void)#endif /* CONFIG_SOFTIRQ_ON_OWN_STACK */ #else -static void init_irq_scs (void ) {} -static void init_irq_stacks (void ) {} +static void __init init_irq_scs (void ) {} +static void __init init_irq_stacks (void ) {}#endif /* CONFIG_IRQ_STACKS */ int arch_show_interrupts (struct seq_file *p,int prec)
Signature · 1 line
2.43.0
Quoted 78 lines · Osama Abdelkader
init_irq_stacks()andinit_irq_scs()may fail whenarch_alloc_vmap_stackorscs_allocreturn NULL, callpanic()in this case.Signed-off-by Osama Abdelkader <[email protected]>---
v2:
- callpanic()in place instead of return-ENOMEM--- arch/riscv/kernel/irq.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)arch/riscv/kernel/irq.c +14
-8@@ -75,28 +75,34 @@ DECLARE_PER_CPU(ulong *, irq_shadow_call_stack_ptr); DEFINE_PER_CPU(ulong *, irq_shadow_call_stack_ptr);#endif -static void init_irq_scs (void ) +static void __init init_irq_scs (void ) {int cpu; +void *s;if (!scs_is_enabled ())return ; -for_each_possible_cpu (cpu) -per_cpu (irq_shadow_call_stack_ptr, cpu) = -scs_alloc (cpu_to_node (cpu)); +for_each_possible_cpu (cpu) { + s =scs_alloc (cpu_to_node (cpu)); +if (!s) +panic ("Failed to allocate IRQ shadow call stack resources\n" ); +per_cpu (irq_shadow_call_stack_ptr, cpu) = s; + } } DEFINE_PER_CPU(ulong *, irq_stack_ptr);#ifdef CONFIG_VMAP_STACK -static void init_irq_stacks (void ) +static void __init init_irq_stacks (void ) {int cpu;ulong *p;for_each_possible_cpu (cpu) { p =arch_alloc_vmap_stack (IRQ_STACK_SIZE ,cpu_to_node (cpu)); +if (!p) +panic ("Failed to allocate IRQ stack resources\n" );per_cpu (irq_stack_ptr, cpu) = p; } }@@ -104,7 +110,7 @@ static void init_irq_stacks(void)/* irq stack only needs to be 16 byte aligned - not IRQ_STACK_SIZE aligned. */ DEFINE_PER_CPU_ALIGNED (ulong [IRQ_STACK_SIZE /sizeof (ulong)], irq_stack); -static void init_irq_stacks (void ) +static void __init init_irq_stacks (void ) {int cpu;@@ -129,8 +135,8 @@ void do_softirq_own_stack(void)#endif /* CONFIG_SOFTIRQ_ON_OWN_STACK */ #else -static void init_irq_scs (void ) {} -static void init_irq_stacks (void ) {} +static void __init init_irq_scs (void ) {} +static void __init init_irq_stacks (void ) {}#endif /* CONFIG_IRQ_STACKS */ int arch_show_interrupts (struct seq_file *p,int prec)Signature · 1 line
2.43.0
Hi All,
Can you please review?
Best regards,
Osama
Quoted 78 lines · Osama Abdelkader
init_irq_stacks()andinit_irq_scs()may fail whenarch_alloc_vmap_stackorscs_allocreturn NULL, callpanic()in this case.Signed-off-by Osama Abdelkader <[email protected]>---
v2:
- callpanic()in place instead of return-ENOMEM--- arch/riscv/kernel/irq.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)arch/riscv/kernel/irq.c +14
-8@@ -75,28 +75,34 @@ DECLARE_PER_CPU(ulong *, irq_shadow_call_stack_ptr); DEFINE_PER_CPU(ulong *, irq_shadow_call_stack_ptr);#endif -static void init_irq_scs (void ) +static void __init init_irq_scs (void ) {int cpu; +void *s;if (!scs_is_enabled ())return ; -for_each_possible_cpu (cpu) -per_cpu (irq_shadow_call_stack_ptr, cpu) = -scs_alloc (cpu_to_node (cpu)); +for_each_possible_cpu (cpu) { + s =scs_alloc (cpu_to_node (cpu)); +if (!s) +panic ("Failed to allocate IRQ shadow call stack resources\n" ); +per_cpu (irq_shadow_call_stack_ptr, cpu) = s; + } } DEFINE_PER_CPU(ulong *, irq_stack_ptr);#ifdef CONFIG_VMAP_STACK -static void init_irq_stacks (void ) +static void __init init_irq_stacks (void ) {int cpu;ulong *p;for_each_possible_cpu (cpu) { p =arch_alloc_vmap_stack (IRQ_STACK_SIZE ,cpu_to_node (cpu)); +if (!p) +panic ("Failed to allocate IRQ stack resources\n" );per_cpu (irq_stack_ptr, cpu) = p; } }@@ -104,7 +110,7 @@ static void init_irq_stacks(void)/* irq stack only needs to be 16 byte aligned - not IRQ_STACK_SIZE aligned. */ DEFINE_PER_CPU_ALIGNED (ulong [IRQ_STACK_SIZE /sizeof (ulong)], irq_stack); -static void init_irq_stacks (void ) +static void __init init_irq_stacks (void ) {int cpu;@@ -129,8 +135,8 @@ void do_softirq_own_stack(void)#endif /* CONFIG_SOFTIRQ_ON_OWN_STACK */ #else -static void init_irq_scs (void ) {} -static void init_irq_stacks (void ) {} +static void __init init_irq_scs (void ) {} +static void __init init_irq_stacks (void ) {}#endif /* CONFIG_IRQ_STACKS */ int arch_show_interrupts (struct seq_file *p,int prec)Signature · 1 line
2.43.0
ping.
Paul Walmsley
maintainerQuoted 4 lines · Osama Abdelkader
init_irq_stacks()andinit_irq_scs()may fail whenarch_alloc_vmap_stackorscs_allocreturn NULL, callpanic()in this case.Signed-off-by Osama Abdelkader <[email protected]>
Thanks, queued for v7.2.
- Paul