lkml.org 
[lkml]   [2022]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 36/70] x86/xen: Add UNTRAIN_RET
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    commit d147553b64bad34d2f92cb7d8ba454ae95c3baac upstream.

    Ensure the Xen entry also passes through UNTRAIN_RET.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/entry/entry_64.S | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    --- a/arch/x86/entry/entry_64.S
    +++ b/arch/x86/entry/entry_64.S
    @@ -323,6 +323,12 @@ SYM_CODE_END(ret_from_fork)
    #endif
    .endm

    +SYM_CODE_START_LOCAL(xen_error_entry)
    + UNWIND_HINT_FUNC
    + UNTRAIN_RET
    + RET
    +SYM_CODE_END(xen_error_entry)
    +
    /**
    * idtentry_body - Macro to emit code calling the C function
    * @cfunc: C function to be called
    @@ -342,7 +348,7 @@ SYM_CODE_END(ret_from_fork)
    * switch the CR3. So it can skip invoking error_entry().
    */
    ALTERNATIVE "call error_entry; movq %rax, %rsp", \
    - "", X86_FEATURE_XENPV
    + "call xen_error_entry", X86_FEATURE_XENPV

    ENCODE_FRAME_POINTER
    UNWIND_HINT_REGS

    \
     
     \ /
      Last update: 2022-07-22 11:15    [W:4.127 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site