Commit ef12ea62 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'loongarch-kvm-6.7' of... 

Merge tag 'loongarch-kvm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson into HEAD

LoongArch KVM changes for v6.7

Add LoongArch's KVM support. Loongson 3A5000/3A6000 supports hardware
assisted virtualization. With cpu virtualization, there are separate
hw-supported user mode and kernel mode in guest mode. With memory
virtualization, there are two-level hw mmu table for guest mode and host
mode. Also there is separate hw cpu timer with consant frequency in
guest mode, so that vm can migrate between hosts with different freq.
Currently, we are able to boot LoongArch Linux Guests.

Few key aspects of KVM LoongArch added by this series are:
1. Enable kvm hardware function when kvm module is loaded.
2. Implement VM and vcpu related ioctl interface such as vcpu create,
   vcpu run etc. GET_ONE_REG/SET_ONE_REG ioctl commands are use to
   get general registers one by one.
3. Hardware access about MMU, timer and csr are emulated in kernel.
4. Hardwares such as mmio and iocsr device are emulated in user space
   such as IPI, irqchips, pci devices etc.
parents ffc25326 2c10cda4

Documentation/virt/kvm/api.rst

+61 −9
Original line number Diff line number Diff line
@@ -416,6 +416,13 @@ Reads the general purpose registers from the vcpu. 
	__u64 pc;

  };



  /* LoongArch */

  struct kvm_regs {

	/* out (KVM_GET_REGS) / in (KVM_SET_REGS) */

	unsigned long gpr[32];

	unsigned long pc;

  };





4.12 KVM_SET_REGS

-----------------
@@ -506,7 +513,7 @@ translation mode. 
------------------



:Capability: basic

:Architectures: x86, ppc, mips, riscv

:Architectures: x86, ppc, mips, riscv, loongarch

:Type: vcpu ioctl

:Parameters: struct kvm_interrupt (in)

:Returns: 0 on success, negative on failure.
@@ -592,6 +599,14 @@ b) KVM_INTERRUPT_UNSET 


This is an asynchronous vcpu ioctl and can be invoked from any thread.



LOONGARCH:

^^^^^^^^^^



Queues an external interrupt to be injected into the virtual CPU. A negative

interrupt number dequeues the interrupt.



This is an asynchronous vcpu ioctl and can be invoked from any thread.





4.17 KVM_DEBUG_GUEST

--------------------
@@ -737,7 +752,7 @@ signal mask. 
----------------



:Capability: basic

:Architectures: x86

:Architectures: x86, loongarch

:Type: vcpu ioctl

:Parameters: struct kvm_fpu (out)

:Returns: 0 on success, -1 on error
@@ -746,7 +761,7 @@ Reads the floating point state from the vcpu. 


::



  /* for KVM_GET_FPU and KVM_SET_FPU */

  /* x86: for KVM_GET_FPU and KVM_SET_FPU */

  struct kvm_fpu {

	__u8  fpr[8][16];

	__u16 fcw;
@@ -761,12 +776,21 @@ Reads the floating point state from the vcpu. 
	__u32 pad2;

  };



  /* LoongArch: for KVM_GET_FPU and KVM_SET_FPU */

  struct kvm_fpu {

	__u32 fcsr;

	__u64 fcc;

	struct kvm_fpureg {

		__u64 val64[4];

	}fpr[32];

  };





4.23 KVM_SET_FPU

----------------



:Capability: basic

:Architectures: x86

:Architectures: x86, loongarch

:Type: vcpu ioctl

:Parameters: struct kvm_fpu (in)

:Returns: 0 on success, -1 on error
@@ -775,7 +799,7 @@ Writes the floating point state to the vcpu. 


::



  /* for KVM_GET_FPU and KVM_SET_FPU */

  /* x86: for KVM_GET_FPU and KVM_SET_FPU */

  struct kvm_fpu {

	__u8  fpr[8][16];

	__u16 fcw;
@@ -790,6 +814,15 @@ Writes the floating point state to the vcpu. 
	__u32 pad2;

  };



  /* LoongArch: for KVM_GET_FPU and KVM_SET_FPU */

  struct kvm_fpu {

	__u32 fcsr;

	__u64 fcc;

	struct kvm_fpureg {

		__u64 val64[4];

	}fpr[32];

  };





4.24 KVM_CREATE_IRQCHIP

-----------------------
@@ -1387,7 +1420,7 @@ documentation when it pops into existence). 
-------------------



:Capability: KVM_CAP_ENABLE_CAP

:Architectures: mips, ppc, s390, x86

:Architectures: mips, ppc, s390, x86, loongarch

:Type: vcpu ioctl

:Parameters: struct kvm_enable_cap (in)

:Returns: 0 on success; -1 on error
@@ -1442,7 +1475,7 @@ for vm-wide capabilities. 
---------------------



:Capability: KVM_CAP_MP_STATE

:Architectures: x86, s390, arm64, riscv

:Architectures: x86, s390, arm64, riscv, loongarch

:Type: vcpu ioctl

:Parameters: struct kvm_mp_state (out)

:Returns: 0 on success; -1 on error
@@ -1460,7 +1493,7 @@ Possible values are: 


   ==========================    ===============================================

   KVM_MP_STATE_RUNNABLE         the vcpu is currently running

                                 [x86,arm64,riscv]

                                 [x86,arm64,riscv,loongarch]

   KVM_MP_STATE_UNINITIALIZED    the vcpu is an application processor (AP)

                                 which has not yet received an INIT signal [x86]

   KVM_MP_STATE_INIT_RECEIVED    the vcpu has received an INIT signal, and is
@@ -1516,11 +1549,14 @@ For riscv: 
The only states that are valid are KVM_MP_STATE_STOPPED and

KVM_MP_STATE_RUNNABLE which reflect if the vcpu is paused or not.



On LoongArch, only the KVM_MP_STATE_RUNNABLE state is used to reflect

whether the vcpu is runnable.



4.39 KVM_SET_MP_STATE

---------------------



:Capability: KVM_CAP_MP_STATE

:Architectures: x86, s390, arm64, riscv

:Architectures: x86, s390, arm64, riscv, loongarch

:Type: vcpu ioctl

:Parameters: struct kvm_mp_state (in)

:Returns: 0 on success; -1 on error
@@ -1538,6 +1574,9 @@ For arm64/riscv: 
The only states that are valid are KVM_MP_STATE_STOPPED and

KVM_MP_STATE_RUNNABLE which reflect if the vcpu should be paused or not.



On LoongArch, only the KVM_MP_STATE_RUNNABLE state is used to reflect

whether the vcpu is runnable.



4.40 KVM_SET_IDENTITY_MAP_ADDR

------------------------------
@@ -2841,6 +2880,19 @@ Following are the RISC-V D-extension registers: 
  0x8020 0000 0600 0020 fcsr      Floating point control and status register

======================= ========= =============================================



LoongArch registers are mapped using the lower 32 bits. The upper 16 bits of

that is the register group type.



LoongArch csr registers are used to control guest cpu or get status of guest

cpu, and they have the following id bit patterns::



  0x9030 0000 0001 00 <reg:5> <sel:3>   (64-bit)



LoongArch KVM control registers are used to implement some new defined functions

such as set vcpu counter or reset vcpu, and they have the following id bit patterns::



  0x9030 0000 0002 <reg:16>





4.69 KVM_GET_ONE_REG

--------------------

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -11522,6 +11522,18 @@ F: include/kvm/arm_* 
F:	tools/testing/selftests/kvm/*/aarch64/

F:	tools/testing/selftests/kvm/aarch64/









KERNEL VIRTUAL MACHINE FOR LOONGARCH (KVM/LoongArch)









M:	Tianrui Zhao <zhaotianrui@loongson.cn>









M:	Bibo Mao <maobibo@loongson.cn>









M:	Huacai Chen <chenhuacai@kernel.org>









L:	kvm@vger.kernel.org









L:	loongarch@lists.linux.dev









S:	Maintained









T:	git git://git.kernel.org/pub/scm/virt/kvm/kvm.git









F:	arch/loongarch/include/asm/kvm*









F:	arch/loongarch/include/uapi/asm/kvm*









F:	arch/loongarch/kvm/

















KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)









M:	Huacai Chen <chenhuacai@kernel.org>









L:	linux-mips@vger.kernel.org
































arch/loongarch/Kbuild



+2
−0






























Original line number
Diff line number
Diff line







@@ -3,5 +3,7 @@ obj-y += mm/







obj-y += net/









obj-y += vdso/



















obj-$(CONFIG_KVM) += kvm/



















# for cleaning









subdir- += boot
























arch/loongarch/Kconfig



+6
−0






























Original line number
Diff line number
Diff line







@@ -129,6 +129,7 @@ config LOONGARCH







	select HAVE_KPROBES









	select HAVE_KPROBES_ON_FTRACE









	select HAVE_KRETPROBES









	select HAVE_KVM









	select HAVE_MOD_ARCH_SPECIFIC









	select HAVE_NMI









	select HAVE_PCI








@@ -263,6 +264,9 @@ config AS_HAS_LASX_EXTENSION







config AS_HAS_LBT_EXTENSION









	def_bool $(as-instr,movscr2gr \$a0$(comma)\$scr0)



















config AS_HAS_LVZ_EXTENSION









	def_bool $(as-instr,hvcl 0)



















menu "Kernel type and options"



















source "kernel/Kconfig.hz"








@@ -676,3 +680,5 @@ source "kernel/power/Kconfig"







source "drivers/acpi/Kconfig"



















endmenu



















source "arch/loongarch/kvm/Kconfig"
























arch/loongarch/configs/loongson3_defconfig



+2
−0






























Original line number
Diff line number
Diff line







@@ -66,6 +66,8 @@ CONFIG_EFI_ZBOOT=y







CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y









CONFIG_EFI_CAPSULE_LOADER=m









CONFIG_EFI_TEST=m









CONFIG_VIRTUALIZATION=y









CONFIG_KVM=m









CONFIG_JUMP_LABEL=y









CONFIG_MODULES=y









CONFIG_MODULE_FORCE_LOAD=y