Skip to content

KVM: arm64: Add support for FEAT_NV2p1 and FEAT_NV3

Marc Zyngier kvm kvmarm linux-arm-kernel sashiko-reviews 4 versions – Applied

Status from this message: Applied to next, thanks!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest29 patches 7 repliesApplied
  2. v328 patches 23 repliesSuperseded
  3. v228 patches 18 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v128 patches24 repliesSuperseded

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/29arm64: sysreg: Emit RESx/UNKN values for Mapping/Fields definitionsarch/arm64/tools/gen-sysreg.awk+4 -41 reply
2/29arm64: Update ID_AA64MMFR4_EL1 description to 2026-03 JSON releasearch/arm64/tools/sysreg+28 -41 reply
3/29KVM: arm64: Merge guest's HCRX_EL2 using NV_HCRX_GUEST_EXCLUDEarch/arm64/kvm/hyp/include/hyp/switch.h+20 -23 replies
4/29KVM: arm64: Drop __HCRX_EL2_* masksarch/arm64/include/asm/kvm_arm.h arch/arm64/kvm/config.c arch/arm64/kvm/emulate-nested.c+3 -220 replies
5/29KVM: arm64: Plumb HCRX_EL2.SRMASKEn in HCRX_EL2 sanitisationarch/arm64/kvm/config.c arch/arm64/tools/sysreg+4 -10 replies
6/29KVM: arm64: Classify CPTR_EL2 as a SR_LOC_SPECIAL registerarch/arm64/include/asm/kvm_emulate.h arch/arm64/kvm/sys_regs.c+19 -30 replies
7/29KVM: arm64: Don't evaluate HCR_EL2.NV nor HFGITR_EL2.ERET on ERET fast patharch/arm64/kvm/hyp/vhe/switch.c+7 -50 replies
8/29arm64: Add ARM64_HAS_NV2P1 capabilityarch/arm64/tools/cpucaps+1 -00 replies
9/29KVM: arm64: Relax CPTR_EL2 handling when FEAT_NV2p1 is presentarch/arm64/kvm/hyp/include/hyp/switch.h arch/arm64/kvm/hyp/vhe/switch.c arch/arm64/kvm/hyp/vhe/sysreg-sr.c +1 more+15 -60 replies
10/29KVM: arm64: Relax CNTHCTL_EL2 handling when FEAT_NV2p1 is presentarch/arm64/kvm/arch_timer.c arch/arm64/kvm/hyp/vhe/sysreg-sr.c arch/arm64/kvm/sys_regs.c+22 -70 replies
11/29KVM: arm64: Expose FEAT_NV2p1 to NV guestsarch/arm64/kvm/nested.c+6 -20 replies
12/29arm64: Add FEAT_NV2p1 detectionarch/arm64/kernel/cpufeature.c+7 -00 replies
13/29arm64: sysreg: Add NVHCR_EL2 description as a mirror of HCR_EL2arch/arm64/tools/sysreg+3 -00 replies
14/29arm64: sysreg: Add HCRX_EL2 bits related to FEAT_NV3arch/arm64/tools/sysreg+6 -11 reply
15/29arm64: Add ARM64_HAS_NV3 capabilityarch/arm64/tools/cpucaps+1 -00 replies
16/29KVM: arm64: Split NV-specific exit fixups from the non-NV handlingarch/arm64/kvm/hyp/vhe/switch.c+11 -70 replies
17/29KVM: arm64: Add NV3 control bits to HCRX_EL2 sanitisationarch/arm64/kvm/config.c+6 -00 replies
18/29KVM: arm64: Add kvm_has_nv{2,3}() predicatesarch/arm64/include/asm/kvm_emulate.h+19 -00 replies
19/29KVM: arm64: Make HCR_EL2 a non-VNCR registerarch/arm64/include/asm/kvm_host.h arch/arm64/include/asm/vncr_mapping.h arch/arm64/kvm/hyp/vhe/switch.c+12 -20 replies
20/29KVM: arm64: Add sanitisation for NVHCR_EL2arch/arm64/kvm/config.c arch/arm64/kvm/nested.c+19 -00 replies
21/29KVM: arm64: Add NVHCR_EL2 handling to the sysreg arrayarch/arm64/kvm/sys_regs.c+28 -00 replies
22/29KVM: arm64: Add routing for NVHCR_EL2 traparch/arm64/kvm/emulate-nested.c+13 -00 replies
23/29KVM: arm64: Add NVHCR_EL2 context switchingarch/arm64/kvm/hyp/include/hyp/sysreg-sr.h arch/arm64/kvm/hyp/vhe/switch.c+19 -20 replies
24/29KVM: arm64: Engage NV3 ERET trap elisionarch/arm64/include/asm/kvm_emulate.h arch/arm64/kvm/hyp/vhe/switch.c+14 -00 replies
25/29KVM: arm64: Engage NV3 TLBI trap elisionarch/arm64/include/asm/kvm_emulate.h+13 -00 replies
26/29KVM: arm64: Add FEAT_NV3 detectionarch/arm64/kernel/cpufeature.c+7 -00 replies
27/29KVM: arm64: Expose FEAT_NV3 to guestsarch/arm64/kvm/nested.c+4 -20 replies
28/29KVM: arm64: selftest: Add NVHCR_EL2 to get-reg-listtools/testing/selftests/kvm/arm64/get-reg-list.c+2 -00 replies
29/29arm64: Add override for ID_AA64MMFR4_EL1.NV_fracarch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/image-vars.h +1 more+15 -10 replies

Reviews trailers per patch

17 of 29 patches have a Reviewed-by or Acked-by.

PatchYuan YaoJoey GoulyMark Rutland
1/29A-b
2/29R-b
3/29R-b R-b
4/29
5/29
6/29R-b R-b
7/29R-b
8/29
9/29R-b R-b
10/29
11/29R-b
12/29R-b
13/29R-b
14/29
15/29
16/29R-b
17/29
18/29R-b
19/29R-b R-b
20/29R-b
21/29
22/29
23/29R-b R-b
24/29R-b
25/29
26/29R-b
27/29R-b
28/29
29/29

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 v4 thread

Cover letter [PATCH v4 00/29] KVM: arm64: Add support for FEAT_NV2p1 and FEAT_NV3

This is the fourth (and hopefully last) version of a series adding support for two extensions targeting Nested Virt on arm64:

- FEAT_NV2p1 is effectively a bug fix for two registers (CNTHCTL_EL2 and CPTR_EL2) that are missing stateful bits when accessed from EL1 in a NV configuration. When this is present, the hypervisor can avoid a bunch of traps.

- FEAT_NV3 is much more ambitious, and changes the way ERET behaves in a NV environment. By moving EL1 accesses to HCR_EL2 from memory (via VNCR) to a dedicated register (NVHCR_EL2), the HW can detect whether the guest is performing an ERET for itself (NVHCR_EL2.TGE==1) or to its own guest (NVHCR_EL2.TGE==0). In the former case, ERET is done directly, and no trap occurs. Similar optimisations are available for a class of TLBI instructions.

The whole thing has been tested on an FVP model, and shown measurable improvements for an L1 guest (about 1.5% fewer instructions).

Given that this isn't very convincing on its own, I have built an approximate emulation of FEAT_NV3 that L1 (and deeper levels) can use on actual production hardware. For these deeper levels, the numbers are in the double digit of percentage point reduction, see below for details.

Does it make NV better? Yes!
Does it make NV good? Get real!

Anyway, patches on top of -rc4.

* Side notes about performance evaluation with NV3 emulation:

If you are interested in the NV3 emulation, I have a branch [0] that contains it all. Note that the improvement only kicks while running an L2 guest running at EL2 -- L1 will not see any improvement. But I get close to 40% improvements on L2, and 60% on L3 for the only workload that really matters (Debian Installer).

If all your nested guests are running this hack, then you can pass "kvm-arm.mode=nested,nvtge" on the host command line, and all the nested guests will opt in the accelerated behaviour.

If you like to live dangerously (or have a machine that does not have FEAT_HCX), you can instead pass 'kvm-arm.mode=nested,nvtge=force', and ERET will get the acceleration without even guest buy-in.

* From v3 [3]:

- Fixed comment in the Mapping/Fields generator

- Dropped double semi-colon in HCRX configuration

- Simplified the kvm_has_nv3() predicate

- Added NVHCR_EL2 to the get-reg-list selftest

- Collected RBs from Yao Yuan, with thanks

* From v2 [2]:

- Improved comments on the subtleties of trapping ERET in nested contexts

- Rebased on top of v7.2-rc4

- Collected RBs from Yao Yuan, with thanks

* From v1 [1]:

- Expanded generation of RESx and UNKN symbols to both Mapping and Fields qualifiers

- Dropped HFGIRT_EL2.ERET checks on ERET fast-path

- Fixed the NVHCR_EL2 trap handling

- Added FORCE_RESx() to HCRX_EL2 constraints

- Fixed ID_AA64MMFR4_EL1 sanitisation

- Added NV3 acceleration for TLBIOS

- Collected RBs from Joey, with thanks

[0] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/nv3
[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/[email protected]
[3] https://lore.kernel.org/r/[email protected]

Marc Zyngier (29):
arm64: sysreg: Emit RESx/UNKN values for Mapping/Fields definitions
arm64: Update ID_AA64MMFR4_EL1 description to 2026-03 JSON release
KVM: arm64: Merge guest's HCRX_EL2 using NV_HCRX_GUEST_EXCLUDE
KVM: arm64: Drop __HCRX_EL2_* masks
KVM: arm64: Plumb HCRX_EL2.SRMASKEn in HCRX_EL2 sanitisation
KVM: arm64: Classify CPTR_EL2 as a SR_LOC_SPECIAL register
KVM: arm64: Don't evaluate HCR_EL2.NV nor HFGITR_EL2.ERET on ERET fast
path
arm64: Add ARM64_HAS_NV2P1 capability
KVM: arm64: Relax CPTR_EL2 handling when FEAT_NV2p1 is present
KVM: arm64: Relax CNTHCTL_EL2 handling when FEAT_NV2p1 is present
KVM: arm64: Expose FEAT_NV2p1 to NV guests
arm64: Add FEAT_NV2p1 detection
arm64: sysreg: Add NVHCR_EL2 description as a mirror of HCR_EL2
arm64: sysreg: Add HCRX_EL2 bits related to FEAT_NV3
arm64: Add ARM64_HAS_NV3 capability
KVM: arm64: Split NV-specific exit fixups from the non-NV handling
KVM: arm64: Add NV3 control bits to HCRX_EL2 sanitisation
KVM: arm64: Add kvm_has_nv{2,3}() predicates
KVM: arm64: Make HCR_EL2 a non-VNCR register
KVM: arm64: Add sanitisation for NVHCR_EL2
KVM: arm64: Add NVHCR_EL2 handling to the sysreg array
KVM: arm64: Add routing for NVHCR_EL2 trap
KVM: arm64: Add NVHCR_EL2 context switching
KVM: arm64: Engage NV3 ERET trap elision
KVM: arm64: Engage NV3 TLBI trap elision
KVM: arm64: Add FEAT_NV3 detection
KVM: arm64: Expose FEAT_NV3 to guests
KVM: arm64: selftest: Add NVHCR_EL2 to get-reg-list
arm64: Add override for ID_AA64MMFR4_EL1.NV_frac

 arch/arm64/include/asm/cpufeature.h           |  1 +
 arch/arm64/include/asm/kvm_arm.h              | 15 -----
 arch/arm64/include/asm/kvm_emulate.h          | 44 +++++++++++++-
 arch/arm64/include/asm/kvm_host.h             |  3 +-
 arch/arm64/include/asm/vncr_mapping.h         |  2 +-
 arch/arm64/kernel/cpufeature.c                | 18 +++++-
 arch/arm64/kernel/image-vars.h                |  1 +
 arch/arm64/kernel/pi/idreg-override.c         | 10 ++++
 arch/arm64/kvm/arch_timer.c                   | 10 +++-
 arch/arm64/kvm/config.c                       | 27 ++++++++-
 arch/arm64/kvm/emulate-nested.c               | 18 ++++--
 arch/arm64/kvm/hyp/include/hyp/switch.h       | 27 +++++++--
 arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h    | 11 ++++
 arch/arm64/kvm/hyp/vhe/switch.c               | 52 +++++++++++++----
 arch/arm64/kvm/hyp/vhe/sysreg-sr.c            | 21 +++++--
 arch/arm64/kvm/nested.c                       | 14 ++++-
 arch/arm64/kvm/sys_regs.c                     | 57 +++++++++++++++++--
 arch/arm64/tools/cpucaps                      |  2 +
 arch/arm64/tools/gen-sysreg.awk               |  8 +--
 arch/arm64/tools/sysreg                       | 44 ++++++++++++--
 .../selftests/kvm/arm64/get-reg-list.c        |  2 +
 21 files changed, 322 insertions(+), 65 deletions(-)
Signature · 1 line
2.47.3