lkml.org 
[lkml]   [2020]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/entry] x86/idtentry: Provide IDTRENTRY_NOIST variants for #DB and #MC
    The following commit has been merged into the x86/entry branch of tip:

    Commit-ID: 97f4e8b75a99efc7376b6c7b5bc2a3124f609bc1
    Gitweb: https://git.kernel.org/tip/97f4e8b75a99efc7376b6c7b5bc2a3124f609bc1
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Tue, 25 Feb 2020 23:33:28 +01:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Tue, 19 May 2020 16:04:12 +02:00

    x86/idtentry: Provide IDTRENTRY_NOIST variants for #DB and #MC

    Provide NOIST entry point macros which allows to implement NOIST variants
    of the C entry points. These are invoked when #DB or #MC enter from user
    space. This allows explicit handling of the difference between user mode
    and kernel mode entry later.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
    Acked-by: Peter Zijlstra <peterz@infradead.org>
    Acked-by: Andy Lutomirski <luto@kernel.org>
    Link: https://lkml.kernel.org/r/20200505135315.084882104@linutronix.de


    ---
    arch/x86/include/asm/idtentry.h | 19 +++++++++++++++++--
    1 file changed, 17 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/include/asm/idtentry.h b/arch/x86/include/asm/idtentry.h
    index fcd4230..060f9e3 100644
    --- a/arch/x86/include/asm/idtentry.h
    +++ b/arch/x86/include/asm/idtentry.h
    @@ -138,10 +138,12 @@ __visible noinstr void func(struct pt_regs *regs)
    * @vector: Vector number (ignored for C)
    * @func: Function name of the entry point
    *
    - * Maps to DECLARE_IDTENTRY_RAW
    + * Maps to DECLARE_IDTENTRY_RAW, but declares also the NOIST C handler
    + * which is called from the ASM entry point on user mode entry
    */
    #define DECLARE_IDTENTRY_IST(vector, func) \
    - DECLARE_IDTENTRY_RAW(vector, func)
    + DECLARE_IDTENTRY_RAW(vector, func); \
    + __visible void noist_##func(struct pt_regs *regs)

    /**
    * DEFINE_IDTENTRY_IST - Emit code for IST entry points
    @@ -152,6 +154,17 @@ __visible noinstr void func(struct pt_regs *regs)
    #define DEFINE_IDTENTRY_IST(func) \
    DEFINE_IDTENTRY_RAW(func)

    +/**
    + * DEFINE_IDTENTRY_NOIST - Emit code for NOIST entry points which
    + * belong to a IST entry point (MCE, DB)
    + * @func: Function name of the entry point. Must be the same as
    + * the function name of the corresponding IST variant
    + *
    + * Maps to DEFINE_IDTENTRY_RAW().
    + */
    +#define DEFINE_IDTENTRY_NOIST(func) \
    + DEFINE_IDTENTRY_RAW(noist_##func)
    +
    #else /* CONFIG_X86_64 */
    /* Maps to a regular IDTENTRY on 32bit for now */
    # define DECLARE_IDTENTRY_IST DECLARE_IDTENTRY
    @@ -161,12 +174,14 @@ __visible noinstr void func(struct pt_regs *regs)
    /* C-Code mapping */
    #define DECLARE_IDTENTRY_MCE DECLARE_IDTENTRY_IST
    #define DEFINE_IDTENTRY_MCE DEFINE_IDTENTRY_IST
    +#define DEFINE_IDTENTRY_MCE_USER DEFINE_IDTENTRY_NOIST

    #define DECLARE_IDTENTRY_NMI DECLARE_IDTENTRY_IST
    #define DEFINE_IDTENTRY_NMI DEFINE_IDTENTRY_IST

    #define DECLARE_IDTENTRY_DEBUG DECLARE_IDTENTRY_IST
    #define DEFINE_IDTENTRY_DEBUG DEFINE_IDTENTRY_IST
    +#define DEFINE_IDTENTRY_DEBUG_USER DEFINE_IDTENTRY_NOIST

    /**
    * DECLARE_IDTENTRY_XEN - Declare functions for XEN redirect IDT entry points
    \
     
     \ /
      Last update: 2020-05-19 22:03    [W:5.525 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site