hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpuidle, intel_idle: Fix CPUIDLE_FLAG_IBRS

Browse Source 
[ Upstream commit 9b461a6faae7b220c32466261965778b10189e54 ]

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: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Tested-by: Tony Lindgren <tony@atomide.com>
Tested-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195540.556912863@infradead.org
Stable-dep-of: c157d351460b ("intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Peter Zijlstra 2023-01-12 20:43:34 +01:00 committed by Greg Kroah-Hartman
parent b3b35ff81e
commit d2d7ee96cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu/bugs.c
View File

@ -92,7 +92,7 @@ void update_spec_ctrl_cond(u64 val)
wrmsrl(MSR_IA32_SPEC_CTRL, 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); return this_cpu_read(x86_spec_ctrl_current);
} }

4
drivers/idle/intel_idle.c
View File

@ -188,12 +188,12 @@ static __cpuidle int intel_idle_ibrs(struct cpuidle_device *dev,
int ret; int ret;
if (smt_active) if (smt_active)
wrmsrl(MSR_IA32_SPEC_CTRL, 0); native_wrmsrl(MSR_IA32_SPEC_CTRL, 0);
ret = __intel_idle(dev, drv, index); ret = __intel_idle(dev, drv, index);
if (smt_active) if (smt_active)
wrmsrl(MSR_IA32_SPEC_CTRL, spec_ctrl); native_wrmsrl(MSR_IA32_SPEC_CTRL, spec_ctrl);
return ret; return ret;
} }