Skip to content

x86: Write FRED RSP0 on return to userspace

Xin Li (Intel) lkml 2 versions – Applied

Status from this message: The following commit has been merged into the x86/fred branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 0 repliesApplied
  2. v13 patches 33 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/3x86/entry: Test ti_work for zero before processing individual bitsarch/x86/include/asm/entry-common.h+8 -20 replies
2/3x86/msr: Switch between WRMSRNS and WRMSR with the alternatives mechanismarch/x86/include/asm/msr.h arch/x86/include/asm/switch_to.h arch/x86/kernel/cpu/cpuid-deps.c+11 -160 replies
3/3x86/entry: Set FRED RSP0 on return to userspace instead of context switcharch/x86/include/asm/entry-common.h arch/x86/include/asm/fred.h arch/x86/include/asm/switch_to.h +1 more+27 -50 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/3] x86: Write FRED RSP0 on return to userspace

This patch set moves writing MSR_IA32_FRED_RSP0 to return to userspace from context switch.

In the discussion of save/restore host/guest FRED RSP0 for KVM, Sean proposed to have the kernel write MSR_IA32_FRED_RSP0 on return to userspace, i.e., arch_exit_to_user_mode_prepare(), instead of on context switch. [1]

hpa suggested to test ti_work for zero and then process individual bits in arch_exit_to_user_mode_prepare. And a quick measurement shows that in most cases, ti_work values passed to arch_exit_to_user_mode_prepare() are zeros, e.g., 99% in kernel build tests. This zero test change was then sent to Intel 0day tests, and no perf regression is reported.

Besides, per the discussion of how to write MSR_IA32_FRED_RSP0 with the introduction of WRMSRNS [2], use the alternatives mechanism to choose WRMSRNS when it's available, otherwise fallback to WRMSR.

[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/

Andrew Cooper (1):
x86/msr: Switch between WRMSRNS and WRMSR with the alternatives
mechanism

Xin Li (Intel) (2):
x86/entry: Test ti_work for zero before processing individual bits x86/entry: Set FRED RSP0 on return to userspace instead of context
switch

 arch/x86/include/asm/entry-common.h | 13 +++++++++++--
 arch/x86/include/asm/fred.h         | 21 ++++++++++++++++++++-
 arch/x86/include/asm/msr.h          | 25 +++++++++++--------------
 arch/x86/include/asm/switch_to.h    |  6 +-----
 arch/x86/kernel/cpu/cpuid-deps.c    |  1 -
 arch/x86/kernel/fred.c              |  3 +++
 6 files changed, 46 insertions(+), 23 deletions(-)

base-commit: b34bbe44b8222d43d6311d5caa1226ebddda4bfb

Signature · 1 line
2.46.0