mbox series

[v3,00/17] KVM: arm64: Fixes to fine grain traps and pKVM traps

Message ID 20231214100158.2305400-1-tabba@google.com (mailing list archive)
Headers show
Series KVM: arm64: Fixes to fine grain traps and pKVM traps | expand

Message

Fuad Tabba Dec. 14, 2023, 10:01 a.m. UTC 
Changes from v2:
- Rebased on arm64/for-next/sysregs, which includes new system
  register definitions (Mark, Joey)
- Explicitly trap unsupported HFGxTR_EL2 features rather than
  relying on its nMASK (Joey)
- Add new system registers to the auto-generated sysreg rather
  than hardcoding them (Mark)
- Drop patch that was meant as RFC
- Added missing system registers, fields, and  system
  instructions
- Split patches that make system register changes
- Fixes to patches defining allowed features for protected VMs
- Other minor fixes and tidying up

Changes from v1:
- Handle HAFGRTR_EL2 in nested virt
- Update the nested virt FGT tables with the added trap bits (Marc)
- Use the generated value for RES0 (Marc)
- Calculate the value of NMASK based on RES0 and MASK

This patch series has fixes, updates, and code for validating
fine grain trap register masks, as well as some fixes to feature
trapping in pKVM.

New fine grain trap (FGT) bits have been defined in the latest
Arm Architecture System Registers xml specification (DDI0601 and
DDI0602 2023-09) [1], so the code is updated to reflect them.
Moreover, some of the already-defined masks overlap with RES0,
which this series fixes.

It also adds FGT register masks that weren't defined earlier,
handling of HAFGRTR_EL2 in nested virt, as well as build time
validation that the bits of the various masks are all accounted
for and without overlap.

Based on arm64/for-next/sysregs (e94e06d8a796), which is composed
of system register updates [2] and is based on Linux 6.7-rc3.

Cheers,
/fuad

[1] https://developer.arm.com/downloads/-/exploration-tools
[2] https://lore.kernel.org/all/20231209-b4-arm64-sysreg-additions-v1-0-45284e538474@kernel.org/

Fuad Tabba (17):
  arm64/sysreg: Add missing Pauth_LR field definitions to
    ID_AA64ISAR1_EL1
  arm64/sysreg: Add missing ExtTrcBuff field definition to
    ID_AA64DFR0_EL1
  arm64/sysreg: Add missing system register definitions for FGT
  arm64/sysreg: Add missing system instruction definitions for FGT
  KVM: arm64: Explicitly trap unsupported HFGxTR_EL2 features
  KVM: arm64: Add missing HFGxTR_EL2 FGT entries to nested virt
  KVM: arm64: Add missing HFGITR_EL2 FGT entries to nested virt
  KVM: arm64: Add bit masks for HAFGRTR_EL2
  KVM: arm64: Handle HAFGRTR_EL2 trapping in nested virt
  KVM: arm64: Update and fix FGT register masks
  KVM: arm64: Add build validation for FGT trap mask values
  KVM: arm64: Use generated FGT RES0 bits instead of specifying them
  KVM: arm64: Define FGT nMASK bits relative to other fields
  KVM: arm64: Macros for setting/clearing FGT bits
  KVM: arm64: Fix which features are marked as allowed for protected VMs
  KVM: arm64: Mark PAuth as a restricted feature for protected VMs
  KVM: arm64: Trap external trace for protected VMs

 arch/arm64/include/asm/kvm_arm.h              | 61 +++++++++------
 arch/arm64/include/asm/kvm_host.h             |  1 +
 arch/arm64/include/asm/sysreg.h               |  7 ++
 arch/arm64/kvm/emulate-nested.c               | 63 +++++++++++++++
 arch/arm64/kvm/hyp/include/hyp/switch.h       | 77 +++++++++++--------
 .../arm64/kvm/hyp/include/nvhe/fixed_config.h | 22 +++++-
 arch/arm64/kvm/hyp/nvhe/pkvm.c                |  4 +
 arch/arm64/kvm/sys_regs.c                     |  1 +
 arch/arm64/tools/sysreg                       | 50 +++++++++++-
 9 files changed, 225 insertions(+), 61 deletions(-)


base-commit: e94e06d8a7960fd840ea92021ca1bf1362ea67f8

Comments

Will Deacon Dec. 17, 2023, 1:41 p.m. UTC | #1 
On Thu, 14 Dec 2023 10:01:40 +0000, Fuad Tabba wrote:
> Changes from v2:
> - Rebased on arm64/for-next/sysregs, which includes new system
>   register definitions (Mark, Joey)
> - Explicitly trap unsupported HFGxTR_EL2 features rather than
>   relying on its nMASK (Joey)
> - Add new system registers to the auto-generated sysreg rather
>   than hardcoding them (Mark)
> - Drop patch that was meant as RFC
> - Added missing system registers, fields, and  system
>   instructions
> - Split patches that make system register changes
> - Fixes to patches defining allowed features for protected VMs
> - Other minor fixes and tidying up
> 
> [...]

Applied the first four sysreg patches to arm64 (for-next/sysregs), thanks!

[01/17] arm64/sysreg: Add missing Pauth_LR field definitions to ID_AA64ISAR1_EL1
        https://git.kernel.org/arm64/c/3b077ad8cb25
[02/17] arm64/sysreg: Add missing ExtTrcBuff field definition to ID_AA64DFR0_EL1
        https://git.kernel.org/arm64/c/4f101cdcb578
[03/17] arm64/sysreg: Add missing system register definitions for FGT
        https://git.kernel.org/arm64/c/885c6d8e2885
[04/17] arm64/sysreg: Add missing system instruction definitions for FGT
        https://git.kernel.org/arm64/c/4ebee8cebdf6

Cheers,
Marc Zyngier Dec. 18, 2023, 5:11 p.m. UTC | #2 
On Thu, 14 Dec 2023 10:01:40 +0000, Fuad Tabba wrote:
> Changes from v2:
> - Rebased on arm64/for-next/sysregs, which includes new system
>   register definitions (Mark, Joey)
> - Explicitly trap unsupported HFGxTR_EL2 features rather than
>   relying on its nMASK (Joey)
> - Add new system registers to the auto-generated sysreg rather
>   than hardcoding them (Mark)
> - Drop patch that was meant as RFC
> - Added missing system registers, fields, and  system
>   instructions
> - Split patches that make system register changes
> - Fixes to patches defining allowed features for protected VMs
> - Other minor fixes and tidying up
> 
> [...]

Applied to next with the changes agreed on the list.

[05/17] KVM: arm64: Explicitly trap unsupported HFGxTR_EL2 features
        commit: 1565c881c3df053447309ff69ec7fd5dee2085e4
[06/17] KVM: arm64: Add missing HFGxTR_EL2 FGT entries to nested virt
        commit: 9d400eb722bd1be712b007149ff1d8fb2d6470db
[07/17] KVM: arm64: Add missing HFGITR_EL2 FGT entries to nested virt
        commit: 863ac38984a822ff9f4337d70853d771dcf7aae5
[08/17] KVM: arm64: Add bit masks for HAFGRTR_EL2
        commit: f9d6ed0213021ea00af30efbfa33e9a06c0610f2
[09/17] KVM: arm64: Handle HAFGRTR_EL2 trapping in nested virt
        commit: 676f482354886caa9b0cfa9236f5d20ac78f8c6a
[10/17] KVM: arm64: Update and fix FGT register masks
        commit: fc04838f9c00fcbc90a8926bbd46928d6fb36477
[11/17] KVM: arm64: Add build validation for FGT trap mask values
        commit: 6c4abbea6d9c09df448b43624074a208c38e68e0
[12/17] KVM: arm64: Use generated FGT RES0 bits instead of specifying them
        commit: 9ff67dd26a9eed9d73dc23aa63e87b16b3382184
[13/17] KVM: arm64: Define FGT nMASK bits relative to other fields
        commit: 5f6bd3f3daaaab8559ad7d2266ba38345231b7ae
[14/17] KVM: arm64: Macros for setting/clearing FGT bits
        commit: 0ccd901da1886cf9dc53ab36ad8f1160b65e41f1
[15/17] KVM: arm64: Fix which features are marked as allowed for protected VMs
        commit: 73e3ce3f4a0e561e24ca71b20de00f03b427981e
[16/17] KVM: arm64: Mark PAuth as a restricted feature for protected VMs
        commit: 21de26dbc5170dde8e4dfbfa1ecb77804ed6a377
[17/17] KVM: arm64: Trap external trace for protected VMs
        commit: 9d52612690985fc0ee1ae1fbad61530a4f6bbb53

Cheers,

	M.
Fuad Tabba Dec. 18, 2023, 5:15 p.m. UTC | #3 
On Mon, Dec 18, 2023 at 5:11 PM Marc Zyngier <maz@kernel.org> wrote:
>
> On Thu, 14 Dec 2023 10:01:40 +0000, Fuad Tabba wrote:
> > Changes from v2:
> > - Rebased on arm64/for-next/sysregs, which includes new system
> >   register definitions (Mark, Joey)
> > - Explicitly trap unsupported HFGxTR_EL2 features rather than
> >   relying on its nMASK (Joey)
> > - Add new system registers to the auto-generated sysreg rather
> >   than hardcoding them (Mark)
> > - Drop patch that was meant as RFC
> > - Added missing system registers, fields, and  system
> >   instructions
> > - Split patches that make system register changes
> > - Fixes to patches defining allowed features for protected VMs
> > - Other minor fixes and tidying up
> >
> > [...]
>
> Applied to next with the changes agreed on the list.

Thank you!
/fuad

>
> [05/17] KVM: arm64: Explicitly trap unsupported HFGxTR_EL2 features
>         commit: 1565c881c3df053447309ff69ec7fd5dee2085e4
> [06/17] KVM: arm64: Add missing HFGxTR_EL2 FGT entries to nested virt
>         commit: 9d400eb722bd1be712b007149ff1d8fb2d6470db
> [07/17] KVM: arm64: Add missing HFGITR_EL2 FGT entries to nested virt
>         commit: 863ac38984a822ff9f4337d70853d771dcf7aae5
> [08/17] KVM: arm64: Add bit masks for HAFGRTR_EL2
>         commit: f9d6ed0213021ea00af30efbfa33e9a06c0610f2
> [09/17] KVM: arm64: Handle HAFGRTR_EL2 trapping in nested virt
>         commit: 676f482354886caa9b0cfa9236f5d20ac78f8c6a
> [10/17] KVM: arm64: Update and fix FGT register masks
>         commit: fc04838f9c00fcbc90a8926bbd46928d6fb36477
> [11/17] KVM: arm64: Add build validation for FGT trap mask values
>         commit: 6c4abbea6d9c09df448b43624074a208c38e68e0
> [12/17] KVM: arm64: Use generated FGT RES0 bits instead of specifying them
>         commit: 9ff67dd26a9eed9d73dc23aa63e87b16b3382184
> [13/17] KVM: arm64: Define FGT nMASK bits relative to other fields
>         commit: 5f6bd3f3daaaab8559ad7d2266ba38345231b7ae
> [14/17] KVM: arm64: Macros for setting/clearing FGT bits
>         commit: 0ccd901da1886cf9dc53ab36ad8f1160b65e41f1
> [15/17] KVM: arm64: Fix which features are marked as allowed for protected VMs
>         commit: 73e3ce3f4a0e561e24ca71b20de00f03b427981e
> [16/17] KVM: arm64: Mark PAuth as a restricted feature for protected VMs
>         commit: 21de26dbc5170dde8e4dfbfa1ecb77804ed6a377
> [17/17] KVM: arm64: Trap external trace for protected VMs
>         commit: 9d52612690985fc0ee1ae1fbad61530a4f6bbb53
>
> Cheers,
>
>         M.
> --
> Without deviation from the norm, progress is not possible.
>
>