Commit 9b461a6f authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

cpuidle, intel_idle: Fix CPUIDLE_FLAG_IBRS 



objtool to the rescue:

  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: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195540.556912863@infradead.org
parent 821ad23d

arch/x86/kernel/cpu/bugs.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void update_spec_ctrl_cond(u64 val) 
		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);

}

drivers/idle/intel_idle.c

+2 −2
Original line number Diff line number Diff line
@@ -181,12 +181,12 @@ static __cpuidle int intel_idle_ibrs(struct cpuidle_device *dev, 
	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;

}