Add loongarch kvm accel support
Subsystems (2)
v4 cover Add loongarch kvm accel support
The linux headers in this patch synchronized from linux kernel v6.7.0-rc8, and the loongarch kvm part of this patch series based on the header files. And the linux kernel has added the loongarch kvm support in master branch.
This series add loongarch kvm support, mainly implement some interfaces used by kvm, such as kvm_arch_get/set_regs, kvm_arch_handle_exit, kvm_loongarch_set_interrupt, etc.
Currently, we are able to boot LoongArch KVM Linux Guests. In loongarch VM, mmio devices and iocsr devices are emulated in user space such as APIC, IPI, pci devices, etc, other hardwares such as MMU, timer and csr are emulated in kernel.
The running environment of LoongArch virt machine:
1. Get the Linux KVM environment of LoongArch in Linux mainline.
make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu- loongson3_defconfig make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu-
2. Get the qemu source: https://github.com/loongson/qemu
git checkout kvm-loongarch
./configure --target-list="loongarch64-softmmu" --enable-kvm
make
3. Get uefi bios of LoongArch virt machine:
4. Also you can access the binary files we have already built:
https://github.com/yangxiaojuan-loongson/qemu-binary
The command to boot loongarch virt machine:
$ qemu-system-loongarch64 -machine virt -m 4G -cpu la464 \ -smp 1 -bios QEMU_EFI.fd -kernel vmlinuz.efi -initrd ramdisk \ -serial stdio -monitor telnet:localhost:4495,server,nowait \ -append "root=/dev/ram rdinit=/sbin/init console=ttyS0,115200" \ --nographic
Changes for v4:
1. Synchronize linux headers from linux v6.7.0-rc8.
2. Move kvm.c and kvm_loongarch.h into target/loongarch/kvm/ directory.
3. Add "#ifndef CONFIG_USER_ONLY" before loongarch_cpu_do_interrupt to fix compiling issue.
4. Remove "#ifdef CONFIG_TCG" before "#include "exec/cpu_ldst.h"" in fpu_helper.c, As it has been changed in other patches.
Changes for v3:
1. Synchronize linux headers from linux v6.7.0-rc7.
2. Fix compiling error when config enable-kvm and disable-tcg at one time.
Changes for v2:
1. Synchronize linux headers from linux v6.7.0-rc6.
2. Remove the stub function: kvm_loongarch_set_interrupt, as kvm_enabled
3. Move the kvm function such as kvm_arch_reset_vcpu from cpu.h to loongarch_kvm.h, and supplement "#include <cpu.h>" in loongarch_kvm.h.
Changes for v1:
1. Synchronous KVM headers about LoongArch KVM form linux kernel, as the LoongArch KVM patch series have been accepted by linux kernel.
2. Remove the KVM_GET/SET_ONE_UREG64 macro in target/loongarch, and use the common interface kvm_get/set_one_reg to replace it.
3. Resolve the compiling errors when LoongArch is built by other archs.
Tianrui Zhao (9):
linux-headers: Synchronize linux headers from linux v6.7.0-rc8 target/loongarch: Define some kvm_arch interfaces target/loongarch: Supplement vcpu env initial when vcpu reset target/loongarch: Implement kvm get/set registers target/loongarch: Implement kvm_arch_init function target/loongarch: Implement kvm_arch_init_vcpu target/loongarch: Implement kvm_arch_handle_exit target/loongarch: Implement set vcpu intr for kvm target/loongarch: Add loongarch kvm into meson build
include/standard-headers/drm/drm_fourcc.h | 2 + include/standard-headers/linux/fuse.h | 10 +- include/standard-headers/linux/pci_regs.h | 24 +- include/standard-headers/linux/vhost_types.h | 7 + .../standard-headers/linux/virtio_config.h | 5 + include/standard-headers/linux/virtio_pci.h | 11 + linux-headers/asm-arm64/kvm.h | 32 + linux-headers/asm-generic/unistd.h | 14 +- linux-headers/asm-loongarch/bitsperlong.h | 1 + linux-headers/asm-loongarch/kvm.h | 108 +++ linux-headers/asm-loongarch/mman.h | 1 + linux-headers/asm-loongarch/unistd.h | 5 + linux-headers/asm-mips/unistd_n32.h | 4 + linux-headers/asm-mips/unistd_n64.h | 4 + linux-headers/asm-mips/unistd_o32.h | 4 + linux-headers/asm-powerpc/unistd_32.h | 4 + linux-headers/asm-powerpc/unistd_64.h | 4 + linux-headers/asm-riscv/kvm.h | 12 + linux-headers/asm-s390/unistd_32.h | 4 + linux-headers/asm-s390/unistd_64.h | 4 + linux-headers/asm-x86/unistd_32.h | 4 + linux-headers/asm-x86/unistd_64.h | 3 + linux-headers/asm-x86/unistd_x32.h | 3 + linux-headers/linux/iommufd.h | 180 +++- linux-headers/linux/kvm.h | 11 + linux-headers/linux/psp-sev.h | 1 + linux-headers/linux/stddef.h | 9 +- linux-headers/linux/userfaultfd.h | 9 +- linux-headers/linux/vfio.h | 47 +- linux-headers/linux/vhost.h | 8 + meson.build | 3 + target/loongarch/cpu.c | 39 +- target/loongarch/cpu.h | 5 +- target/loongarch/internals.h | 5 +- target/loongarch/kvm/kvm.c | 768 ++++++++++++++++++ target/loongarch/kvm/kvm_loongarch.h | 16 + target/loongarch/kvm/meson.build | 1 + target/loongarch/meson.build | 1 + target/loongarch/trace-events | 15 + target/loongarch/trace.h | 1 + 40 files changed, 1348 insertions(+), 41 deletions(-) create mode 100644 linux-headers/asm-loongarch/bitsperlong.h create mode 100644 linux-headers/asm-loongarch/kvm.h create mode 100644 linux-headers/asm-loongarch/mman.h create mode 100644 linux-headers/asm-loongarch/unistd.h create mode 100644 target/loongarch/kvm/kvm.c create mode 100644 target/loongarch/kvm/kvm_loongarch.h create mode 100644 target/loongarch/kvm/meson.build create mode 100644 target/loongarch/trace-events create mode 100644 target/loongarch/trace.h
Signature · 1 line
2.39.1
PATCH v4 1/9 linux-headers: Synchronize linux headers from linux v6.7.0-rc8
Use the scripts/update-linux-headers.sh to synchronize linux headers from linux v6.7.0-rc8. We mainly want to add the loongarch linux headers and then add the loongarch kvm support based on it.
--- include/standard-headers/drm/drm_fourcc.h | 2 + include/standard-headers/linux/fuse.h | 10 +- include/standard-headers/linux/pci_regs.h | 24 ++- include/standard-headers/linux/vhost_types.h | 7 + .../standard-headers/linux/virtio_config.h | 5 + include/standard-headers/linux/virtio_pci.h | 11 ++ linux-headers/asm-arm64/kvm.h | 32 ++++ linux-headers/asm-generic/unistd.h | 14 +- linux-headers/asm-loongarch/bitsperlong.h | 1 + linux-headers/asm-loongarch/kvm.h | 108 +++++++++++ linux-headers/asm-loongarch/mman.h | 1 + linux-headers/asm-loongarch/unistd.h | 5 + linux-headers/asm-mips/unistd_n32.h | 4 + linux-headers/asm-mips/unistd_n64.h | 4 + linux-headers/asm-mips/unistd_o32.h | 4 + linux-headers/asm-powerpc/unistd_32.h | 4 + linux-headers/asm-powerpc/unistd_64.h | 4 + linux-headers/asm-riscv/kvm.h | 12 ++ linux-headers/asm-s390/unistd_32.h | 4 + linux-headers/asm-s390/unistd_64.h | 4 + linux-headers/asm-x86/unistd_32.h | 4 + linux-headers/asm-x86/unistd_64.h | 3 + linux-headers/asm-x86/unistd_x32.h | 3 + linux-headers/linux/iommufd.h | 180 +++++++++++++++++- linux-headers/linux/kvm.h | 11 ++ linux-headers/linux/psp-sev.h | 1 + linux-headers/linux/stddef.h | 9 +- linux-headers/linux/userfaultfd.h | 9 +- linux-headers/linux/vfio.h | 47 +++-- linux-headers/linux/vhost.h | 8 + 30 files changed, 504 insertions(+), 31 deletions(-) create mode 100644 linux-headers/asm-loongarch/bitsperlong.h create mode 100644 linux-headers/asm-loongarch/kvm.h create mode 100644 linux-headers/asm-loongarch/mman.h create mode 100644 linux-headers/asm-loongarch/unistd.h
include/standard-headers/drm/drm_fourcc.h +2 -0
@@ -322,6 +322,8 @@ extern "C" {* index 1 = Cr:Cb plane, [39:0] Cr1:Cb1:Cr0:Cb0 little endian */ #define DRM_FORMAT_NV15 fourcc_code('N', 'V', '1', '5')/* 2x2 subsampled Cr:Cb plane */ +#define DRM_FORMAT_NV20 fourcc_code('N', 'V', '2', '0')/* 2x1 subsampled Cr:Cb plane */ +#define DRM_FORMAT_NV30 fourcc_code('N', 'V', '3', '0')/* non-subsampled Cr:Cb plane */ /* * 2 plane YCbCr MSB aligned
include/standard-headers/linux/fuse.h +6 -4
@@ -209,7 +209,7 @@* - add FUSE_HAS_EXPIRE_ONLY * * 7.39 -* - add FUSE_DIRECT_IO_RELAX +* - add FUSE_DIRECT_IO_ALLOW_MMAP * - add FUSE_STATX and related structures */
@@ -405,8 +405,7 @@ struct fuse_file_lock {* FUSE_CREATE_SUPP_GROUP: add supplementary group info to create, mkdir, * symlink and mknod (single group that matches parent) * FUSE_HAS_EXPIRE_ONLY: kernel supports expiry-only entry invalidation -* FUSE_DIRECT_IO_RELAX: relax restrictions in FOPEN_DIRECT_IO mode, for now -* allow shared mmap +* FUSE_DIRECT_IO_ALLOW_MMAP: allow shared mmap in FOPEN_DIRECT_IO mode. */ #define FUSE_ASYNC_READ (1 << 0)#define FUSE_POSIX_LOCKS (1 << 1)
@@ -445,7 +444,10 @@ struct fuse_file_lock {#define FUSE_HAS_INODE_DAX (1ULL << 33)#define FUSE_CREATE_SUPP_GROUP (1ULL << 34)#define FUSE_HAS_EXPIRE_ONLY (1ULL << 35) -#define FUSE_DIRECT_IO_RELAX (1ULL << 36) +#define FUSE_DIRECT_IO_ALLOW_MMAP (1ULL << 36) + +/* Obsolete alias for FUSE_DIRECT_IO_ALLOW_MMAP */ +#define FUSE_DIRECT_IO_RELAX FUSE_DIRECT_IO_ALLOW_MMAP/** * CUSE INIT request/reply flags
include/standard-headers/linux/pci_regs.h +19 -5
@@ -80,6 +80,7 @@#define PCI_HEADER_TYPE_NORMAL 0#define PCI_HEADER_TYPE_BRIDGE 1#define PCI_HEADER_TYPE_CARDBUS 2 +#define PCI_HEADER_TYPE_MFD 0x80/* Multi-Function Device (possible) */ #define PCI_BIST 0x0f/* 8 bits */ #define PCI_BIST_CODE_MASK 0x0f/* Return result */
@@ -637,6 +638,7 @@#define PCI_EXP_RTCAP 0x1e/* Root Capabilities */ #define PCI_EXP_RTCAP_CRSVIS 0x0001/* CRS Software Visibility capability */ #define PCI_EXP_RTSTA 0x20/* Root Status */ +#define PCI_EXP_RTSTA_PME_RQ_ID 0x0000ffff/* PME Requester ID */ #define PCI_EXP_RTSTA_PME 0x00010000/* PME status */ #define PCI_EXP_RTSTA_PENDING 0x00020000/* PME pending */ /*
@@ -930,12 +932,13 @@/* Process Address Space ID */ #define PCI_PASID_CAP 0x04/* PASID feature register */ -#define PCI_PASID_CAP_EXEC 0x02/* Exec permissions Supported */ -#define PCI_PASID_CAP_PRIV 0x04/* Privilege Mode Supported */ +#define PCI_PASID_CAP_EXEC 0x0002/* Exec permissions Supported */ +#define PCI_PASID_CAP_PRIV 0x0004/* Privilege Mode Supported */ +#define PCI_PASID_CAP_WIDTH 0x1f00#define PCI_PASID_CTRL 0x06/* PASID control register */ -#define PCI_PASID_CTRL_ENABLE 0x01/* Enable bit */ -#define PCI_PASID_CTRL_EXEC 0x02/* Exec permissions Enable */ -#define PCI_PASID_CTRL_PRIV 0x04/* Privilege Mode Enable */ +#define PCI_PASID_CTRL_ENABLE 0x0001/* Enable bit */ +#define PCI_PASID_CTRL_EXEC 0x0002/* Exec permissions Enable */ +#define PCI_PASID_CTRL_PRIV 0x0004/* Privilege Mode Enable */ #define PCI_EXT_CAP_PASID_SIZEOF 8/* Single Root I/O Virtualization */
@@ -975,6 +978,8 @@#define PCI_LTR_VALUE_MASK 0x000003ff#define PCI_LTR_SCALE_MASK 0x00001c00#define PCI_LTR_SCALE_SHIFT 10 +#define PCI_LTR_NOSNOOP_VALUE 0x03ff0000/* Max No-Snoop Latency Value */ +#define PCI_LTR_NOSNOOP_SCALE 0x1c000000/* Scale for Max Value */ #define PCI_EXT_CAP_LTR_SIZEOF 8/* Access Control Service */
@@ -1042,9 +1047,16 @@#define PCI_EXP_DPC_STATUS 0x08/* DPC Status */ #define PCI_EXP_DPC_STATUS_TRIGGER 0x0001/* Trigger Status */ #define PCI_EXP_DPC_STATUS_TRIGGER_RSN 0x0006/* Trigger Reason */ +#define PCI_EXP_DPC_STATUS_TRIGGER_RSN_UNCOR 0x0000/* Uncorrectable error */ +#define PCI_EXP_DPC_STATUS_TRIGGER_RSN_NFE 0x0002/* Rcvd ERR_NONFATAL */ +#define PCI_EXP_DPC_STATUS_TRIGGER_RSN_FE 0x0004/* Rcvd ERR_FATAL */ +#define PCI_EXP_DPC_STATUS_TRIGGER_RSN_IN_EXT 0x0006/* Reason in Trig Reason Extension field */ #define PCI_EXP_DPC_STATUS_INTERRUPT 0x0008/* Interrupt Status */ #define PCI_EXP_DPC_RP_BUSY 0x0010/* Root Port Busy */ #define PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT 0x0060/* Trig Reason Extension */ +#define PCI_EXP_DPC_STATUS_TRIGGER_RSN_RP_PIO 0x0000/* RP PIO error */ +#define PCI_EXP_DPC_STATUS_TRIGGER_RSN_SW_TRIGGER 0x0020/* DPC SW Trigger bit */ +#define PCI_EXP_DPC_RP_PIO_FEP 0x1f00/* RP PIO First Err Ptr */ #define PCI_EXP_DPC_SOURCE_ID 0x0A/* DPC Source Identifier */
@@ -1088,6 +1100,8 @@#define PCI_L1SS_CTL1_LTR_L12_TH_VALUE 0x03ff0000/* LTR_L1.2_THRESHOLD_Value */ #define PCI_L1SS_CTL1_LTR_L12_TH_SCALE 0xe0000000/* LTR_L1.2_THRESHOLD_Scale */ #define PCI_L1SS_CTL2 0x0c/* Control 2 Register */ +#define PCI_L1SS_CTL2_T_PWR_ON_SCALE 0x00000003/* T_POWER_ON Scale */ +#define PCI_L1SS_CTL2_T_PWR_ON_VALUE 0x000000f8/* T_POWER_ON Value */ /* Designated Vendor-Specific (DVSEC, PCI_EXT_CAP_ID_DVSEC) */ #define PCI_DVSEC_HEADER1 0x4/* Designated Vendor-Specific Header1 */
include/standard-headers/linux/vhost_types.h +7 -0
@@ -185,5 +185,12 @@ struct vhost_vdpa_iova_range {* DRIVER_OK */ #define VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK 0x6 +/* Device may expose the virtqueue's descriptor area, driver area and +* device area to a different group for ASID binding than where its +* buffers may reside. Requires VHOST_BACKEND_F_IOTLB_ASID. +*/ +#define VHOST_BACKEND_F_DESC_ASID 0x7 +/* IOTLB don't flush memory mapping across device reset */ +#define VHOST_BACKEND_F_IOTLB_PERSIST 0x8#endif
include/standard-headers/linux/virtio_config.h +5 -0
@@ -103,6 +103,11 @@*/ #define VIRTIO_F_NOTIFICATION_DATA 38 +/* This feature indicates that the driver uses the data provided by the device +* as a virtqueue identifier in available buffer notifications. +*/ +#define VIRTIO_F_NOTIF_CONFIG_DATA 39 +/* * This feature indicates that the driver can reset a queue individually. */
include/standard-headers/linux/virtio_pci.h +11 -0
@@ -166,6 +166,17 @@ struct virtio_pci_common_cfg {uint32_t queue_used_hi;/* read-write */ }; +/* +* Warning: do not use sizeof on this: use offsetofend for +* specific fields you need. +*/ +struct virtio_pci_modern_common_cfg { +struct virtio_pci_common_cfg cfg; + +uint16_t queue_notify_data;/* read-write */ +uint16_t queue_reset;/* read-write */ +}; +/* Fields in VIRTIO_PCI_CAP_PCI_CFG: */ struct virtio_pci_cfg_cap {struct virtio_pci_cap cap;
linux-headers/asm-arm64/kvm.h +32 -0
@@ -491,6 +491,38 @@ struct kvm_smccc_filter {#define KVM_HYPERCALL_EXIT_SMC (1U << 0)#define KVM_HYPERCALL_EXIT_16BIT (1U << 1) +/* +* Get feature ID registers userspace writable mask. +* +* From DDI0487J.a, D19.2.66 ("ID_AA64MMFR2_EL1, AArch64 Memory Model +* Feature Register 2"): +* +* "The Feature ID space is defined as the System register space in +* AArch64 with op0==3, op1=={0, 1, 3}, CRn==0, CRm=={0-7}, +* op2=={0-7}." +* +* This covers all currently known R/O registers that indicate +* anything useful feature wise, including the ID registers. +* +* If we ever need to introduce a new range, it will be described as +* such in the range field. +*/ +#define KVM_ARM_FEATURE_ID_RANGE_IDX (op0, op1, crn, crm, op2) \ + ({ \ + __u64 __op1 = (op1) & 3; \ + __op1 -= (__op1 == 3); \ + (__op1 << 6 | ((crm) & 7) << 3 | (op2)); \ + }) + +#define KVM_ARM_FEATURE_ID_RANGE 0 +#define KVM_ARM_FEATURE_ID_RANGE_SIZE (3 * 8 * 8) + +struct reg_mask_range { +__u64 addr;/* Pointer to mask array */ +__u32 range;/* Requested range */ +__u32 reserved[13 ]; +}; +#endif #endif /* __ARM_KVM_H__ */
linux-headers/asm-generic/unistd.h +10 -4
@@ -71,7 +71,7 @@ __SYSCALL(__NR_fremovexattr, sys_fremovexattr)#define __NR_getcwd 17 __SYSCALL(__NR_getcwd, sys_getcwd)#define __NR_lookup_dcookie 18 -__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie) +__SYSCALL(__NR_lookup_dcookie, sys_ni_syscall)#define __NR_eventfd2 19 __SYSCALL(__NR_eventfd2, sys_eventfd2)#define __NR_epoll_create1 20
@@ -816,15 +816,21 @@ __SYSCALL(__NR_process_mrelease, sys_process_mrelease) __SYSCALL(__NR_futex_waitv, sys_futex_waitv)#define __NR_set_mempolicy_home_node 450 __SYSCALL(__NR_set_mempolicy_home_node, sys_set_mempolicy_home_node) -#define __NR_cachestat 451 __SYSCALL(__NR_cachestat, sys_cachestat) -#define __NR_fchmodat2 452 __SYSCALL(__NR_fchmodat2, sys_fchmodat2) +#define __NR_map_shadow_stack 453 +__SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) +#define __NR_futex_wake 454 +__SYSCALL(__NR_futex_wake, sys_futex_wake) +#define __NR_futex_wait 455 +__SYSCALL(__NR_futex_wait, sys_futex_wait) +#define __NR_futex_requeue 456 +__SYSCALL(__NR_futex_requeue, sys_futex_requeue)#undef __NR_syscalls -#define __NR_syscalls 453 +#define __NR_syscalls 457/* * 32 bit systems traditionally used different
linux-headers/asm-loongarch/bitsperlong.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/bitsperlong.h>
linux-headers/asm-loongarch/kvm.h new file +108 -0
108 lines not on this page · raw message
linux-headers/asm-loongarch/mman.h new file +1 -0
@@ -0,0 +1 @@ +#include <asm-generic/mman.h>
linux-headers/asm-loongarch/unistd.h new file +5 -0
@@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#define __ARCH_WANT_SYS_CLONE +#define __ARCH_WANT_SYS_CLONE3 + +#include <asm-generic/unistd.h>
linux-headers/asm-mips/unistd_n32.h +4 -0
@@ -381,5 +381,9 @@#define __NR_set_mempolicy_home_node (__NR_Linux + 450)#define __NR_cachestat (__NR_Linux + 451)#define __NR_fchmodat2 (__NR_Linux + 452) +#define __NR_map_shadow_stack (__NR_Linux + 453) +#define __NR_futex_wake (__NR_Linux + 454) +#define __NR_futex_wait (__NR_Linux + 455) +#define __NR_futex_requeue (__NR_Linux + 456)#endif /* _ASM_UNISTD_N32_H */
linux-headers/asm-mips/unistd_n64.h +4 -0
@@ -357,5 +357,9 @@#define __NR_set_mempolicy_home_node (__NR_Linux + 450)#define __NR_cachestat (__NR_Linux + 451)#define __NR_fchmodat2 (__NR_Linux + 452) +#define __NR_map_shadow_stack (__NR_Linux + 453) +#define __NR_futex_wake (__NR_Linux + 454) +#define __NR_futex_wait (__NR_Linux + 455) +#define __NR_futex_requeue (__NR_Linux + 456)#endif /* _ASM_UNISTD_N64_H */
linux-headers/asm-mips/unistd_o32.h +4 -0
@@ -427,5 +427,9 @@#define __NR_set_mempolicy_home_node (__NR_Linux + 450)#define __NR_cachestat (__NR_Linux + 451)#define __NR_fchmodat2 (__NR_Linux + 452) +#define __NR_map_shadow_stack (__NR_Linux + 453) +#define __NR_futex_wake (__NR_Linux + 454) +#define __NR_futex_wait (__NR_Linux + 455) +#define __NR_futex_requeue (__NR_Linux + 456)#endif /* _ASM_UNISTD_O32_H */
linux-headers/asm-powerpc/unistd_32.h +4 -0
@@ -434,6 +434,10 @@#define __NR_set_mempolicy_home_node 450#define __NR_cachestat 451#define __NR_fchmodat2 452 +#define __NR_map_shadow_stack 453 +#define __NR_futex_wake 454 +#define __NR_futex_wait 455 +#define __NR_futex_requeue 456#endif /* _ASM_UNISTD_32_H */
linux-headers/asm-powerpc/unistd_64.h +4 -0
@@ -406,6 +406,10 @@#define __NR_set_mempolicy_home_node 450#define __NR_cachestat 451#define __NR_fchmodat2 452 +#define __NR_map_shadow_stack 453 +#define __NR_futex_wake 454 +#define __NR_futex_wait 455 +#define __NR_futex_requeue 456#endif /* _ASM_UNISTD_64_H */
linux-headers/asm-riscv/kvm.h +12 -0
@@ -80,6 +80,7 @@ struct kvm_riscv_csr {unsigned long sip;unsigned long satp;unsigned long scounteren; +unsigned long senvcfg; };/* AIA CSR registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */
@@ -93,6 +94,11 @@ struct kvm_riscv_aia_csr {unsigned long iprio2h; }; +/* Smstateen CSR for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ +struct kvm_riscv_smstateen_csr { +unsigned long sstateen0; +}; +/* TIMER registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ struct kvm_riscv_timer {__u64 frequency;
@@ -131,6 +137,8 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZICSR ,KVM_RISCV_ISA_EXT_ZIFENCEI ,KVM_RISCV_ISA_EXT_ZIHPM , +KVM_RISCV_ISA_EXT_SMSTATEEN , +KVM_RISCV_ISA_EXT_ZICOND , KVM_RISCV_ISA_EXT_MAX, };
@@ -148,6 +156,7 @@ enum KVM_RISCV_SBI_EXT_ID {KVM_RISCV_SBI_EXT_PMU ,KVM_RISCV_SBI_EXT_EXPERIMENTAL ,KVM_RISCV_SBI_EXT_VENDOR , +KVM_RISCV_SBI_EXT_DBCN , KVM_RISCV_SBI_EXT_MAX, };
@@ -178,10 +187,13 @@ enum KVM_RISCV_SBI_EXT_ID {#define KVM_REG_RISCV_CSR (0x03 << KVM_REG_RISCV_TYPE_SHIFT)#define KVM_REG_RISCV_CSR_GENERAL (0x0 << KVM_REG_RISCV_SUBTYPE_SHIFT)#define KVM_REG_RISCV_CSR_AIA (0x1 << KVM_REG_RISCV_SUBTYPE_SHIFT) +#define KVM_REG_RISCV_CSR_SMSTATEEN (0x2 << KVM_REG_RISCV_SUBTYPE_SHIFT)#define KVM_REG_RISCV_CSR_REG (name) \ (offsetof(struct kvm_riscv_csr, name) / sizeof(unsigned long))#define KVM_REG_RISCV_CSR_AIA_REG (name) \ (offsetof(struct kvm_riscv_aia_csr, name) / sizeof(unsigned long)) +#define KVM_REG_RISCV_CSR_SMSTATEEN_REG (name) \ + (offsetof(struct kvm_riscv_smstateen_csr, name) / sizeof(unsigned long))/* Timer registers are mapped as type 4 */ #define KVM_REG_RISCV_TIMER (0x04 << KVM_REG_RISCV_TYPE_SHIFT)
linux-headers/asm-s390/unistd_32.h +4 -0
@@ -425,5 +425,9 @@#define __NR_set_mempolicy_home_node 450#define __NR_cachestat 451#define __NR_fchmodat2 452 +#define __NR_map_shadow_stack 453 +#define __NR_futex_wake 454 +#define __NR_futex_wait 455 +#define __NR_futex_requeue 456#endif /* _ASM_S390_UNISTD_32_H */
linux-headers/asm-s390/unistd_64.h +4 -0
@@ -373,5 +373,9 @@#define __NR_set_mempolicy_home_node 450#define __NR_cachestat 451#define __NR_fchmodat2 452 +#define __NR_map_shadow_stack 453 +#define __NR_futex_wake 454 +#define __NR_futex_wait 455 +#define __NR_futex_requeue 456#endif /* _ASM_S390_UNISTD_64_H */
linux-headers/asm-x86/unistd_32.h +4 -0
@@ -443,6 +443,10 @@#define __NR_set_mempolicy_home_node 450#define __NR_cachestat 451#define __NR_fchmodat2 452 +#define __NR_map_shadow_stack 453 +#define __NR_futex_wake 454 +#define __NR_futex_wait 455 +#define __NR_futex_requeue 456#endif /* _ASM_UNISTD_32_H */
linux-headers/asm-x86/unistd_64.h +3 -0
@@ -366,6 +366,9 @@#define __NR_cachestat 451#define __NR_fchmodat2 452#define __NR_map_shadow_stack 453 +#define __NR_futex_wake 454 +#define __NR_futex_wait 455 +#define __NR_futex_requeue 456#endif /* _ASM_UNISTD_64_H */
linux-headers/asm-x86/unistd_x32.h +3 -0
@@ -318,6 +318,9 @@#define __NR_set_mempolicy_home_node (__X32_SYSCALL_BIT + 450)#define __NR_cachestat (__X32_SYSCALL_BIT + 451)#define __NR_fchmodat2 (__X32_SYSCALL_BIT + 452) +#define __NR_futex_wake (__X32_SYSCALL_BIT + 454) +#define __NR_futex_wait (__X32_SYSCALL_BIT + 455) +#define __NR_futex_requeue (__X32_SYSCALL_BIT + 456)#define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)#define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)#define __NR_ioctl (__X32_SYSCALL_BIT + 514)
linux-headers/linux/iommufd.h +176 -4
233 lines not on this page · raw message
linux-headers/linux/kvm.h +11 -0
@@ -264,6 +264,7 @@ struct kvm_xen_exit {#define KVM_EXIT_RISCV_SBI 35#define KVM_EXIT_RISCV_CSR 36#define KVM_EXIT_NOTIFY 37 +#define KVM_EXIT_LOONGARCH_IOCSR 38/* For KVM_EXIT_INTERNAL_ERROR */ /* Emulate instruction failed. */
@@ -336,6 +337,13 @@ struct kvm_run {__u32 len;__u8 is_write; } mmio; +/* KVM_EXIT_LOONGARCH_IOCSR */ +struct { +__u64 phys_addr; +__u8 data[8 ]; +__u32 len; +__u8 is_write; + } iocsr_io;/* KVM_EXIT_HYPERCALL */ struct {__u64 nr;
@@ -1188,6 +1196,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_COUNTER_OFFSET 227#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228#define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229 +#define KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGES 230#ifdef KVM_CAP_IRQ_ROUTING
@@ -1358,6 +1367,7 @@ struct kvm_dirty_tlb {#define KVM_REG_ARM64 0x6000000000000000ULL#define KVM_REG_MIPS 0x7000000000000000ULL#define KVM_REG_RISCV 0x8000000000000000ULL +#define KVM_REG_LOONGARCH 0x9000000000000000ULL#define KVM_REG_SIZE_SHIFT 52#define KVM_REG_SIZE_MASK 0x00f0000000000000ULL
@@ -1558,6 +1568,7 @@ struct kvm_s390_ucas_mapping {#define KVM_ARM_MTE_COPY_TAGS _IOR(KVMIO, 0xb4, struct kvm_arm_copy_mte_tags)/* Available with KVM_CAP_COUNTER_OFFSET */ #define KVM_ARM_SET_COUNTER_OFFSET _IOW(KVMIO, 0xb5, struct kvm_arm_counter_offset) +#define KVM_ARM_GET_REG_WRITABLE_MASKS _IOR(KVMIO, 0xb6, struct reg_mask_range)/* ioctl for vm fd */ #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
linux-headers/linux/psp-sev.h +1 -0
@@ -68,6 +68,7 @@ typedef enum {SEV_RET_INVALID_PARAM ,SEV_RET_RESOURCE_LIMIT ,SEV_RET_SECURE_DATA_INVALID , +SEV_RET_INVALID_KEY =0x27 ,SEV_RET_MAX , } sev_ret_code;
linux-headers/linux/stddef.h +8 -1
@@ -27,8 +27,13 @@ union { \ struct { MEMBERS } ATTRS; \ struct TAG { MEMBERS } ATTRS NAME; \ - } + } ATTRS +#ifdef __cplusplus +/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */ +#define __DECLARE_FLEX_ARRAY(T, member) \ + T member[0] +#else /** * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union *
@@ -49,3 +54,5 @@#ifndef __counted_by#define __counted_by (m)#endif + +#endif /* _LINUX_STDDEF_H */
linux-headers/linux/userfaultfd.h +8 -1
@@ -40,7 +40,8 @@ UFFD_FEATURE_EXACT_ADDRESS | \ UFFD_FEATURE_WP_HUGETLBFS_SHMEM | \ UFFD_FEATURE_WP_UNPOPULATED | \ - UFFD_FEATURE_POISON) + UFFD_FEATURE_POISON | \ + UFFD_FEATURE_WP_ASYNC)#define UFFD_API_IOCTLS \ ((__u64)1 << _UFFDIO_REGISTER | \ (__u64)1 << _UFFDIO_UNREGISTER | \
@@ -216,6 +217,11 @@ struct uffdio_api {* (i.e. empty ptes). This will be the default behavior for shmem * & hugetlbfs, so this flag only affects anonymous memory behavior * when userfault write-protection mode is registered. +* +* UFFD_FEATURE_WP_ASYNC indicates that userfaultfd write-protection +* asynchronous mode is supported in which the write fault is +* automatically resolved and write-protection is un-set. +* It implies UFFD_FEATURE_WP_UNPOPULATED. */ #define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0)#define UFFD_FEATURE_EVENT_FORK (1<<1)
@@ -232,6 +238,7 @@ struct uffdio_api {#define UFFD_FEATURE_WP_HUGETLBFS_SHMEM (1<<12)#define UFFD_FEATURE_WP_UNPOPULATED (1<<13)#define UFFD_FEATURE_POISON (1<<14) +#define UFFD_FEATURE_WP_ASYNC (1<<15)__u64 features;__u64 ioctls;
linux-headers/linux/vfio.h +35 -12
102 lines not on this page · raw message
linux-headers/linux/vhost.h +8 -0
@@ -219,4 +219,12 @@*/ #define VHOST_VDPA_RESUME _IO(VHOST_VIRTIO, 0x7E) +/* Get the group for the descriptor table including driver & device areas +* of a virtqueue: read index, write group in num. +* The virtqueue index is stored in the index field of vhost_vring_state. +* The group ID of the descriptor table for this specific virtqueue +* is returned via num field of vhost_vring_state. +*/ +#define VHOST_VDPA_GET_VRING_DESC_GROUP _IOWR(VHOST_VIRTIO, 0x7F, \ + struct vhost_vring_state)#endif
Signature · 1 line
2.39.1
PATCH v4 2/9 target/loongarch: Define some kvm_arch interfaces
In reply to Tianrui ZhaoDefine some functions in target/loongarch/kvm/kvm.c, such as kvm_arch_put_registers, kvm_arch_get_registers and kvm_arch_handle_exit, etc. which are needed by kvm/kvm-all.c. Now the most functions has no content and they will be implemented in the next patches.
--- target/loongarch/kvm/kvm.c | 131 +++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 target/loongarch/kvm/kvm.c
target/loongarch/kvm/kvm.c new file +131 -0
@@ -0,0 +1,131 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* QEMU LoongArch KVM +* +* Copyright (c) 2023 Loongson Technology Corporation Limited +*/ + +#include "qemu/osdep.h" +#include <sys/ioctl.h> +#include <linux/kvm.h> + +#include "qemu/timer.h" +#include "qemu/error-report.h" +#include "qemu/main-loop.h" +#include "sysemu/sysemu.h" +#include "sysemu/kvm.h" +#include "sysemu/kvm_int.h" +#include "hw/pci/pci.h" +#include "exec/memattrs.h" +#include "exec/address-spaces.h" +#include "hw/boards.h" +#include "hw/irq.h" +#include "qemu/log.h" +#include "hw/loader.h" +#include "migration/migration.h" +#include "sysemu/runstate.h" +#include "cpu-csr.h" +#include "kvm_loongarch.h" + +static bool cap_has_mp_state; +const KVMCapabilityInfo kvm_arch_required_capabilities[] = { +KVM_CAP_LAST_INFO +}; + +int kvm_arch_get_registers (CPUState *cs) +{ +return 0 ; +} +int kvm_arch_put_registers (CPUState *cs,int level) +{ +return 0 ; +} + +int kvm_arch_init_vcpu (CPUState *cs) +{ +return 0 ; +} + +int kvm_arch_destroy_vcpu (CPUState *cs) +{ +return 0 ; +} + +unsigned long kvm_arch_vcpu_id (CPUState *cs) +{ +return cs->cpu_index; +} + +int kvm_arch_release_virq_post (int virq) +{ +return 0 ; +} + +int kvm_arch_msi_data_to_gsi (uint32_t data) +{ +abort (); +} + +int kvm_arch_fixup_msi_route (struct kvm_irq_routing_entry *route, +uint64_t address,uint32_t data,PCIDevice *dev) +{ +return 0 ; +} + +int kvm_arch_add_msi_route_post (struct kvm_irq_routing_entry *route, +int vector,PCIDevice *dev) +{ +return 0 ; +} + +void kvm_arch_init_irq_routing (KVMState *s) +{ +} + +int kvm_arch_get_default_type (MachineState *ms) +{ +return 0 ; +} + +int kvm_arch_init (MachineState *ms,KVMState *s) +{ +return 0 ; +} + +int kvm_arch_irqchip_create (KVMState *s) +{ +return 0 ; +} + +void kvm_arch_pre_run (CPUState *cs,struct kvm_run *run) +{ +} + +MemTxAttrs kvm_arch_post_run (CPUState *cs,struct kvm_run *run) +{ +return MEMTXATTRS_UNSPECIFIED ; +} + +int kvm_arch_process_async_events (CPUState *cs) +{ +return cs->halted; +} + +bool kvm_arch_stop_on_emulation_error (CPUState *cs) +{ +return true; +} + +bool kvm_arch_cpu_check_are_resettable (void ) +{ +return true; +} + +int kvm_arch_handle_exit (CPUState *cs,struct kvm_run *run) +{ +return 0 ; +} + +void kvm_arch_accel_class_init (ObjectClass *oc) +{ +}
Signature · 1 line
2.39.1
PATCH v4 3/9 target/loongarch: Supplement vcpu env initial when vcpu reset
In reply to Tianrui ZhaoSupplement vcpu env initial when vcpu reset, including init vcpu CSR_CPUID,CSR_TID to cpu->cpu_index. The two regs will be used in kvm_get/set_csr_ioctl.
--- target/loongarch/cpu.c | 2 ++ target/loongarch/cpu.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
target/loongarch/cpu.c +2 -0
@@ -533,10 +533,12 @@ static void loongarch_cpu_reset_hold(Object *obj) env->CSR_ESTAT = env->CSR_ESTAT & (~MAKE_64BIT_MASK (0 ,2 )); env->CSR_RVACFG =FIELD_DP64 (env->CSR_RVACFG,CSR_RVACFG ,RBITS ,0 ); + env->CSR_CPUID = cs->cpu_index; env->CSR_TCFG =FIELD_DP64 (env->CSR_TCFG,CSR_TCFG ,EN ,0 ); env->CSR_LLBCTL =FIELD_DP64 (env->CSR_LLBCTL,CSR_LLBCTL ,KLO ,0 ); env->CSR_TLBRERA =FIELD_DP64 (env->CSR_TLBRERA,CSR_TLBRERA ,ISTLBR ,0 ); env->CSR_MERRCTL =FIELD_DP64 (env->CSR_MERRCTL,CSR_MERRCTL ,ISMERR ,0 ); + env->CSR_TID = cs->cpu_index; env->CSR_PRCFG3 =FIELD_DP64 (env->CSR_PRCFG3,CSR_PRCFG3 ,TLB_TYPE ,2 ); env->CSR_PRCFG3 =FIELD_DP64 (env->CSR_PRCFG3,CSR_PRCFG3 ,MTLB_ENTRY ,63 );
target/loongarch/cpu.h +1 -1
@@ -319,6 +319,7 @@ typedef struct CPUArchState {uint64_t CSR_PWCH ;uint64_t CSR_STLBPS ;uint64_t CSR_RVACFG ; +uint64_t CSR_CPUID ;uint64_t CSR_PRCFG1 ;uint64_t CSR_PRCFG2 ;uint64_t CSR_PRCFG3 ;
@@ -350,7 +351,6 @@ typedef struct CPUArchState {uint64_t CSR_DBG ;uint64_t CSR_DERA ;uint64_t CSR_DSAVE ; -uint64_t CSR_CPUID ;#ifndef CONFIG_USER_ONLY LoongArchTLB tlb[LOONGARCH_TLB_MAX ];
Signature · 1 line
2.39.1
PATCH v4 4/9 target/loongarch: Implement kvm get/set registers
In reply to Tianrui ZhaoImplement kvm_arch_get/set_registers interfaces, many regs can be get/set in the function, such as core regs, csr regs, fpu regs, mp state, etc.
--- meson.build | 1 + target/loongarch/cpu.c | 3 + target/loongarch/cpu.h | 1 + target/loongarch/internals.h | 5 +- target/loongarch/kvm/kvm.c | 580 +++++++++++++++++++++++++++++++++- target/loongarch/trace-events | 11 + target/loongarch/trace.h | 1 + 7 files changed, 599 insertions(+), 3 deletions(-) create mode 100644 target/loongarch/trace-events create mode 100644 target/loongarch/trace.h
meson.build +1 -0
@@ -3358,6 +3358,7 @@ if have_system or have_user 'target/hppa', 'target/i386', 'target/i386/kvm', + 'target/loongarch', 'target/mips/tcg', 'target/nios2', 'target/ppc',
target/loongarch/cpu.c +3 -0
@@ -555,6 +555,9 @@ static void loongarch_cpu_reset_hold(Object *obj)#ifndef CONFIG_USER_ONLY env->pc =0x1c000000 ;memset (env->tlb,0 ,sizeof (env->tlb)); +if (kvm_enabled ()) { +kvm_arch_reset_vcpu (env); + }#endif restore_fp_status (env);
target/loongarch/cpu.h +1 -0
@@ -360,6 +360,7 @@ typedef struct CPUArchState {MemoryRegion iocsr_mem;bool load_elf;uint64_t elf_address; +uint32_t mp_state;/* Store ipistate to access from this struct */ DeviceState *ipistate;#endif
target/loongarch/internals.h +4 -1
@@ -31,8 +31,10 @@ void G_NORETURN do_raise_exception(CPULoongArchState *env,const char *loongarch_exception_name (int32_t exception); +#ifdef CONFIG_TCG int ieee_ex_to_loongarch (int xcpt);void restore_fp_status (CPULoongArchState *env); +#endif #ifndef CONFIG_USER_ONLY extern const VMStateDescription vmstate_loongarch_cpu;
@@ -44,12 +46,13 @@ uint64_t cpu_loongarch_get_constant_timer_counter(LoongArchCPU *cpu);uint64_t cpu_loongarch_get_constant_timer_ticks (LoongArchCPU *cpu);void cpu_loongarch_store_constant_timer_config (LoongArchCPU *cpu,uint64_t value); - +#ifdef CONFIG_TCG bool loongarch_cpu_tlb_fill (CPUState *cs,vaddr address,int size,MMUAccessType access_type,int mmu_idx,bool probe,uintptr_t retaddr);hwaddr loongarch_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); +#endif #endif /* !CONFIG_USER_ONLY */ uint64_t read_fcc (CPULoongArchState *env);
target/loongarch/kvm/kvm.c +578 -2
597 lines not on this page · raw message
target/loongarch/trace-events new file +11 -0
@@ -0,0 +1,11 @@ +# See docs/devel/tracing.rst for syntax documentation. + +#kvm.c +kvm_failed_get_regs_core(const char *msg) "Failed to get core regs from KVM: %s" +kvm_failed_put_regs_core(const char *msg) "Failed to put core regs into KVM: %s" +kvm_failed_get_fpu(const char *msg) "Failed to get fpu from KVM: %s" +kvm_failed_put_fpu(const char *msg) "Failed to put fpu into KVM: %s" +kvm_failed_get_mpstate(const char *msg) "Failed to get mp_state from KVM: %s" +kvm_failed_put_mpstate(const char *msg) "Failed to put mp_state into KVM: %s" +kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s" +kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s"
target/loongarch/trace.h new file +1 -0
@@ -0,0 +1 @@ +#include "trace/trace-target_loongarch.h"
Signature · 1 line
2.39.1
PATCH v4 5/9 target/loongarch: Implement kvm_arch_init function
In reply to Tianrui ZhaoImplement the kvm_arch_init of loongarch, in the function, the KVM_CAP_MP_STATE cap is checked by kvm ioctl.
--- target/loongarch/kvm/kvm.c | 1 + 1 file changed, 1 insertion(+)
target/loongarch/kvm/kvm.c +1 -0
@@ -665,6 +665,7 @@ int kvm_arch_get_default_type(MachineState *ms)int kvm_arch_init (MachineState *ms,KVMState *s) { + cap_has_mp_state =kvm_check_extension (s,KVM_CAP_MP_STATE );return 0 ; }
Signature · 1 line
2.39.1
PATCH v4 6/9 target/loongarch: Implement kvm_arch_init_vcpu
In reply to Tianrui ZhaoImplement kvm_arch_init_vcpu interface for loongarch, in this function, we register VM change state handler. And when VM state changes to running, the counter value should be put into kvm to keep consistent with kvm, and when state change to stop, counter value should be refreshed from kvm.
--- target/loongarch/cpu.h | 2 ++ target/loongarch/kvm/kvm.c | 23 +++++++++++++++++++++++ target/loongarch/trace-events | 2 ++ 3 files changed, 27 insertions(+)
target/loongarch/cpu.h +2 -0
@@ -381,6 +381,8 @@ struct ArchCPU {/* 'compatible' string for this CPU for Linux device trees */ const char *dtb_compatible; +/* used by KVM_REG_LOONGARCH_COUNTER ioctl to access guest time counters */ +uint64_t kvm_state_counter; };/**
target/loongarch/kvm/kvm.c +23 -0
@@ -617,8 +617,31 @@ int kvm_arch_put_registers(CPUState *cs, int level)return ret; } +static void kvm_loongarch_vm_stage_change (void *opaque,bool running, +RunState state) +{ +int ret; +CPUState *cs = opaque; +LoongArchCPU *cpu =LOONGARCH_CPU (cs); + +if (running) { + ret =kvm_set_one_reg (cs,KVM_REG_LOONGARCH_COUNTER , + &cpu->kvm_state_counter); +if (ret <0 ) { +trace_kvm_failed_put_counter (strerror (errno)); + } + }else { + ret =kvm_get_one_reg (cs,KVM_REG_LOONGARCH_COUNTER , + &cpu->kvm_state_counter); +if (ret <0 ) { +trace_kvm_failed_get_counter (strerror (errno)); + } + } +} +int kvm_arch_init_vcpu (CPUState *cs) { +qemu_add_vm_change_state_handler (kvm_loongarch_vm_stage_change, cs);return 0 ; }
target/loongarch/trace-events +2 -0
@@ -7,5 +7,7 @@ kvm_failed_get_fpu(const char *msg) "Failed to get fpu from KVM: %s" kvm_failed_put_fpu(const char *msg) "Failed to put fpu into KVM: %s" kvm_failed_get_mpstate(const char *msg) "Failed to get mp_state from KVM: %s" kvm_failed_put_mpstate(const char *msg) "Failed to put mp_state into KVM: %s" +kvm_failed_get_counter(const char *msg) "Failed to get counter from KVM: %s" +kvm_failed_put_counter(const char *msg) "Failed to put counter into KVM: %s" kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s" kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s"
Signature · 1 line
2.39.1
PATCH v4 7/9 target/loongarch: Implement kvm_arch_handle_exit
In reply to Tianrui ZhaoImplement kvm_arch_handle_exit for loongarch. In this function, the KVM_EXIT_LOONGARCH_IOCSR is handled, we read or write the iocsr address space by the addr, length and is_write argument in kvm_run.
--- target/loongarch/kvm/kvm.c | 24 +++++++++++++++++++++++- target/loongarch/trace-events | 1 + 2 files changed, 24 insertions(+), 1 deletion(-)
target/loongarch/kvm/kvm.c +23 -1
@@ -723,7 +723,29 @@ bool kvm_arch_cpu_check_are_resettable(void)int kvm_arch_handle_exit (CPUState *cs,struct kvm_run *run) { -return 0 ; +int ret =0 ; +LoongArchCPU *cpu =LOONGARCH_CPU (cs); +CPULoongArchState *env = &cpu->env; +MemTxAttrs attrs = {}; + + attrs.requester_id =env_cpu (env)->cpu_index; + +trace_kvm_arch_handle_exit (run->exit_reason); +switch (run->exit_reason) { +case KVM_EXIT_LOONGARCH_IOCSR : +address_space_rw (&env->address_space_iocsr, + run->iocsr_io.phys_addr, + attrs, + run->iocsr_io.data, + run->iocsr_io.len, + run->iocsr_io.is_write); +break ; +default : + ret =-1 ; +warn_report ("KVM: unknown exit reason %d" , run->exit_reason); +break ; + } +return ret; }void kvm_arch_accel_class_init (ObjectClass *oc)
target/loongarch/trace-events +1 -0
@@ -11,3 +11,4 @@ kvm_failed_get_counter(const char *msg) "Failed to get counter from KVM: %s" kvm_failed_put_counter(const char *msg) "Failed to put counter into KVM: %s" kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s" kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s" +kvm_arch_handle_exit(int num) "kvm arch handle exit, the reason number: %d"
Signature · 1 line
2.39.1
PATCH v4 8/9 target/loongarch: Implement set vcpu intr for kvm
In reply to Tianrui ZhaoImplement loongarch kvm set vcpu interrupt interface, when a irq is set in vcpu, we use the KVM_INTERRUPT ioctl to set intr into kvm.
--- target/loongarch/cpu.c | 34 +++++++++++++++++++++------- target/loongarch/kvm/kvm.c | 15 ++++++++++++ target/loongarch/kvm/kvm_loongarch.h | 16 +++++++++++++ target/loongarch/trace-events | 1 + 4 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 target/loongarch/kvm/kvm_loongarch.h
target/loongarch/cpu.c +26 -8
@@ -11,7 +11,6 @@#include "qapi/error.h" #include "qemu/module.h" #include "sysemu/qtest.h" -#include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "cpu.h" #include "internals.h"
@@ -20,8 +19,16 @@#ifndef CONFIG_USER_ONLY #include "sysemu/reset.h" #endif -#include "tcg/tcg.h" #include "vec.h" +#include "sysemu/kvm.h" +#include "kvm/kvm_loongarch.h" +#ifdef CONFIG_KVM +#include <linux/kvm.h> +#endif +#ifdef CONFIG_TCG +#include "exec/cpu_ldst.h" +#include "tcg/tcg.h" +#endif const char *const regnames[32 ] = {"r0" ,"r1" ,"r2" ,"r3" ,"r4" ,"r5" ,"r6" ,"r7" ,
@@ -110,12 +117,15 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level)return ; } - env->CSR_ESTAT =deposit64 (env->CSR_ESTAT, irq,1 , level !=0 ); - -if (FIELD_EX64 (env->CSR_ESTAT,CSR_ESTAT ,IS )) { -cpu_interrupt (cs,CPU_INTERRUPT_HARD ); +if (kvm_enabled ()) { +kvm_loongarch_set_interrupt (cpu, irq, level); }else { -cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + env->CSR_ESTAT =deposit64 (env->CSR_ESTAT, irq,1 , level !=0 ); +if (FIELD_EX64 (env->CSR_ESTAT,CSR_ESTAT ,IS )) { +cpu_interrupt (cs,CPU_INTERRUPT_HARD ); + }else { +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + } } }
@@ -140,7 +150,10 @@ static inline bool cpu_loongarch_hw_interrupts_pending(CPULoongArchState *env)return (pending & status) !=0 ; } +#endif +#ifdef CONFIG_TCG +#ifndef CONFIG_USER_ONLY static void loongarch_cpu_do_interrupt(CPUState *cs) { LoongArchCPU *cpu = LOONGARCH_CPU(cs);
@@ -322,7 +335,6 @@ static bool loongarch_cpu_exec_interrupt(CPUState *cs, int interrupt_request) }#endif -#ifdef CONFIG_TCG static void loongarch_cpu_synchronize_from_tb (CPUState *cs,const TranslationBlock *tb) {
@@ -560,7 +572,9 @@ static void loongarch_cpu_reset_hold(Object *obj) }#endif +#ifdef CONFIG_TCG restore_fp_status (env); +#endif cs->exception_index =-1 ; }
@@ -703,8 +717,10 @@ static void loongarch_cpu_init(Object *obj)CPULoongArchState *env = &cpu->env;qdev_init_gpio_in (DEVICE (cpu), loongarch_cpu_set_irq,N_IRQS ); +#ifdef CONFIG_TCG timer_init_ns (&cpu->timer,QEMU_CLOCK_VIRTUAL , &loongarch_constant_timer_cb, cpu); +#endif memory_region_init_io (&env->system_iocsr,OBJECT (cpu),NULL , env,"iocsr" ,UINT64_MAX );address_space_init (&env->address_space_iocsr, &env->system_iocsr,"IOCSR" );
@@ -804,7 +820,9 @@ static struct TCGCPUOps loongarch_tcg_ops = {#include "hw/core/sysemu-cpu-ops.h" static const struct SysemuCPUOps loongarch_sysemu_ops = { +#ifdef CONFIG_TCG .get_phys_page_debug = loongarch_cpu_get_phys_page_debug, +#endif };static int64_t loongarch_cpu_get_arch_id (CPUState *cs)
target/loongarch/kvm/kvm.c +15 -0
@@ -748,6 +748,21 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)return ret; } +int kvm_loongarch_set_interrupt (LoongArchCPU *cpu,int irq,int level) +{ +struct kvm_interrupt intr; +CPUState *cs =CPU (cpu); + +if (level) { + intr.irq = irq; + }else { + intr.irq = -irq; + } + +trace_kvm_set_intr (irq, level); +return kvm_vcpu_ioctl (cs,KVM_INTERRUPT , &intr); +} +void kvm_arch_accel_class_init (ObjectClass *oc) { }
target/loongarch/kvm/kvm_loongarch.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* QEMU LoongArch kvm interface +* +* Copyright (c) 2023 Loongson Technology Corporation Limited +*/ + +#include "cpu.h" + +#ifndef QEMU_KVM_LOONGARCH_H +#define QEMU_KVM_LOONGARCH_H + +int kvm_loongarch_set_interrupt (LoongArchCPU *cpu,int irq,int level); +void kvm_arch_reset_vcpu (CPULoongArchState *env); + +#endif
target/loongarch/trace-events +1 -0
@@ -12,3 +12,4 @@ kvm_failed_put_counter(const char *msg) "Failed to put counter into KVM: %s" kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s" kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s" kvm_arch_handle_exit(int num) "kvm arch handle exit, the reason number: %d" +kvm_set_intr(int irq, int level) "kvm set interrupt, irq num: %d, level: %d"
Signature · 1 line
2.39.1
Re: [PATCH v4 8/9] target/loongarch: Implement set vcpu intr for kvm
Hi Tianrui,
Quoted 28 lines · Tianrui Zhao
Implement loongarch kvm set vcpu interrupt interface, when a irq is set in vcpu, we use the
KVM_INTERRUPTioctl to set intr into kvm.Signed-off-by Tianrui Zhao <[email protected]>Signed-off-by xianglai li <[email protected]>Reviewed-by Song Gao <[email protected]>--- target/loongarch/cpu.c | 34 +++++++++++++++++++++------- target/loongarch/kvm/kvm.c | 15 ++++++++++++ target/loongarch/kvm/kvm_loongarch.h | 16 +++++++++++++ target/loongarch/trace-events | 1 + 4 files changed, 58 insertions(+), 8 deletions(-)create mode 100644
target/loongarch/kvm/kvm_loongarch.htarget/loongarch/cpu.c +0
-1@@ -11,7 +11,6 @@#include "qapi/error.h" #include "qemu/module.h" #include "sysemu/qtest.h" -#include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "cpu.h" #include "internals.h"
target/loongarch/cpu.c line 24
Quoted 7 lines
target/loongarch/cpu.c +2
-1@@ -20,8 +19,16 @@#ifndef CONFIG_USER_ONLY #include "sysemu/reset.h" #endif -#include "tcg/tcg.h" #include "vec.h" +#include "sysemu/kvm.h" +#include "kvm/kvm_loongarch.h"
Shouldn't this header ^ ...
target/loongarch/cpu.c line 25
Quoted 1 line
target/loongarch/cpu.c +1
-0+#ifdef CONFIG_KVM
... goes here?
Quoted 6 lines
target/loongarch/cpu.c +6
-0+#include <linux/kvm.h> +#endif +#ifdef CONFIG_TCG +#include "exec/cpu_ldst.h" +#include "tcg/tcg.h" +#endif
PATCH v4 1/1 target/loongarch: Restrict TCG-specific code
In reply to Tianrui ZhaoFrom: Tianrui Zhao <[email protected]>
In preparation of supporting KVM in the next commit.
Message-ID: <[email protected]>
--- target/loongarch/cpu.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
target/loongarch/cpu.c +21 -9
@@ -11,7 +11,7 @@#include "qapi/error.h" #include "qemu/module.h" #include "sysemu/qtest.h" -#include "exec/cpu_ldst.h" +#include "sysemu/tcg.h" #include "exec/exec-all.h" #include "cpu.h" #include "internals.h"
@@ -20,8 +20,11 @@#ifndef CONFIG_USER_ONLY #include "sysemu/reset.h" #endif -#include "tcg/tcg.h" #include "vec.h" +#ifdef CONFIG_TCG +#include "exec/cpu_ldst.h" +#include "tcg/tcg.h" +#endif const char *const regnames[32 ] = {"r0" ,"r1" ,"r2" ,"r3" ,"r4" ,"r5" ,"r6" ,"r7" ,
@@ -110,12 +113,13 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level)return ; } - env->CSR_ESTAT =deposit64 (env->CSR_ESTAT, irq,1 , level !=0 ); - -if (FIELD_EX64 (env->CSR_ESTAT,CSR_ESTAT ,IS )) { -cpu_interrupt (cs,CPU_INTERRUPT_HARD ); - }else { -cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); +if (tcg_enabled ()) { + env->CSR_ESTAT =deposit64 (env->CSR_ESTAT, irq,1 , level !=0 ); +if (FIELD_EX64 (env->CSR_ESTAT,CSR_ESTAT ,IS )) { +cpu_interrupt (cs,CPU_INTERRUPT_HARD ); + }else { +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); + } } }
@@ -140,7 +144,10 @@ static inline bool cpu_loongarch_hw_interrupts_pending(CPULoongArchState *env)return (pending & status) !=0 ; } +#endif +#ifdef CONFIG_TCG +#ifndef CONFIG_USER_ONLY static void loongarch_cpu_do_interrupt(CPUState *cs) { LoongArchCPU *cpu = LOONGARCH_CPU(cs);
@@ -322,7 +329,6 @@ static bool loongarch_cpu_exec_interrupt(CPUState *cs, int interrupt_request) }#endif -#ifdef CONFIG_TCG static void loongarch_cpu_synchronize_from_tb (CPUState *cs,const TranslationBlock *tb) {
@@ -560,7 +566,9 @@ static void loongarch_cpu_reset_hold(Object *obj) }#endif +#ifdef CONFIG_TCG restore_fp_status (env); +#endif cs->exception_index =-1 ; }
@@ -703,8 +711,10 @@ static void loongarch_cpu_init(Object *obj)CPULoongArchState *env = &cpu->env;qdev_init_gpio_in (DEVICE (cpu), loongarch_cpu_set_irq,N_IRQS ); +#ifdef CONFIG_TCG timer_init_ns (&cpu->timer,QEMU_CLOCK_VIRTUAL , &loongarch_constant_timer_cb, cpu); +#endif memory_region_init_io (&env->system_iocsr,OBJECT (cpu),NULL , env,"iocsr" ,UINT64_MAX );address_space_init (&env->address_space_iocsr, &env->system_iocsr,"IOCSR" );
@@ -804,7 +814,9 @@ static struct TCGCPUOps loongarch_tcg_ops = {#include "hw/core/sysemu-cpu-ops.h" static const struct SysemuCPUOps loongarch_sysemu_ops = { +#ifdef CONFIG_TCG .get_phys_page_debug = loongarch_cpu_get_phys_page_debug, +#endif };static int64_t loongarch_cpu_get_arch_id (CPUState *cs)
Signature · 1 line
2.41.0
PATCH v4 1/1 target/loongarch: Implement set vcpu intr for kvm
In reply to Tianrui ZhaoFrom: Tianrui Zhao <[email protected]>
Implement loongarch kvm set vcpu interrupt interface, when a irq is set in vcpu, we use the KVM_INTERRUPT ioctl to set intr into kvm.
Message-ID: <[email protected]>
--- target/loongarch/kvm/kvm_loongarch.h | 16 ++++++++++++++++ target/loongarch/cpu.c | 9 ++++++++- target/loongarch/kvm/kvm.c | 15 +++++++++++++++ target/loongarch/trace-events | 1 + 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 target/loongarch/kvm/kvm_loongarch.h
target/loongarch/kvm/kvm_loongarch.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* QEMU LoongArch kvm interface +* +* Copyright (c) 2023 Loongson Technology Corporation Limited +*/ + +#include "cpu.h" + +#ifndef QEMU_KVM_LOONGARCH_H +#define QEMU_KVM_LOONGARCH_H + +int kvm_loongarch_set_interrupt (LoongArchCPU *cpu,int irq,int level); +void kvm_arch_reset_vcpu (CPULoongArchState *env); + +#endif
target/loongarch/cpu.c +8 -1
@@ -12,6 +12,7 @@#include "qemu/module.h" #include "sysemu/qtest.h" #include "sysemu/tcg.h" +#include "sysemu/kvm.h" #include "exec/exec-all.h" #include "cpu.h" #include "internals.h"
@@ -21,6 +22,10 @@#include "sysemu/reset.h" #endif #include "vec.h" +#ifdef CONFIG_KVM +#include "kvm/kvm_loongarch.h" +#include <linux/kvm.h> +#endif #ifdef CONFIG_TCG #include "exec/cpu_ldst.h" #include "tcg/tcg.h"
@@ -113,7 +118,9 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level)return ; } -if (tcg_enabled ()) { +if (kvm_enabled ()) { +kvm_loongarch_set_interrupt (cpu, irq, level); + }else if (tcg_enabled ()) { env->CSR_ESTAT =deposit64 (env->CSR_ESTAT, irq,1 , level !=0 );if (FIELD_EX64 (env->CSR_ESTAT,CSR_ESTAT ,IS )) {cpu_interrupt (cs,CPU_INTERRUPT_HARD );
target/loongarch/kvm/kvm.c +15 -0
@@ -748,6 +748,21 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)return ret; } +int kvm_loongarch_set_interrupt (LoongArchCPU *cpu,int irq,int level) +{ +struct kvm_interrupt intr; +CPUState *cs =CPU (cpu); + +if (level) { + intr.irq = irq; + }else { + intr.irq = -irq; + } + +trace_kvm_set_intr (irq, level); +return kvm_vcpu_ioctl (cs,KVM_INTERRUPT , &intr); +} +void kvm_arch_accel_class_init (ObjectClass *oc) { }
target/loongarch/trace-events +1 -0
@@ -12,3 +12,4 @@ kvm_failed_put_counter(const char *msg) "Failed to put counter into KVM: %s" kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s" kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s" kvm_arch_handle_exit(int num) "kvm arch handle exit, the reason number: %d" +kvm_set_intr(int irq, int level) "kvm set interrupt, irq num: %d, level: %d"
Signature · 1 line
2.41.0
Re: [PATCH v4 8/9b] target/loongarch: Implement set vcpu intr for kvm
Hi,
Quoted 55 lines · Philippe Mathieu-Daudé
From: Tianrui Zhao <[email protected]>
Implement loongarch kvm set vcpu interrupt interface, when a irq is set in vcpu, we use the
KVM_INTERRUPTioctl to set intr into kvm.Signed-off-by Tianrui Zhao <[email protected]>Signed-off-by xianglai li <[email protected]>Reviewed-by Song Gao <[email protected]>Message-ID: <[email protected]>
[PMD: Split from bigger patch, part 2]Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- target/loongarch/kvm/kvm_loongarch.h | 16 ++++++++++++++++ target/loongarch/cpu.c | 9 ++++++++- target/loongarch/kvm/kvm.c | 15 +++++++++++++++ target/loongarch/trace-events | 1 + 4 files changed, 40 insertions(+), 1 deletion(-)create mode 100644
target/loongarch/kvm/kvm_loongarch.htarget/loongarch/kvm/kvm_loongarch.h new file +16
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* QEMU LoongArch kvm interface +* +* Copyright (c) 2023 Loongson Technology Corporation Limited +*/ + +#include "cpu.h" + +#ifndef QEMU_KVM_LOONGARCH_H +#define QEMU_KVM_LOONGARCH_H + +int kvm_loongarch_set_interrupt (LoongArchCPU *cpu,int irq,int level); +void kvm_arch_reset_vcpu (CPULoongArchState *env); + +#endif target/loongarch/cpu.c +1
-0@@ -12,6 +12,7 @@#include "qemu/module.h" #include "sysemu/qtest.h" #include "sysemu/tcg.h" +#include "sysemu/kvm.h" #include "exec/exec-all.h" #include "cpu.h" #include "internals.h"
target/loongarch/cpu.c line 26
Quoted 5 lines
target/loongarch/cpu.c +2
-0@@ -21,6 +22,10 @@#include "sysemu/reset.h" #endif #include "vec.h" +#ifdef CONFIG_KVM +#include "kvm/kvm_loongarch.h"
This broken tcg 'loongarch64-softmmu' build on X86 host, :-[
../target/loongarch/cpu.c: In function ‘loongarch_cpu_set_irq’:../target/loongarch/cpu.c:122:9: error: implicit declaration of function ‘kvm_loongarch_set_interrupt’ [-Werror=implicit-function-declaration] 122 | kvm_loongarch_set_interrupt(cpu, irq, level);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~../target/loongarch/cpu.c:122:9: error: nested extern declaration of ‘kvm_loongarch_set_interrupt’ [-Werror=nested-externs] ../target/loongarch/cpu.c: In function ‘loongarch_cpu_reset_hold’:../target/loongarch/cpu.c:557:9: error: implicit declaration of function ‘kvm_arch_reset_vcpu’; did you mean ‘kvm_arch_init_vcpu’? [-Werror=implicit-function-declaration] 557 | kvm_arch_reset_vcpu(env);
| ^~~~~~~~~~~~~~~~~~~
| kvm_arch_init_vcpu../target/loongarch/cpu.c:557:9: error: nested extern declaration of ‘kvm_arch_reset_vcpu’ [-Werror=nested-externs]
cc1: all warnings being treated as errors
I will move it out of '#ifdef CONFIG_KVM'
Thanks.
Song Gao
Quoted 51 lines
target/loongarch/cpu.c +5
-1+#include <linux/kvm.h> +#endif #ifdef CONFIG_TCG #include "exec/cpu_ldst.h" #include "tcg/tcg.h" @@ -113,7 +118,9 @@ void loongarch_cpu_set_irq(void *opaque, int irq, int level)return ; } -if (tcg_enabled ()) { +if (kvm_enabled ()) { +kvm_loongarch_set_interrupt (cpu, irq, level); + }else if (tcg_enabled ()) { env->CSR_ESTAT =deposit64 (env->CSR_ESTAT, irq,1 , level !=0 );if (FIELD_EX64 (env->CSR_ESTAT,CSR_ESTAT ,IS )) {cpu_interrupt (cs,CPU_INTERRUPT_HARD );target/loongarch/kvm/kvm.c +15
-0@@ -748,6 +748,21 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run)return ret; } +int kvm_loongarch_set_interrupt (LoongArchCPU *cpu,int irq,int level) +{ +struct kvm_interrupt intr; +CPUState *cs =CPU (cpu); + +if (level) { + intr.irq = irq; + }else { + intr.irq = -irq; + } + +trace_kvm_set_intr (irq, level); +return kvm_vcpu_ioctl (cs,KVM_INTERRUPT , &intr); +} +void kvm_arch_accel_class_init (ObjectClass *oc) { }target/loongarch/trace-events +1
-0@@ -12,3 +12,4 @@ kvm_failed_put_counter(const char *msg) "Failed to put counter into KVM: %s" kvm_failed_get_cpucfg(const char *msg) "Failed to get cpucfg from KVM: %s" kvm_failed_put_cpucfg(const char *msg) "Failed to put cpucfg into KVM: %s" kvm_arch_handle_exit(int num) "kvm arch handle exit, the reason number: %d" +kvm_set_intr(int irq, int level) "kvm set interrupt, irq num: %d, level: %d"
Re: [PATCH v4 8/9b] target/loongarch: Implement set vcpu intr for kvm
Quoted 58 lines · gaosong
Hi,
Quoted 34 lines · Philippe Mathieu-Daudé
From: Tianrui Zhao <[email protected]>
Implement loongarch kvm set vcpu interrupt interface, when a irq is set in vcpu, we use the
KVM_INTERRUPTioctl to set intr into kvm.Signed-off-by Tianrui Zhao <[email protected]>Signed-off-by xianglai li <[email protected]>Reviewed-by Song Gao <[email protected]>Message-ID: <[email protected]>
[PMD: Split from bigger patch, part 2]Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
target/loongarch/kvm/kvm_loongarch.h| 16 ++++++++++++++++ target/loongarch/cpu.c | 9 ++++++++- target/loongarch/kvm/kvm.c | 15 +++++++++++++++ target/loongarch/trace-events | 1 +4 files changed, 40 insertions(+), 1 deletion(-)create mode 100644
target/loongarch/kvm/kvm_loongarch.htarget/loongarch/cpu.c +1
-0@@ -12,6 +12,7 @@ #include "qemu/module.h" #include "sysemu/qtest.h" #include "sysemu/tcg.h" +#include "sysemu/kvm.h" #include "exec/exec-all.h" #include "cpu.h" #include "internals.h"target/loongarch/cpu.c line 26
Quoted 5 lines
target/loongarch/cpu.c +2
-0@@ -21,6 +22,10 @@ #include "sysemu/reset.h" #endif #include "vec.h" +#ifdef CONFIG_KVM +#include "kvm/kvm_loongarch.h" This broken tcg 'loongarch64-softmmu' build on X86 host, :-[
../target/loongarch/cpu.c: In function ‘loongarch_cpu_set_irq’:../target/loongarch/cpu.c:122:9: error: implicit declaration of function ‘kvm_loongarch_set_interrupt’ [-Werror=implicit-function-declaration]
122 |kvm_loongarch_set_interrupt(cpu, irq, level);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~../target/loongarch/cpu.c:122:9: error: nested extern declaration of ‘kvm_loongarch_set_interrupt’ [-Werror=nested-externs]../target/loongarch/cpu.c: In function ‘loongarch_cpu_reset_hold’:../target/loongarch/cpu.c:557:9: error: implicit declaration of function ‘kvm_arch_reset_vcpu’; did you mean ‘kvm_arch_init_vcpu’? [-Werror=implicit-function-declaration]
557 |kvm_arch_reset_vcpu(env);
| ^~~~~~~~~~~~~~~~~~~
|kvm_arch_init_vcpu../target/loongarch/cpu.c:557:9: error: nested extern declaration of ‘kvm_arch_reset_vcpu’ [-Werror=nested-externs]
cc1: all warnings being treated as errors
Quoted 1 line
I will move it out of '#ifdef
CONFIG_KVM'
Oh, right.
(Sorry I only tested on loongarch64 host).
Thanks!
Phil.
PATCH v4 9/9 target/loongarch: Add loongarch kvm into meson build
In reply to Tianrui ZhaoAdd kvm.c into meson.build to compile it when kvm is configed. Meanwhile in meson.build, we set the kvm_targets to loongarch64-softmmu when the cpu is loongarch. And fix the compiling error when config is enable-kvm,disable-tcg.
--- meson.build | 2 ++ target/loongarch/kvm/meson.build | 1 + target/loongarch/meson.build | 1 + 3 files changed, 4 insertions(+) create mode 100644 target/loongarch/kvm/meson.build
meson.build +2 -0
@@ -114,6 +114,8 @@ elif cpu in ['riscv32'] kvm_targets = ['riscv32-softmmu'] elif cpu in ['riscv64'] kvm_targets = ['riscv64-softmmu'] +elif cpu in ['loongarch64'] + kvm_targets = ['loongarch64-softmmu'] else kvm_targets = [] endif
target/loongarch/kvm/meson.build new file +1 -0
@@ -0,0 +1 @@ +loongarch_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
target/loongarch/meson.build +1 -0
@@ -31,3 +31,4 @@ loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss]) target_arch += {'loongarch': loongarch_ss} target_system_arch += {'loongarch': loongarch_system_ss} +subdir('kvm')
Signature · 1 line
2.39.1
Re: [PATCH v4 9/9] target/loongarch: Add loongarch kvm into meson build
Quoted 9 lines · Tianrui Zhao
Add
kvm.cinto meson.build to compile it when kvm is configed. Meanwhile in meson.build, we set thekvm_targetsto loongarch64-softmmu when the cpu is loongarch. And fix the compiling error when config is enable-kvm,disable-tcg.Signed-off-by Tianrui Zhao <[email protected]>Signed-off-by xianglai li <[email protected]>Reviewed-by Richard Henderson <[email protected]>
Quoted 6 lines
--- meson.build | 2 ++ target/loongarch/kvm/meson.build | 1 + target/loongarch/meson.build | 1 + 3 files changed, 4 insertions(+)create mode 100644 target/loongarch/kvm/meson.build
Thanks.
Song Gao
Quoted 29 lines
meson.build +2
-0@@ -114,6 +114,8 @@ elif cpu in ['riscv32'] kvm_targets = ['riscv32-softmmu'] elif cpu in ['riscv64'] kvm_targets = ['riscv64-softmmu'] +elif cpu in ['loongarch64']Reviewed-by: Song Gao <[email protected]> + kvm_targets = ['loongarch64-softmmu'] else kvm_targets = [] endiftarget/loongarch/kvm/meson.build new file +1
-0@@ -0,0 +1 @@ +loongarch_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))target/loongarch/meson.build +1
-0@@ -31,3 +31,4 @@ loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss]) target_arch += {'loongarch': loongarch_ss} target_system_arch += {'loongarch': loongarch_system_ss} +subdir('kvm')
gaosong
AppliedQuoted 113 lines · Tianrui Zhao
The linux headers in this patch synchronized from linux kernel v6.7.0-rc8, and the loongarch kvm part of this patch series based on the header files. And the linux kernel has added the loongarch kvm support in master branch.
This series add loongarch kvm support, mainly implement some interfaces used by kvm, such as kvm_arch_get/set_regs,
kvm_arch_handle_exit,kvm_loongarch_set_interrupt, etc.Currently, we are able to boot LoongArch KVM Linux Guests. In loongarch VM, mmio devices and iocsr devices are emulated in user space such as APIC, IPI, pci devices, etc, other hardwares such as MMU, timer and csr are emulated in kernel.
The running environment of LoongArch virt machine:
1. Get the Linux KVM environment of LoongArch in Linux mainline.
make ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu-loongson3_defconfigmake ARCH=loongarch CROSS_COMPILE=loongarch64-unknown-linux-gnu-
2. Get the qemu source: https://github.com/loongson/qemu
git checkout kvm-loongarch
./configure --target-list="loongarch64-softmmu" --enable-kvm
make
3. Get uefi bios of LoongArch virt machine:4. Also you can access the binary files we have already built:
https://github.com/yangxiaojuan-loongson/qemu-binaryThe command to boot loongarch virt machine:
$ qemu-system-loongarch64 -machine virt -m 4G -cpu la464 \ -smp 1 -bios QEMU_EFI.fd -kernel vmlinuz.efi -initrd ramdisk \ -serial stdio -monitor telnet:localhost:4495,server,nowait \ -append "root=/dev/ram rdinit=/sbin/init console=ttyS0,115200" \ --nographicChanges for v4:
1. Synchronize linux headers from linux v6.7.0-rc8.
2. Movekvm.candkvm_loongarch.hinto target/loongarch/kvm/ directory.
3. Add "#ifndefCONFIG_USER_ONLY" beforeloongarch_cpu_do_interruptto fix compiling issue.
4. Remove "#ifdefCONFIG_TCG" before "#include "exec/cpu_ldst.h"" infpu_helper.c, As it has been changed in other patches.Changes for v3:
1. Synchronize linux headers from linux v6.7.0-rc7.
2. Fix compiling error when config enable-kvm and disable-tcg at one time.Changes for v2:
1. Synchronize linux headers from linux v6.7.0-rc6.
2. Remove the stub function:kvm_loongarch_set_interrupt, askvm_enabled
3. Move the kvm function such askvm_arch_reset_vcpufromcpu.htoloongarch_kvm.h, and supplement "#include <cpu.h>" inloongarch_kvm.h.Changes for v1:
1. Synchronous KVM headers about LoongArch KVM form linux kernel, as the LoongArch KVM patch series have been accepted by linux kernel.
2. Remove the KVM_GET/SET_ONE_UREG64 macro in target/loongarch, and use the common interface kvm_get/set_one_reg to replace it.
3. Resolve the compiling errors when LoongArch is built by other archs.Tianrui Zhao (9):
linux-headers: Synchronize linux headers from linux v6.7.0-rc8 target/loongarch: Define somekvm_archinterfaces target/loongarch: Supplement vcpu env initial when vcpu reset target/loongarch: Implement kvm get/set registers target/loongarch: Implementkvm_arch_initfunction target/loongarch: Implementkvm_arch_init_vcputarget/loongarch: Implementkvm_arch_handle_exittarget/loongarch: Implement set vcpu intr for kvm target/loongarch: Add loongarch kvm into meson buildinclude/standard-headers/drm/drm_fourcc.h | 2 + include/standard-headers/linux/fuse.h | 10 +- include/standard-headers/linux/pci_regs.h | 24 +- include/standard-headers/linux/vhost_types.h | 7 + .../standard-headers/linux/virtio_config.h | 5 + include/standard-headers/linux/virtio_pci.h | 11 + linux-headers/asm-arm64/kvm.h | 32 + linux-headers/asm-generic/unistd.h | 14 +- linux-headers/asm-loongarch/bitsperlong.h | 1 + linux-headers/asm-loongarch/kvm.h | 108 +++ linux-headers/asm-loongarch/mman.h | 1 + linux-headers/asm-loongarch/unistd.h | 5 + linux-headers/asm-mips/unistd_n32.h | 4 + linux-headers/asm-mips/unistd_n64.h | 4 + linux-headers/asm-mips/unistd_o32.h | 4 + linux-headers/asm-powerpc/unistd_32.h | 4 + linux-headers/asm-powerpc/unistd_64.h | 4 + linux-headers/asm-riscv/kvm.h | 12 + linux-headers/asm-s390/unistd_32.h | 4 + linux-headers/asm-s390/unistd_64.h | 4 + linux-headers/asm-x86/unistd_32.h | 4 + linux-headers/asm-x86/unistd_64.h | 3 + linux-headers/asm-x86/unistd_x32.h | 3 + linux-headers/linux/iommufd.h | 180 +++- linux-headers/linux/kvm.h | 11 + linux-headers/linux/psp-sev.h | 1 + linux-headers/linux/stddef.h | 9 +- linux-headers/linux/userfaultfd.h | 9 +- linux-headers/linux/vfio.h | 47 +- linux-headers/linux/vhost.h | 8 + meson.build | 3 + target/loongarch/cpu.c | 39 +- target/loongarch/cpu.h | 5 +- target/loongarch/internals.h | 5 +- target/loongarch/kvm/kvm.c | 768 ++++++++++++++++++ target/loongarch/kvm/kvm_loongarch.h | 16 + target/loongarch/kvm/meson.build | 1 + target/loongarch/meson.build | 1 + target/loongarch/trace-events | 15 + target/loongarch/trace.h | 1 + 40 files changed, 1348 insertions(+), 41 deletions(-)
Quoted 10 lines
create mode 100644
linux-headers/asm-loongarch/bitsperlong.hcreate mode 100644linux-headers/asm-loongarch/kvm.hcreate mode 100644linux-headers/asm-loongarch/mman.hcreate mode 100644linux-headers/asm-loongarch/unistd.hcreate mode 100644target/loongarch/kvm/kvm.ccreate mode 100644target/loongarch/kvm/kvm_loongarch.hcreate mode 100644 target/loongarch/kvm/meson.build create mode 100644 target/loongarch/trace-events create mode 100644target/loongarch/trace.h
Applied to loongarch-next.
Thanks.
Song Gao
Hi Song,
Quoted 19 lines · gaosong
Quoted 5 lines · Tianrui Zhao
This series add loongarch kvm support, mainly implement some interfaces used by kvm, such as kvm_arch_get/set_regs,
kvm_arch_handle_exit,kvm_loongarch_set_interrupt, etc.Quoted 10 lines
Tianrui Zhao (9):
linux-headers: Synchronize linux headers from linux v6.7.0-rc8 target/loongarch: Define somekvm_archinterfaces target/loongarch: Supplement vcpu env initial when vcpu reset target/loongarch: Implement kvm get/set registers target/loongarch: Implementkvm_arch_initfunction target/loongarch: Implementkvm_arch_init_vcputarget/loongarch: Implementkvm_arch_handle_exittarget/loongarch: Implement set vcpu intr for kvm target/loongarch: Add loongarch kvm into meson build
Quoted 1 line
Applied to loongarch-next.
Sorry it took me some time to test this on a loongarch64
host. I made minor changes to patch #8, please consider
the alternative:
https://lore.kernel.org/qemu-devel/[email protected]/ and
https://lore.kernel.org/qemu-devel/[email protected]/
Quoted 22 lines · Philippe Mathieu-Daudé
Hi Song,
Quoted 17 lines · gaosong
Quoted 15 lines · Tianrui Zhao
This series add loongarch kvm support, mainly implement some interfaces used by kvm, such as kvm_arch_get/set_regs,
kvm_arch_handle_exit,kvm_loongarch_set_interrupt, etc.Tianrui Zhao (9):
linux-headers: Synchronize linux headers from linux v6.7.0-rc8 target/loongarch: Define somekvm_archinterfaces target/loongarch: Supplement vcpu env initial when vcpu reset target/loongarch: Implement kvm get/set registers target/loongarch: Implementkvm_arch_initfunction target/loongarch: Implementkvm_arch_init_vcputarget/loongarch: Implementkvm_arch_handle_exittarget/loongarch: Implement set vcpu intr for kvm target/loongarch: Add loongarch kvm into meson build
Quoted 8 lines
Quoted 1 line
Applied to loongarch-next.
Sorry it took me some time to test this on a loongarch64
host. I made minor changes to patch #8, please consider
the alternative:
https://lore.kernel.org/qemu-devel/[email protected]/ and
https://lore.kernel.org/qemu-devel/[email protected]/
Thank you , I wll apply them to loongarch-next.
if no new problem with this series, I think we can merge it on this week.
Thanks.
Song Gao