lkml.org 
[lkml]   [2022]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 20/44] cpuidle,intel_idle: Fix CPUIDLE_FLAG_IBRS
    vmlinux.o: warning: objtool: intel_idle_ibrs+0x17: call to spec_ctrl_current() leaves .noinstr.text section
    vmlinux.o: warning: objtool: intel_idle_ibrs+0x27: call to wrmsrl.constprop.0() leaves .noinstr.text section

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    ---
    arch/x86/kernel/cpu/bugs.c | 2 +-
    drivers/idle/intel_idle.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/x86/kernel/cpu/bugs.c
    +++ b/arch/x86/kernel/cpu/bugs.c
    @@ -79,7 +79,7 @@ void write_spec_ctrl_current(u64 val, bo
    wrmsrl(MSR_IA32_SPEC_CTRL, val);
    }

    -u64 spec_ctrl_current(void)
    +noinstr u64 spec_ctrl_current(void)
    {
    return this_cpu_read(x86_spec_ctrl_current);
    }
    --- a/drivers/idle/intel_idle.c
    +++ b/drivers/idle/intel_idle.c
    @@ -181,12 +181,12 @@ static __cpuidle int intel_idle_ibrs(str
    int ret;

    if (smt_active)
    - wrmsrl(MSR_IA32_SPEC_CTRL, 0);
    + native_wrmsrl(MSR_IA32_SPEC_CTRL, 0);

    ret = __intel_idle(dev, drv, index);

    if (smt_active)
    - wrmsrl(MSR_IA32_SPEC_CTRL, spec_ctrl);
    + native_wrmsrl(MSR_IA32_SPEC_CTRL, spec_ctrl);

    return ret;
    }

    \
     
     \ /
      Last update: 2022-09-19 12:23    [W:4.244 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site