As we progress towards being able to keep the guest state private to
the nVHE hypervisor, this series aims at moving anything that touches
the registers involved into an exception to EL2.
The general idea is that any update to these registers is driven by a
set of flags passed from EL1 to EL2, and EL2 will deal with the
register update itself, removing the need for EL1 to see the guest
state. It also results in a bunch of cleanup, mostly in the 32bit
department (negative diffstat, yay!).
Of course, none of that has any real effect on security yet. It is
only once we start having a private VCPU structure at EL2 that we can
enforce the isolation. Similarly, there is no policy enforcement, and
a malicious EL1 can still inject exceptions at random points. It can
also give bogus ESR values to the guest. Baby steps.
M.
* From v1 [1]
- Fix __kvm_skip_instr() unexpected recursion
- Fix HVC fixup updating the in-memory state instead of the guest's
- Dropped facilities for IRQ/FIQ/SError exception injection
- Simplified VHE/nVHE differences in exception injection
- Moved AArch32 exception injection over to AArch64 sysregs
- Use compat_lr_* instead of hardcoded registers
- Schpelling fyxes
[1] https://lore.kernel.org/r/20201026133450.73304-1-maz@xxxxxxxxxx
Marc Zyngier (11):
KVM: arm64: Don't adjust PC on SError during SMC trap
KVM: arm64: Move kvm_vcpu_trap_il_is32bit into kvm_skip_instr32()
KVM: arm64: Make kvm_skip_instr() and co private to HYP
KVM: arm64: Move PC rollback on SError to HYP
KVM: arm64: Move VHE direct sysreg accessors into kvm_host.h
KVM: arm64: Add basic hooks for injecting exceptions from EL2
KVM: arm64: Inject AArch64 exceptions from HYP
KVM: arm64: Inject AArch32 exceptions from HYP
KVM: arm64: Remove SPSR manipulation primitives
KVM: arm64: Consolidate exception injection
KVM: arm64: Get rid of the AArch32 register mapping code
arch/arm64/include/asm/kvm_emulate.h | 70 +----
arch/arm64/include/asm/kvm_host.h | 118 +++++++-
arch/arm64/kvm/Makefile | 4 +-
arch/arm64/kvm/aarch32.c | 232 ---------------
arch/arm64/kvm/guest.c | 28 +-
arch/arm64/kvm/handle_exit.c | 23 +-
arch/arm64/kvm/hyp/aarch32.c | 4 +-
arch/arm64/kvm/hyp/exception.c | 331 +++++++++++++++++++++
arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 62 ++++
arch/arm64/kvm/hyp/include/hyp/switch.h | 17 ++
arch/arm64/kvm/hyp/nvhe/Makefile | 2 +-
arch/arm64/kvm/hyp/nvhe/switch.c | 3 +
arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 +
arch/arm64/kvm/hyp/vgic-v3-sr.c | 2 +
arch/arm64/kvm/hyp/vhe/Makefile | 2 +-
arch/arm64/kvm/hyp/vhe/switch.c | 3 +
arch/arm64/kvm/inject_fault.c | 189 +++++-------
arch/arm64/kvm/mmio.c | 2 +-
arch/arm64/kvm/mmu.c | 2 +-
arch/arm64/kvm/regmap.c | 224 --------------
arch/arm64/kvm/sys_regs.c | 83 +-----
21 files changed, 666 insertions(+), 737 deletions(-)
delete mode 100644 arch/arm64/kvm/aarch32.c
create mode 100644 arch/arm64/kvm/hyp/exception.c
create mode 100644 arch/arm64/kvm/hyp/include/hyp/adjust_pc.h
delete mode 100644 arch/arm64/kvm/regmap.c
--
2.28.0
