lkml.org 
[lkml]   [2021]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 017/110] x86/xen: Fix noinstr fail in exc_xen_unknown_trap()
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    [ Upstream commit 4c9c26f1e67648f41f28f8c997c5c9467a3dbbe4 ]

    Fix:

    vmlinux.o: warning: objtool: exc_xen_unknown_trap()+0x7: call to printk() leaves .noinstr.text section

    Fixes: 2e92493637a0 ("x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled")
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Link: https://lore.kernel.org/r/20210621120120.606560778@infradead.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/xen/enlighten_pv.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
    index 8183ddb3700c..64db5852432e 100644
    --- a/arch/x86/xen/enlighten_pv.c
    +++ b/arch/x86/xen/enlighten_pv.c
    @@ -592,8 +592,10 @@ DEFINE_IDTENTRY_RAW(xenpv_exc_debug)
    DEFINE_IDTENTRY_RAW(exc_xen_unknown_trap)
    {
    /* This should never happen and there is no way to handle it. */
    + instrumentation_begin();
    pr_err("Unknown trap in Xen PV mode.");
    BUG();
    + instrumentation_end();
    }

    #ifdef CONFIG_X86_MCE
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-06-28 16:19    [W:4.119 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site