KVM: arm64: Revamp Fine Grained Trap handling
Status from this message: Applied to next, thanks!
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest43 patches 6 repliesApplied
- v342 patches 28 repliesSuperseded
- v223 patches 0 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 18 patches | 11 replies | Superseded |
Patches in v4 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/43 | arm64: sysreg: Add ID_AA64ISAR1_EL1.LS64 encoding for FEAT_LS64WBarch/ | +1 | 0 replies | |
| 2/43 | arm64: sysreg: Update ID_AA64MMFR4_EL1 descriptionarch/ | +16 | 0 replies | |
| 3/43 | arm64: sysreg: Add layout for HCR_EL2arch/ arch/ | +132 | 0 replies | |
| 4/43 | arm64: sysreg: Replace HFGxTR_EL2 with HFG{R,W}TR_EL2arch/ arch/ arch/ +6 more | +250 | 0 replies | |
| 5/43 | arm64: sysreg: Update ID_AA64PFR0_EL1 descriptionarch/ | +1 | 0 replies | |
| 6/43 | arm64: sysreg: Update PMSIDR_EL1 descriptionarch/ | +26 | 0 replies | |
| 7/43 | arm64: sysreg: Update TRBIDR_EL1 descriptionarch/ | +6 | 0 replies | |
| 8/43 | arm64: sysreg: Update CPACR_EL1 descriptionarch/ | +3 | 0 replies | |
| 9/43 | arm64: sysreg: Add registers trapped by HFG{R,W}TR2_EL2arch/ | +395 | 0 replies | |
| 10/43 | arm64: sysreg: Add registers trapped by HDFG{R,W}TR2_EL2arch/ arch/ | +353 | 0 replies | |
| 11/43 | arm64: sysreg: Add system instructions trapped by HFGIRT2_EL2arch/ | +4 | 0 replies | |
| 12/43 | arm64: Remove duplicated sysreg encodingsarch/ | +0 | 0 replies | |
| 13/43 | arm64: tools: Resync sysreg.htools/ | +48 | 0 replies | |
| 14/43 | arm64: Add syndrome information for trapped LD64B/ST64B{,V,V0}arch/ | +7 | 0 replies | |
| 15/43 | arm64: Add FEAT_FGT2 capabilityarch/ arch/ | +8 | 0 replies | |
| 16/43 | KVM: arm64: Tighten handling of unknown FGT groupsarch/ | +3 | 0 replies | |
| 17/43 | KVM: arm64: Simplify handling of negative FGT bitsarch/ | +12 | 0 replies | |
| 18/43 | KVM: arm64: Handle trapping of FEAT_LS64* instructionsarch/ | +56 | 0 replies | |
| 19/43 | KVM: arm64: Restrict ACCDATA_EL1 undef to FEAT_LS64_ACCDATA being disabledarch/ | +3 | 0 replies | |
| 20/43 | KVM: arm64: Don't treat HCRX_EL2 as a FGT registerarch/ | +3 | 0 replies | |
| 21/43 | KVM: arm64: Plug FEAT_GCS handlingarch/ arch/ | +19 | 0 replies | |
| 22/43 | KVM: arm64: Compute FGT masks from KVM's own FGT tablesarch/ arch/ | +120 | 0 replies | |
| 23/43 | KVM: arm64: Add description of FGT bits leading to EC!=0x18arch/ | +30 | 0 replies | |
| 24/43 | KVM: arm64: Use computed masks as sanitisers for FGT registersarch/ | +6 | 0 replies | |
| 25/43 | KVM: arm64: Unconditionally configure fine-grain trapsarch/ | +15 | 0 replies | |
| 26/43 | KVM: arm64: Propagate FGT masks to the nVHE hypervisorarch/ arch/ arch/ | +22 | 0 replies | |
| 27/43 | KVM: arm64: Use computed FGT masks to setup FGT registersarch/ | +38 | 1 reply | |
| 28/43 | KVM: arm64: Remove hand-crafted masks for FGT registersarch/ arch/ | +1 | 0 replies | |
| 29/43 | KVM: arm64: Use KVM-specific HCRX_EL2 RES0 maskarch/ arch/ arch/ | +21 | 0 replies | |
| 30/43 | KVM: arm64: Handle PSB CSYNC trapsarch/ arch/ arch/ +1 more | +9 | 0 replies | |
| 31/43 | KVM: arm64: Switch to table-driven FGU configurationarch/ arch/ arch/ +1 more | +596 | 2 replies | |
| 32/43 | KVM: arm64: Validate FGT register descriptions against RES0 masksarch/ arch/ arch/ | +32 | 0 replies | |
| 33/43 | KVM: arm64: Use FGT feature maps to drive RES0 bitsarch/ arch/ arch/ | +57 | 1 reply | |
| 34/43 | KVM: arm64: Allow kvm_has_feat() to take variable argumentsarch/ | +6 | 0 replies | |
| 35/43 | KVM: arm64: Use HCRX_EL2 feature map to drive fixed-value bitsarch/ arch/ | +79 | 0 replies | |
| 36/43 | KVM: arm64: Use HCR_EL2 feature map to drive fixed-value bitsarch/ arch/ | +150 | 0 replies | |
| 37/43 | KVM: arm64: Add FEAT_FGT2 registers to the VNCR pagearch/ arch/ | +10 | 0 replies | |
| 38/43 | KVM: arm64: Add sanitisation for FEAT_FGT2 registersarch/ arch/ arch/ +4 more | +260 | 1 reply | |
| 39/43 | KVM: arm64: Add trap routing for FEAT_FGT2 registersarch/ | +12 | 0 replies | |
| 40/43 | KVM: arm64: Add context-switch for FEAT_FGT2 registersarch/ | +44 | 0 replies | |
| 41/43 | KVM: arm64: Allow sysreg ranges for FGT descriptorsarch/ | +42 | 0 replies | |
| 42/43 | KVM: arm64: Add FGT descriptors for FEAT_FGT2arch/ | +83 | 0 replies | |
| 43/43 | KVM: arm64: Handle TSB CSYNC trapsarch/ arch/ arch/ | +8 | 0 replies |
Reviews trailers per patch
12 of 43 patches have a Reviewed-by or Acked-by.
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v4 00/43] KVM: arm64: Revamp Fine Grained Trap handling
This is yet another version of the series last posted at [1].
The eagled eye reviewer will have noticed that since v2, the series has more or less doubled in size for any reasonable metric (number of patches, number of lines added or deleted). It is therefore pretty urgent that this gets either merged or forgotten! ;-)
See the change log below for the details -- most of it is related to FGT2 (and its rather large dependencies) being added.
* From v3:
- Added missing bit fields for CPACR_EL1
- Fixed a bunch of typos in comments and commit messages
- Cleaned-up whitespace damage from the sysreg generator
- Collected RBs from Joey, with thanks!
* From v2:
- Added comprehensive support for FEAT_FGT2, as the host kernel is now making use of these registers, without any form of context switch in KVM. What could possibly go wrong?
- Reworked some of the FGT description and handling primitives, reducing the boilerplate code and tables that get added over time.
- Rebased on 6.15-rc3.
[1]: https://lore.kernel.org/r/[email protected]
Marc Zyngier (42):
arm64: sysreg: Add ID_AA64ISAR1_EL1.LS64 encoding for FEAT_LS64WB
arm64: sysreg: Update ID_AA64MMFR4_EL1 description
arm64: sysreg: Add layout for HCR_EL2
arm64: sysreg: Replace HFGxTR_EL2 with HFG{R,W}TR_EL2
arm64: sysreg: Update ID_AA64PFR0_EL1 description
arm64: sysreg: Update PMSIDR_EL1 description
arm64: sysreg: Update TRBIDR_EL1 description
arm64: sysreg: Update CPACR_EL1 description
arm64: sysreg: Add registers trapped by HFG{R,W}TR2_EL2
arm64: sysreg: Add registers trapped by HDFG{R,W}TR2_EL2
arm64: sysreg: Add system instructions trapped by HFGIRT2_EL2
arm64: Remove duplicated sysreg encodings
arm64: tools: Resync sysreg.h
arm64: Add syndrome information for trapped LD64B/ST64B{,V,V0}
arm64: Add FEAT_FGT2 capability
KVM: arm64: Tighten handling of unknown FGT groups
KVM: arm64: Simplify handling of negative FGT bits
KVM: arm64: Handle trapping of FEAT_LS64* instructions
KVM: arm64: Restrict ACCDATA_EL1 undef to FEAT_LS64_ACCDATA being
disabled
KVM: arm64: Don't treat HCRX_EL2 as a FGT register
KVM: arm64: Plug FEAT_GCS handling
KVM: arm64: Compute FGT masks from KVM's own FGT tables
KVM: arm64: Add description of FGT bits leading to EC!=0x18
KVM: arm64: Use computed masks as sanitisers for FGT registers
KVM: arm64: Propagate FGT masks to the nVHE hypervisor
KVM: arm64: Use computed FGT masks to setup FGT registers
KVM: arm64: Remove hand-crafted masks for FGT registers
KVM: arm64: Use KVM-specific HCRX_EL2 RES0 mask
KVM: arm64: Handle PSB CSYNC traps
KVM: arm64: Switch to table-driven FGU configuration
KVM: arm64: Validate FGT register descriptions against RES0 masks
KVM: arm64: Use FGT feature maps to drive RES0 bits
KVM: arm64: Allow kvm_has_feat() to take variable arguments
KVM: arm64: Use HCRX_EL2 feature map to drive fixed-value bits
KVM: arm64: Use HCR_EL2 feature map to drive fixed-value bits
KVM: arm64: Add FEAT_FGT2 registers to the VNCR page
KVM: arm64: Add sanitisation for FEAT_FGT2 registers
KVM: arm64: Add trap routing for FEAT_FGT2 registers
KVM: arm64: Add context-switch for FEAT_FGT2 registers
KVM: arm64: Allow sysreg ranges for FGT descriptors
KVM: arm64: Add FGT descriptors for FEAT_FGT2
KVM: arm64: Handle TSB CSYNC traps
Mark Rutland (1):
KVM: arm64: Unconditionally configure fine-grain traps
arch/arm64/include/asm/el2_setup.h | 14 +- arch/arm64/include/asm/esr.h | 10 +- arch/arm64/include/asm/kvm_arm.h | 186 ++-- arch/arm64/include/asm/kvm_host.h | 56 +- arch/arm64/include/asm/sysreg.h | 26 +- arch/arm64/include/asm/vncr_mapping.h | 5 + arch/arm64/kernel/cpufeature.c | 7 + arch/arm64/kvm/Makefile | 2 +- arch/arm64/kvm/arm.c | 13 + arch/arm64/kvm/config.c | 1085 +++++++++++++++++++++++ arch/arm64/kvm/emulate-nested.c | 583 ++++++++---- arch/arm64/kvm/handle_exit.c | 77 ++ arch/arm64/kvm/hyp/include/hyp/switch.h | 158 ++-- arch/arm64/kvm/hyp/nvhe/switch.c | 12 + arch/arm64/kvm/hyp/vgic-v3-sr.c | 8 +- arch/arm64/kvm/nested.c | 223 +---- arch/arm64/kvm/sys_regs.c | 68 +- arch/arm64/tools/cpucaps | 1 + arch/arm64/tools/sysreg | 1006 ++++++++++++++++++++- tools/arch/arm64/include/asm/sysreg.h | 65 +- 20 files changed, 2894 insertions(+), 711 deletions(-) create mode 100644 arch/arm64/kvm/config.c
Signature · 1 line
2.39.2