]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
powerpc/32: Use vmapped stacks for interrupts
authorChristophe Leroy <christophe.leroy@c-s.fr>
Sat, 21 Dec 2019 08:32:30 +0000 (08:32 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 27 Jan 2020 11:36:15 +0000 (22:36 +1100)
In order to also catch overflows on IRQ stacks, use vmapped stacks.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/d33ad1b36ddff4dcc19f96c592c12a61cf85d406.1576916812.git.christophe.leroy@c-s.fr
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/setup_32.c

index add67498c126bffdc8050f804bed16fa97efd8e4..5c9b11878555afef75bfb81d61809a13b2f2c61f 100644 (file)
@@ -50,6 +50,7 @@
 #include <linux/debugfs.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
+#include <linux/vmalloc.h>
 
 #include <linux/uaccess.h>
 #include <asm/io.h>
@@ -664,8 +665,29 @@ void do_IRQ(struct pt_regs *regs)
        set_irq_regs(old_regs);
 }
 
+static void *__init alloc_vm_stack(void)
+{
+       return __vmalloc_node_range(THREAD_SIZE, THREAD_ALIGN, VMALLOC_START,
+                                   VMALLOC_END, THREADINFO_GFP, PAGE_KERNEL,
+                                    0, NUMA_NO_NODE, (void*)_RET_IP_);
+}
+
+static void __init vmap_irqstack_init(void)
+{
+       int i;
+
+       for_each_possible_cpu(i) {
+               softirq_ctx[i] = alloc_vm_stack();
+               hardirq_ctx[i] = alloc_vm_stack();
+       }
+}
+
+
 void __init init_IRQ(void)
 {
+       if (IS_ENABLED(CONFIG_VMAP_STACK))
+               vmap_irqstack_init();
+
        if (ppc_md.init_IRQ)
                ppc_md.init_IRQ();
 }
index a55b4d9ab824b8e943793c5c77207a18a667968f..5b49b26eb154196ac65e0c86617396be208a4728 100644 (file)
@@ -153,6 +153,9 @@ void __init irqstack_early_init(void)
 {
        unsigned int i;
 
+       if (IS_ENABLED(CONFIG_VMAP_STACK))
+               return;
+
        /* interrupt stacks must be in lowmem, we get that for free on ppc32
         * as the memblock is limited to lowmem by default */
        for_each_possible_cpu(i) {