lkml.org 
[lkml]   [2018]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/11] x86/retpoline/irq32: Convert assembler indirect jumps
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Convert all indirect jumps in 32bit irq inline asm code to use
    non speculative sequences.

    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    arch/x86/kernel/irq_32.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
    index a83b3346a0e1..2dce2fdd2c4e 100644
    --- a/arch/x86/kernel/irq_32.c
    +++ b/arch/x86/kernel/irq_32.c
    @@ -20,6 +20,7 @@
    #include <linux/mm.h>

    #include <asm/apic.h>
    +#include <asm/jump-asm.h>

    #ifdef CONFIG_DEBUG_STACKOVERFLOW

    @@ -55,7 +56,7 @@ DEFINE_PER_CPU(struct irq_stack *, softirq_stack);
    static void call_on_stack(void *func, void *stack)
    {
    asm volatile("xchgl %%ebx,%%esp \n"
    - "call *%%edi \n"
    + NOSPEC_CALL("%%edi")
    "movl %%ebx,%%esp \n"
    : "=b" (stack)
    : "0" (stack),
    @@ -95,7 +96,7 @@ static inline int execute_on_irq_stack(int overflow, struct irq_desc *desc)
    call_on_stack(print_stack_overflow, isp);

    asm volatile("xchgl %%ebx,%%esp \n"
    - "call *%%edi \n"
    + NOSPEC_CALL("%%edi")
    "movl %%ebx,%%esp \n"
    : "=a" (arg1), "=b" (isp)
    : "0" (desc), "1" (isp),
    --
    2.14.3
    \
     
     \ /
      Last update: 2018-01-04 00:12    [W:2.995 / U:0.240 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site