This series is based on v4.11-rc2. My hope is to take this series via the MIPS KVM tree for 4.12, possibly with a topic branch containing the MIPS architecture changes (patches 1-6). This series implements basic support for the MIPS Virtualization Module (generally known as VZ) in KVM, which adds a new "guest" processor mode with a partial guest Cop0 state and guest TLB to complement the existing "root" (host) modes & state, allowing for far fewer traps to the hypervisor compared to the existing Trap & Emulate implementation of KVM for MIPS, as well as fully virtualizing the guest virtual memory space to run unmodified kernels. The MIPS32 and MIPS64 VZ architecture documentation can be found here: http://wiki.prplfoundation.org/w/images/f/fd/MD00846-2B-VZMIPS32-AFP-01.06.pdf http://wiki.prplfoundation.org/w/images/f/fe/MD00847-2B-VZMIPS64-AFP-01.06.pdf We primarily support the ImgTec P5600, P6600, and I6400 cores so far, including the following VZ / guest hardware features: - MIPS32 and MIPS64, r5 (VZ requires r5 or later) and r6 - TLBs with GuestID (IMG cores) or Root ASID Dealias (Octeon III) - Shared physical root/guest TLB (IMG cores) - FPU / MSA - Cop0 timer (up to 1GHz for now due to soft timer limit) - Segmentation control (EVA) - Hardware page table walker (HTW) both for root and guest TLB Limitations: - Support for Cavium Octeon III will follow shortly in a separate series - Perf counters and watch registers not exposed to guest in this series (the patches require some further cleanup) - Guest microMIPS not supported yet (e.g. M5150) - Guest XPA not supported yet (e.g. P5600) We start with some preliminary MIPS changes in patches 1-6, including some MAAR definition refactoring for XPA and some new guest capabilities and accessors. Patches 7-17 make preliminary VZ changes in KVM, including 64-bit MMIO support, the VZ, TE and 64BIT KVM capabilities, and new implementation callbacks used by the VZ implementation. Patches 18-23 get into some meatier KVM changes for VZ, such as abstracting guest register access for common code and adding VZ entry and TLB management code. Patches 24-25 add the bulk of the core VZ support and enable it in the build system. Patches 26-31 then go on to implement support for various optional architectural features, such as segmentation control (EVA) and hardware page table walkers (HTW). Context switching of the guest state may be incomplete on certain cores without these patches if the features in question can't be disabled in the guest context. Finally patches 32-33 implement support for features that can be easily disabled at runtime, namely the hardware guest timer (which can be emulated in software before patch 32) and tracing of guest mode changes using VZ's CP0_GuestCtl0.MC bit. Changes in v2: - Drop KVM_VM_MIPS_DEFAULT (Paolo) - Make various VZ handler functions static - Add KVM_CAP_MIPS_TE capability so that userland can determine whether T&E is available when VZ is also available. - Fix section number in API documentation for 64BIT capability, which was accidentally left unchanged after a rebase on the KVM changes for v4.11. - Patch 1 of hypercall series incorporated into this series. Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> Cc: "Radim Krčmář" <rkrcmar@xxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Andreas Herrmann <andreas.herrmann@xxxxxxxxxxxxxxxxxx> Cc: David Daney <david.daney@xxxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Paul Burton <paul.burton@xxxxxxxxxx> Cc: Jonathan Corbet <corbet@xxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx Cc: kvm@xxxxxxxxxxxxxxx Cc: linux-doc@xxxxxxxxxxxxxxx James Hogan (33): MIPS: Add defs & probing of UFR MIPS: Separate MAAR V bit into VL and VH for XPA MIPS: Probe guest CP0_UserLocal MIPS: Probe guest MVH MIPS: Add some missing guest CP0 accessors & defs MIPS: asm/tlb.h: Add UNIQUE_GUEST_ENTRYHI() macro KVM: MIPS: Implement HYPCALL emulation KVM: MIPS/Emulate: De-duplicate MMIO emulation KVM: MIPS/Emulate: Implement 64-bit MMIO emulation KVM: MIPS: Update kvm_lose_fpu() for VZ KVM: MIPS: Extend counters & events for VZ GExcCodes KVM: MIPS: Add VZ & TE capabilities KVM: MIPS: Add 64BIT capability KVM: MIPS: Init timer frequency from callback KVM: MIPS: Add callback to check extension KVM: MIPS: Add hardware_{enable,disable} callback KVM: MIPS: Add guest exit exception callback KVM: MIPS: Abstract guest CP0 register access for VZ KVM: MIPS/Entry: Update entry code to support VZ KVM: MIPS/TLB: Add VZ TLB management KVM: MIPS/Emulate: Update CP0_Compare emulation for VZ KVM: MIPS/Emulate: Drop CACHE emulation for VZ KVM: MIPS: Update exit handler for VZ KVM: MIPS: Implement VZ support KVM: MIPS: Add VZ support to build system KVM: MIPS/VZ: Support guest CP0_BadInstr[P] KVM: MIPS/VZ: Support guest CP0_[X]ContextConfig KVM: MIPS/VZ: Support guest segmentation control KVM: MIPS/VZ: Support guest hardware page table walker KVM: MIPS/VZ: Support guest load-linked bit KVM: MIPS/VZ: Emulate MAARs when necessary KVM: MIPS/VZ: Support hardware guest timer KVM: MIPS/VZ: Trace guest mode changes Documentation/virtual/kvm/api.txt | 90 +- Documentation/virtual/kvm/hypercalls.txt | 5 +- arch/mips/include/asm/cpu-features.h | 10 +- arch/mips/include/asm/cpu-info.h | 2 +- arch/mips/include/asm/cpu.h | 1 +- arch/mips/include/asm/kvm_host.h | 467 ++- arch/mips/include/asm/maar.h | 10 +- arch/mips/include/asm/mipsregs.h | 24 +- arch/mips/include/asm/tlb.h | 6 +- arch/mips/include/uapi/asm/inst.h | 2 +- arch/mips/include/uapi/asm/kvm.h | 20 +- arch/mips/kernel/cpu-probe.c | 13 +- arch/mips/kernel/time.c | 1 +- arch/mips/kvm/Kconfig | 28 +- arch/mips/kvm/Makefile | 9 +- arch/mips/kvm/emulate.c | 373 +-- arch/mips/kvm/entry.c | 132 +- arch/mips/kvm/hypcall.c | 53 +- arch/mips/kvm/interrupt.h | 5 +- arch/mips/kvm/mips.c | 120 +- arch/mips/kvm/mmu.c | 20 +- arch/mips/kvm/tlb.c | 411 +++- arch/mips/kvm/trace.h | 74 +- arch/mips/kvm/trap_emul.c | 65 +- arch/mips/kvm/vz.c | 3133 +++++++++++++++++++++++- arch/mips/mm/init.c | 2 +- include/uapi/linux/kvm.h | 7 +- 27 files changed, 4764 insertions(+), 319 deletions(-) create mode 100644 arch/mips/kvm/hypcall.c create mode 100644 arch/mips/kvm/vz.c -- git-series 0.8.10
