Skip to content

x86/cpu, kvm: Support AMD Automatic IBRS

Kim Phillips kvm linux-doc lkml 8 versions – Applied

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

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v9 Latest8 patches 13 repliesApplied
  2. v88 patches 4 repliesSuperseded
  3. v77 patches 4 repliesApplied
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v67 patches6 repliesApplied
v57 patches1 replySuperseded
v47 patches6 repliesSuperseded
v37 patches3 repliesSuperseded
v22 patches4 repliesSuperseded

Patches in v9 Applied

#Subject and filesSizeRepliesApplied
1/8x86/cpu, kvm: Add support for CPUID_80000021_EAXarch/x86/include/asm/cpufeature.h arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/disabled-features.h +3 more+14 -50 replies
2/8KVM: x86: Move open-coded cpuid leaf 0x80000021 EAX bit propagation codearch/x86/kvm/cpuid.c+12 -190 replies
3/8x86/cpu, kvm: Add the NO_NESTED_DATA_BP featurearch/x86/include/asm/cpufeatures.h arch/x86/kvm/cpuid.c+4 -10 replies
4/8x86/cpu, kvm: Move X86_FEATURE_LFENCE_RDTSC to its native leafarch/x86/include/asm/cpufeatures.h arch/x86/kernel/cpu/amd.c arch/x86/kvm/cpuid.c+4 -62 replies
5/8x86/cpu, kvm: Add the Null Selector Clears Base featurearch/x86/include/asm/cpufeatures.h arch/x86/kernel/cpu/common.c arch/x86/kvm/cpuid.c+4 -50 replies
6/8x86/cpu, kvm: Add the SMM_CTL MSR not present featurearch/x86/include/asm/cpufeatures.h arch/x86/kvm/cpuid.c+2 -10 replies
7/8x86/cpu: Support AMD Automatic IBRSDocumentation/admin-guide/hw-vuln/spectre.rst Documentation/admin-guide/kernel-parameters.txt arch/x86/include/asm/cpufeatures.h +3 more+32 -2225 replies
8/8KVM: x86: Propagate the AMD Automatic IBRS feature to the guestarch/x86/kvm/cpuid.c arch/x86/kvm/svm/svm.c arch/x86/kvm/x86.c+7 -10 replies

Reviews trailers per patch

2 of 8 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDave HansenSean ChristophersonBorislav Petkov (AMD)
SeriesA-b
1/8
2/8
3/8
4/8A-b
5/8
6/8
7/8A-b A-b A-b
8/8

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v9 thread

Cover letter [PATCH v9 0/8] x86/cpu, kvm: Support AMD Automatic IBRS

The AMD Zen4 core supports a new feature called Automatic IBRS (Indirect Branch Restricted Speculation).

Enable Automatic IBRS by default if the CPU feature is present. It typically provides greater performance over the incumbent generic retpolines mitigation.

Patch 1 [unchanged from v7] Adds support for the leaf that contains the AutoIBRS feature bit.

Patch 2 moves the leaf's open-coded code from __do_cpuid_func() to kvm_set_cpu_caps() in preparation for adding the features in their native leaf.

Patches 3-6 introduce the new leaf's supported bits one by one.

Patch 7 [unchanged from v7] Adds support for AutoIBRS by turning its EFER enablement bit on at startup if the feature is available.

Patch 8 [unchanged from v7] Adds support for propagating AutoIBRS to the guest.

v9: Address comments from Sean Christopherson:
- Patch 1: "KVM guests", not "VM guests"
- Patches 2 & 8:
- Subject prefix change to "KVM: x86: "
- Patch 2:
- Added Sean's blurb about the synthetic features to the commit message
- Added BIT(2) /* LFENCE always serializing */ to kvm_cpu_cap_mask() in kvm_set_cpu_caps() to mirror true code movement
- Patch 4: Removed the kvm_cpu_cap_set for LFENCE_RDTSC since the previous set_cpu_cap()s and kvm_cpu_cap_mask() presence will effectively synthesize the feature now that the feature bit is in its proper place.

v8: https://lore.kernel.org/lkml/[email protected]/
Address comments from Sean Christopherson, Boris:
- Move open-coded cpuid leaf 0x80000021 EAX bit propagation code in a single step/patch to avoid CPUID bits getting cleared by the open-coded ANDs coming after cpuid_entry_override().
- Includes changes Boris made when committing v7 to tip/x86-cpu, i.e.:
- Removing "AMD" prefix from feature comment text in cpufeatures.h
- Convert test in check_null_seg_clears_base() too.
- commit message changes

v7: https://lore.kernel.org/lkml/[email protected]/
- Add Dave Hansen's Acked-by to unchanged patch 6/7
- Change patch 3/7 to not bother to set MSR DE_CFG[1]
if X86_FEATURE_LFENCE_RDTSC is already set [Boris]
- v6 went out with two 1/1's, try to not do that again

v6: https://lore.kernel.org/lkml/[email protected]/
Address v5 comment from Boris:
- Move CPUID leaf 0x8000021 EAX feature bits from scattered to the new whole leaf since the majority of the features will be used in the kernel and thus a separate leaf is appropriate.

v5: https://lore.kernel.org/lkml/[email protected]/
Address v4 comments from Dave Hansen, Pawan Gupta, and Boris:
- Don't add new user-visible 'autoibrs' command line
options that have to be documented: reuse 'eibrs'
- Update Documentation/admin-guide/hw-vuln/spectre.rst
- Add NO_EIBRS_PBRSB to Hygon as well
- Re-word commit texts to not use words like 'us'

v4: https://lore.kernel.org/lkml/[email protected]/
Moved some kvm bits that had crept into patch 6/7 back into 7/7, and addressed v3 comments:
- Don't put ", kvm" in titles of patches that don't touch kvm. [SeanC]
- () after function names, i.e. kvm_set_cpu_caps(). [SeanC]
- follow the established kvm_cpu_cap_init_scattered() style [SeanC]
- Add using cpu_feature_enabled() instead of static_cpu_has() to commit text [SeanC]
- Pawan Gupta mentioned that the ordering of enabling the Intel feature bit past Intel EIBRS bug detection could be avoided by setting NO_EIBRS_PBRSB to cpu_vuln_whitelist, so did that which allowed regrouping all EIBRS related code to one place in cpu_set_bug_bits().

v3: https://lore.kernel.org/lkml/[email protected]/
- Remove Co-developed-bys. They require signed-off-bys,
so co-developers need to add them themselves.
- update check_null_seg_clears_base() [Boris]
- Made the feature bit additions separate patches
because v2 patch was clearly doing too many things at once.

v2: https://lore.kernel.org/lkml/[email protected]/
https://lkml.org/lkml/2022/11/23/1690
- Use synthetic/scattered bits instead of introducing new leaf [Boris]
- Combine the rest of the leaf's bits being used [Paolo]
Note: Bits not used by the host can be moved to kvm/cpuid.c if maintainers do not want them in cpufeatures.h.
- Hoist bitsetting code to kvm_set_cpu_caps(), and use cpuid_entry_override() in __do_cpuid_func() [Paolo]
- Reuse SPECTRE_V2_EIBRS spectre_v2_mitigation enum [Boris, PeterZ, D.Hansen]
- Change from Boris' diff:
Moved setting X86_FEATURE_IBRS_ENHANCED to after BUG_EIBRS_PBRSB so PBRSB mitigations wouldn't be enabled.
- Allow for users to specify "autoibrs,lfence/retpoline" instead of actively preventing the extra protections. AutoIBRS doesn't require the extra protection, but allow it anyway.

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

Cc Borislav Petkov (AMD) <[email protected]>
Cc Boris Ostrovsky <[email protected]>
Cc Dave Hansen <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Joao Martins <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Sean Christopherson <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Juergen Gross <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Tony Luck <[email protected]>
Cc Tom Lendacky <[email protected]>
Cc Alexey Kardashevskiy <[email protected]>

Kim Phillips (8):
x86/cpu, kvm: Add support for CPUID_80000021_EAX x86/cpu, kvm: Move open-coded cpuid leaf 0x80000021 EAX bit
propagation code
x86/cpu, kvm: Add the NO_NESTED_DATA_BP feature
x86/cpu, kvm: Move X86_FEATURE_LFENCE_RDTSC to its native leaf x86/cpu, kvm: Add the Null Selector Clears Base feature x86/cpu, kvm: Add the SMM_CTL MSR not present feature x86/cpu: Support AMD Automatic IBRS
x86/cpu, kvm: Propagate the AMD Automatic IBRS feature to the guest

 Documentation/admin-guide/hw-vuln/spectre.rst |  6 ++--
 .../admin-guide/kernel-parameters.txt         |  6 ++--
 arch/x86/include/asm/cpufeature.h             |  7 +++--
 arch/x86/include/asm/cpufeatures.h            | 11 +++++--
 arch/x86/include/asm/disabled-features.h      |  3 +-
 arch/x86/include/asm/msr-index.h              |  2 ++
 arch/x86/include/asm/required-features.h      |  3 +-
 arch/x86/kernel/cpu/amd.c                     |  2 +-
 arch/x86/kernel/cpu/bugs.c                    | 20 ++++++++-----
 arch/x86/kernel/cpu/common.c                  | 26 +++++++++-------
 arch/x86/kvm/cpuid.c                          | 30 +++++++------------
 arch/x86/kvm/reverse_cpuid.h                  |  1 +
 arch/x86/kvm/svm/svm.c                        |  3 ++
 arch/x86/kvm/x86.c                            |  3 ++
 14 files changed, 72 insertions(+), 51 deletions(-)

--
2.34.1

Kim Phillips (8):
x86/cpu, kvm: Add support for CPUID_80000021_EAX
KVM: x86: Move open-coded cpuid leaf 0x80000021 EAX bit propagation
code
x86/cpu, kvm: Add the NO_NESTED_DATA_BP feature
x86/cpu, kvm: Move X86_FEATURE_LFENCE_RDTSC to its native leaf x86/cpu, kvm: Add the Null Selector Clears Base feature x86/cpu, kvm: Add the SMM_CTL MSR not present feature x86/cpu: Support AMD Automatic IBRS
KVM: x86: Propagate the AMD Automatic IBRS feature to the guest

 Documentation/admin-guide/hw-vuln/spectre.rst |  6 ++--
 .../admin-guide/kernel-parameters.txt         |  6 ++--
 arch/x86/include/asm/cpufeature.h             |  7 +++--
 arch/x86/include/asm/cpufeatures.h            | 11 ++++++--
 arch/x86/include/asm/disabled-features.h      |  3 +-
 arch/x86/include/asm/msr-index.h              |  2 ++
 arch/x86/include/asm/required-features.h      |  3 +-
 arch/x86/kernel/cpu/amd.c                     |  2 +-
 arch/x86/kernel/cpu/bugs.c                    | 20 +++++++------
 arch/x86/kernel/cpu/common.c                  | 26 +++++++++--------
 arch/x86/kvm/cpuid.c                          | 28 ++++++-------------
 arch/x86/kvm/reverse_cpuid.h                  |  1 +
 arch/x86/kvm/svm/svm.c                        |  3 ++
 arch/x86/kvm/x86.c                            |  3 ++
 14 files changed, 70 insertions(+), 51 deletions(-)
Signature · 1 line
2.34.1