spapr: add KVM support to the XIVE interrupt mode
v4 cover spapr: add KVM support to the XIVE interrupt mode
Hello,
This is the v4 of the QEMU/KVM patchset.
The first patches introduce the XIVE KVM device, state synchronization and migration support under KVM. The second part of the patchset modifies the XICS and XIVE interrupt models to add KVM support to the 'dual' IRQ backend.
GitHub trees available here :
QEMU sPAPR:
https://github.com/legoater/qemu/commits/xive-next
Linux/KVM:
https://github.com/legoater/linux/commits/xive-5.1
Thanks,
C.
Changes since v3:
- updates of the kvm headers are synced with commit 0caecf5b0019 (kvm-ppc-next-5.2-1) in branch kvm-ppc-next. will conflict with kvm-arm.
- added usage of xive_end_qaddr() helper
- removed KVM_DESTROY_DEVICE control. KVM device is destroyed when the fd is closed.
- update in kvmppc_xive_source_reset_one()
- introduced a 'init' boolean under ICSState
- removed extra spapr_irq_init_device() in spapr_irq_init_xive()
- reworked slightly the code sequence in xics_kvm_init() creating the presenters and connecting them to the KVM XICS device.
Changes since v2:
- update linux headers to 5.1-rc1
- rebased on new naming scheme
- rebased on new configuration system
- replaced error_report_err() by warn_report_err()
- added an assert() in spapr_xive_end_to_target()
- moved xive_end_is_valid() check out of kvmppc_xive_set_queue_config()
- dealt with MASKED EAS
- reworked ESB memory operations
- improved KVM_XIVE_EQ_ALWAYS_NOTIFY handling
- removed the capture of the OS CAM line value from KVM
- merged in the handling of pending interrupts while the VM is stopped.
- did an update in ics_set_kvm_state_one()
- removed spapr_ics_create()
- introduced a spapr_irq_init_device() helper
- reworked test on single initialization of the emulated IRQ device
Changes since v1:
- Reworked most of the KVM interface
- Reworked *All* hcalls which are now handled at the QEMU level, possibly extended with a KVM device ioctl when required.
- TIMA and ESB special mapping done on the KVM device fd.
- Tested on nested
- Implemented the device fallback mode when a kernel_irqchip is not available and not required. Useful on nested to use XIVE.
- Fix device hotplug when VM is stopped (Is this necessary ?)
Cédric Le Goater (14):
linux-headers: update linux headers to kvm-ppc-next-5.2-1 spapr/xive: add KVM support
spapr/xive: add hcall support when under KVM spapr/xive: add state synchronization with KVM spapr/xive: introduce a VM state change handler spapr/xive: add migration support for KVM spapr/xive: activate KVM support
sysbus: add a sysbus_mmio_unmap() helper
spapr: introduce routines to delete the KVM IRQ device
spapr: check for the activation of the KVM IRQ device spapr/irq: introduce a spapr_irq_init_device() helper spapr/irq: initialize the IRQ device only once ppc/xics: fix irq priority in ics_set_irq_type() spapr/irq: add KVM support to the 'dual' machine
include/hw/ppc/spapr_irq.h | 2 + include/hw/ppc/spapr_xive.h | 39 ++ include/hw/ppc/xics.h | 1 + include/hw/ppc/xics_spapr.h | 1 + include/hw/ppc/xive.h | 14 + include/hw/sysbus.h | 1 + linux-headers/asm-powerpc/kvm.h | 46 ++ linux-headers/linux/kvm.h | 3 + target/ppc/kvm_ppc.h | 6 + hw/core/sysbus.c | 10 + hw/intc/spapr_xive.c | 172 ++++++- hw/intc/spapr_xive_kvm.c | 827 ++++++++++++++++++++++++++++++++ hw/intc/xics.c | 10 +- hw/intc/xics_kvm.c | 113 ++++- hw/intc/xics_spapr.c | 7 + hw/intc/xive.c | 44 +- hw/ppc/spapr_irq.c | 140 ++++-- target/ppc/kvm.c | 7 + hw/intc/Makefile.objs | 1 + hw/ppc/Kconfig | 5 + 20 files changed, 1384 insertions(+), 65 deletions(-) create mode 100644 hw/intc/spapr_xive_kvm.c
Signature · 1 line
2.20.1
PATCH v4 1/14 linux-headers: update linux headers to kvm-ppc-next-5.2-1
This updates the kvm headers to commit 0caecf5b0019 (kvm-ppc-next-5.2-1) in branch kvm-ppc-next from :
https://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git/
These changes provide the interface with the KVM device implementing the XIVE native exploitation interrupt mode.
---
The XIVE capability number will conflict with kvm-arm :
555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support") a243c16d18be ("KVM: arm64: Add capability to advertise ptrauth for guest")
linux-headers/asm-powerpc/kvm.h | 46 +++++++++++++++++++++++++++++++++ linux-headers/linux/kvm.h | 3 +++ 2 files changed, 49 insertions(+)
linux-headers/asm-powerpc/kvm.h +46 -0
@@ -480,6 +480,8 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_ICP_PPRI_SHIFT 16/* pending irq priority */ #define KVM_REG_PPC_ICP_PPRI_MASK 0xff +#define KVM_REG_PPC_VP_STATE (KVM_REG_PPC | KVM_REG_SIZE_U128 | 0x8d) +/* Device control API: PPC-specific devices */ #define KVM_DEV_MPIC_GRP_MISC 1#define KVM_DEV_MPIC_BASE_ADDR 0/* 64-bit */
@@ -675,4 +677,48 @@ struct kvm_ppc_cpu_char {#define KVM_XICS_PRESENTED (1ULL << 43)#define KVM_XICS_QUEUED (1ULL << 44) +/* POWER9 XIVE Native Interrupt Controller */ +#define KVM_DEV_XIVE_GRP_CTRL 1 +#define KVM_DEV_XIVE_RESET 1 +#define KVM_DEV_XIVE_EQ_SYNC 2 +#define KVM_DEV_XIVE_GRP_SOURCE 2/* 64-bit source identifier */ +#define KVM_DEV_XIVE_GRP_SOURCE_CONFIG 3/* 64-bit source identifier */ +#define KVM_DEV_XIVE_GRP_EQ_CONFIG 4/* 64-bit EQ identifier */ +#define KVM_DEV_XIVE_GRP_SOURCE_SYNC 5/* 64-bit source identifier */ + +/* Layout of 64-bit XIVE source attribute values */ +#define KVM_XIVE_LEVEL_SENSITIVE (1ULL << 0) +#define KVM_XIVE_LEVEL_ASSERTED (1ULL << 1) + +/* Layout of 64-bit XIVE source configuration attribute values */ +#define KVM_XIVE_SOURCE_PRIORITY_SHIFT 0 +#define KVM_XIVE_SOURCE_PRIORITY_MASK 0x7 +#define KVM_XIVE_SOURCE_SERVER_SHIFT 3 +#define KVM_XIVE_SOURCE_SERVER_MASK 0xfffffff8ULL +#define KVM_XIVE_SOURCE_MASKED_SHIFT 32 +#define KVM_XIVE_SOURCE_MASKED_MASK 0x100000000ULL +#define KVM_XIVE_SOURCE_EISN_SHIFT 33 +#define KVM_XIVE_SOURCE_EISN_MASK 0xfffffffe00000000ULL + +/* Layout of 64-bit EQ identifier */ +#define KVM_XIVE_EQ_PRIORITY_SHIFT 0 +#define KVM_XIVE_EQ_PRIORITY_MASK 0x7 +#define KVM_XIVE_EQ_SERVER_SHIFT 3 +#define KVM_XIVE_EQ_SERVER_MASK 0xfffffff8ULL + +/* Layout of EQ configuration values (64 bytes) */ +struct kvm_ppc_xive_eq { +__u32 flags; +__u32 qshift; +__u64 qaddr; +__u32 qtoggle; +__u32 qindex; +__u8 pad[40 ]; +}; + +#define KVM_XIVE_EQ_ALWAYS_NOTIFY 0x00000001 + +#define KVM_XIVE_TIMA_PAGE_OFFSET 0 +#define KVM_XIVE_ESB_PAGE_OFFSET 4 +#endif /* __LINUX_KVM_POWERPC_H */
linux-headers/linux/kvm.h +3 -0
@@ -988,6 +988,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_ARM_VM_IPA_SIZE 165#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166#define KVM_CAP_HYPERV_CPUID 167 +#define KVM_CAP_PPC_IRQ_XIVE 168#ifdef KVM_CAP_IRQ_ROUTING
@@ -1211,6 +1212,8 @@ enum kvm_device_type {#define KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_ITS,#define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS + KVM_DEV_TYPE_XIVE, +#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_MAX, };
Signature · 1 line
2.20.1
PATCH 1/1 linux-headers: Update linux headers to 5.2-rc1
Update the QEMU copy of the Linux headers to upstream 5.2-rc1 (linux commit a188339ca5a3).
--- .../infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 15 +- include/standard-headers/drm/drm_fourcc.h | 114 +++++++++++- include/standard-headers/linux/ethtool.h | 48 +++-- .../linux/input-event-codes.h | 9 +- include/standard-headers/linux/input.h | 6 +- include/standard-headers/linux/pci_regs.h | 140 ++++++++------- .../standard-headers/linux/virtio_config.h | 6 + include/standard-headers/linux/virtio_gpu.h | 12 +- include/standard-headers/linux/virtio_ring.h | 10 -- .../standard-headers/rdma/vmw_pvrdma-abi.h | 1 + linux-headers/asm-arm/unistd-common.h | 32 ++++ linux-headers/asm-arm64/kvm.h | 43 +++++ linux-headers/asm-arm64/unistd.h | 2 + linux-headers/asm-generic/mman-common.h | 4 +- linux-headers/asm-generic/unistd.h | 170 ++++++++++++++---- linux-headers/asm-mips/mman.h | 4 +- linux-headers/asm-mips/unistd_n32.h | 30 ++++ linux-headers/asm-mips/unistd_n64.h | 10 ++ linux-headers/asm-mips/unistd_o32.h | 40 +++++ linux-headers/asm-powerpc/kvm.h | 48 +++++ linux-headers/asm-powerpc/unistd_32.h | 40 +++++ linux-headers/asm-powerpc/unistd_64.h | 21 +++ linux-headers/asm-s390/kvm.h | 5 +- linux-headers/asm-s390/unistd_32.h | 43 +++++ linux-headers/asm-s390/unistd_64.h | 24 +++ linux-headers/asm-x86/kvm.h | 1 + linux-headers/asm-x86/unistd_32.h | 40 +++++ linux-headers/asm-x86/unistd_64.h | 10 ++ linux-headers/asm-x86/unistd_x32.h | 10 ++ linux-headers/linux/kvm.h | 15 +- linux-headers/linux/mman.h | 4 + linux-headers/linux/psci.h | 7 + linux-headers/linux/psp-sev.h | 18 +- linux-headers/linux/vfio.h | 4 + linux-headers/linux/vfio_ccw.h | 12 ++ 35 files changed, 854 insertions(+), 144 deletions(-)
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h +10 -5
@@ -57,7 +57,8 @@#define PVRDMA_ROCEV1_VERSION 17#define PVRDMA_ROCEV2_VERSION 18 -#define PVRDMA_VERSION PVRDMA_ROCEV2_VERSION +#define PVRDMA_PPN64_VERSION 19 +#define PVRDMA_VERSION PVRDMA_PPN64_VERSION#define PVRDMA_BOARD_ID 1#define PVRDMA_REV_ID 1
@@ -279,8 +280,10 @@ struct pvrdma_device_shared_region {/* W: Async ring page info. */ struct pvrdma_ring_page_info cq_ring_pages;/* W: CQ ring page info. */ -uint32_t uar_pfn;/* W: UAR pageframe. */ -uint32_t pad2;/* Pad to 8-byte align. */ +union { +uint32_t uar_pfn;/* W: UAR pageframe. */ +uint64_t uar_pfn64;/* W: 64-bit UAR page frame. */ + };struct pvrdma_device_caps caps;/* R: Device capabilities. */ };
@@ -411,8 +414,10 @@ struct pvrdma_cmd_query_pkey_resp {struct pvrdma_cmd_create_uc {struct pvrdma_cmd_hdr hdr; -uint32_t pfn;/* UAR page frame number */ -uint8_t reserved[4 ]; +union { +uint32_t pfn;/* UAR page frame number */ +uint64_t pfn64;/* 64-bit UAR page frame number */ + }; };struct pvrdma_cmd_create_uc_resp {
include/standard-headers/drm/drm_fourcc.h +113 -1
166 lines not on this page · raw message
include/standard-headers/linux/ethtool.h +38 -10
86 lines not on this page · raw message
include/standard-headers/linux/input-event-codes.h +7 -2
@@ -439,10 +439,12 @@#define KEY_TITLE 0x171#define KEY_SUBTITLE 0x172#define KEY_ANGLE 0x173 -#define KEY_ZOOM 0x174 +#define KEY_FULL_SCREEN 0x174/* AC View Toggle */ +#define KEY_ZOOM KEY_FULL_SCREEN#define KEY_MODE 0x175#define KEY_KEYBOARD 0x176 -#define KEY_SCREEN 0x177 +#define KEY_ASPECT_RATIO 0x177/* HUTRR37: Aspect */ +#define KEY_SCREEN KEY_ASPECT_RATIO#define KEY_PC 0x178/* Media Select Computer */ #define KEY_TV 0x179/* Media Select TV */ #define KEY_TV2 0x17a/* Media Select Cable */
@@ -604,6 +606,7 @@#define KEY_SCREENSAVER 0x245/* AL Screen Saver */ #define KEY_VOICECOMMAND 0x246/* Listening Voice Command */ #define KEY_ASSISTANT 0x247/* AL Context-aware desktop assistant */ +#define KEY_KBD_LAYOUT_NEXT 0x248/* AC Next Keyboard Layout Select */ #define KEY_BRIGHTNESS_MIN 0x250/* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251/* Set Brightness to Maximum */
@@ -716,6 +719,8 @@* the situation described above. */ #define REL_RESERVED 0x0a +#define REL_WHEEL_HI_RES 0x0b +#define REL_HWHEEL_HI_RES 0x0c#define REL_MAX 0x0f#define REL_CNT (REL_MAX+1)
include/standard-headers/linux/input.h +5 -1
@@ -23,13 +23,17 @@*/ struct input_event { -#if (HOST_LONG_BITS !=32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL) +#if (HOST_LONG_BITS !=32 || !defined(__USE_TIME_BITS64)) && !defined(__KERNEL__)struct timeval time;#define input_event_sec time.tv_sec#define input_event_usec time.tv_usec#else unsigned long __sec; +#if defined(__sparc__) && defined(__arch64__) +unsigned int __usec; +#else unsigned long __usec; +#endif #define input_event_sec __sec#define input_event_usec __usec#endif
include/standard-headers/linux/pci_regs.h +73 -67
245 lines not on this page · raw message
include/standard-headers/linux/virtio_config.h +6 -0
@@ -78,6 +78,12 @@/* This feature indicates support for the packed virtqueue layout. */ #define VIRTIO_F_RING_PACKED 34 +/* +* This feature indicates that memory accesses by the driver and the +* device are ordered in a way described by the platform. +*/ +#define VIRTIO_F_ORDER_PLATFORM 36 +/* * Does the device support Single Root I/O Virtualization? */
include/standard-headers/linux/virtio_gpu.h +10 -2
@@ -40,8 +40,16 @@#include "standard-headers/linux/types.h" -#define VIRTIO_GPU_F_VIRGL 0 -#define VIRTIO_GPU_F_EDID 1 +/* +* VIRTIO_GPU_CMD_CTX_* +* VIRTIO_GPU_CMD_*_3D +*/ +#define VIRTIO_GPU_F_VIRGL 0 + +/* +* VIRTIO_GPU_CMD_GET_EDID +*/ +#define VIRTIO_GPU_F_EDID 1enum virtio_gpu_ctrl_type {VIRTIO_GPU_UNDEFINED =0 ,
include/standard-headers/linux/virtio_ring.h +0 -10
@@ -211,14 +211,4 @@ struct vring_packed_desc { uint16_t flags; }; -struct vring_packed { -unsigned int num; - -struct vring_packed_desc *desc; - -struct vring_packed_desc_event *driver; - -struct vring_packed_desc_event *device; -}; -#endif /* _LINUX_VIRTIO_RING_H */
include/standard-headers/rdma/vmw_pvrdma-abi.h +1 -0
@@ -78,6 +78,7 @@ enum pvrdma_wr_opcode {PVRDMA_WR_MASKED_ATOMIC_FETCH_AND_ADD ,PVRDMA_WR_BIND_MW ,PVRDMA_WR_REG_SIG_MR , + PVRDMA_WR_ERROR, }; enum pvrdma_wc_status {
linux-headers/asm-arm/unistd-common.h +32 -0
@@ -356,5 +356,37 @@#define __NR_statx (__NR_SYSCALL_BASE + 397)#define __NR_rseq (__NR_SYSCALL_BASE + 398)#define __NR_io_pgetevents (__NR_SYSCALL_BASE + 399) +#define __NR_migrate_pages (__NR_SYSCALL_BASE + 400) +#define __NR_kexec_file_load (__NR_SYSCALL_BASE + 401) +#define __NR_clock_gettime64 (__NR_SYSCALL_BASE + 403) +#define __NR_clock_settime64 (__NR_SYSCALL_BASE + 404) +#define __NR_clock_adjtime64 (__NR_SYSCALL_BASE + 405) +#define __NR_clock_getres_time64 (__NR_SYSCALL_BASE + 406) +#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE + 407) +#define __NR_timer_gettime64 (__NR_SYSCALL_BASE + 408) +#define __NR_timer_settime64 (__NR_SYSCALL_BASE + 409) +#define __NR_timerfd_gettime64 (__NR_SYSCALL_BASE + 410) +#define __NR_timerfd_settime64 (__NR_SYSCALL_BASE + 411) +#define __NR_utimensat_time64 (__NR_SYSCALL_BASE + 412) +#define __NR_pselect6_time64 (__NR_SYSCALL_BASE + 413) +#define __NR_ppoll_time64 (__NR_SYSCALL_BASE + 414) +#define __NR_io_pgetevents_time64 (__NR_SYSCALL_BASE + 416) +#define __NR_recvmmsg_time64 (__NR_SYSCALL_BASE + 417) +#define __NR_mq_timedsend_time64 (__NR_SYSCALL_BASE + 418) +#define __NR_mq_timedreceive_time64 (__NR_SYSCALL_BASE + 419) +#define __NR_semtimedop_time64 (__NR_SYSCALL_BASE + 420) +#define __NR_rt_sigtimedwait_time64 (__NR_SYSCALL_BASE + 421) +#define __NR_futex_time64 (__NR_SYSCALL_BASE + 422) +#define __NR_sched_rr_get_interval_time64 (__NR_SYSCALL_BASE + 423) +#define __NR_pidfd_send_signal (__NR_SYSCALL_BASE + 424) +#define __NR_io_uring_setup (__NR_SYSCALL_BASE + 425) +#define __NR_io_uring_enter (__NR_SYSCALL_BASE + 426) +#define __NR_io_uring_register (__NR_SYSCALL_BASE + 427) +#define __NR_open_tree (__NR_SYSCALL_BASE + 428) +#define __NR_move_mount (__NR_SYSCALL_BASE + 429) +#define __NR_fsopen (__NR_SYSCALL_BASE + 430) +#define __NR_fsconfig (__NR_SYSCALL_BASE + 431) +#define __NR_fsmount (__NR_SYSCALL_BASE + 432) +#define __NR_fspick (__NR_SYSCALL_BASE + 433)#endif /* _ASM_ARM_UNISTD_COMMON_H */
linux-headers/asm-arm64/kvm.h +43 -0
61 lines not on this page · raw message
linux-headers/asm-arm64/unistd.h +2 -0
@@ -17,5 +17,7 @@#define __ARCH_WANT_RENAMEAT#define __ARCH_WANT_NEW_STAT +#define __ARCH_WANT_SET_GET_RLIMIT +#define __ARCH_WANT_TIME32_SYSCALLS#include <asm-generic/unistd.h>
linux-headers/asm-generic/mman-common.h +1 -3
@@ -15,9 +15,7 @@#define PROT_GROWSDOWN 0x01000000/* mprotect flag: extend change to start of growsdown vma */ #define PROT_GROWSUP 0x02000000/* mprotect flag: extend change to end of growsup vma */ -#define MAP_SHARED 0x01/* Share changes */ -#define MAP_PRIVATE 0x02/* Changes are private */ -#define MAP_SHARED_VALIDATE 0x03/* share + validate extension flags */ +/* 0x01 - 0x03 are defined in linux/mman.h */ #define MAP_TYPE 0x0f/* Mask for type of mapping */ #define MAP_FIXED 0x10/* Interpret addr exactly */ #define MAP_ANONYMOUS 0x20/* don't use a file */
linux-headers/asm-generic/unistd.h +137 -33
317 lines not on this page · raw message
linux-headers/asm-mips/mman.h +1 -3
@@ -27,9 +27,7 @@/* * Flags for mmap */ -#define MAP_SHARED 0x001/* Share changes */ -#define MAP_PRIVATE 0x002/* Changes are private */ -#define MAP_SHARED_VALIDATE 0x003/* share + validate extension flags */ +/* 0x01 - 0x03 are defined in linux/mman.h */ #define MAP_TYPE 0x00f/* Mask for type of mapping */ #define MAP_FIXED 0x010/* Interpret addr exactly */
linux-headers/asm-mips/unistd_n32.h +30 -0
@@ -333,6 +333,36 @@#define __NR_statx (__NR_Linux + 330)#define __NR_rseq (__NR_Linux + 331)#define __NR_io_pgetevents (__NR_Linux + 332) +#define __NR_clock_gettime64 (__NR_Linux + 403) +#define __NR_clock_settime64 (__NR_Linux + 404) +#define __NR_clock_adjtime64 (__NR_Linux + 405) +#define __NR_clock_getres_time64 (__NR_Linux + 406) +#define __NR_clock_nanosleep_time64 (__NR_Linux + 407) +#define __NR_timer_gettime64 (__NR_Linux + 408) +#define __NR_timer_settime64 (__NR_Linux + 409) +#define __NR_timerfd_gettime64 (__NR_Linux + 410) +#define __NR_timerfd_settime64 (__NR_Linux + 411) +#define __NR_utimensat_time64 (__NR_Linux + 412) +#define __NR_pselect6_time64 (__NR_Linux + 413) +#define __NR_ppoll_time64 (__NR_Linux + 414) +#define __NR_io_pgetevents_time64 (__NR_Linux + 416) +#define __NR_recvmmsg_time64 (__NR_Linux + 417) +#define __NR_mq_timedsend_time64 (__NR_Linux + 418) +#define __NR_mq_timedreceive_time64 (__NR_Linux + 419) +#define __NR_semtimedop_time64 (__NR_Linux + 420) +#define __NR_rt_sigtimedwait_time64 (__NR_Linux + 421) +#define __NR_futex_time64 (__NR_Linux + 422) +#define __NR_sched_rr_get_interval_time64 (__NR_Linux + 423) +#define __NR_pidfd_send_signal (__NR_Linux + 424) +#define __NR_io_uring_setup (__NR_Linux + 425) +#define __NR_io_uring_enter (__NR_Linux + 426) +#define __NR_io_uring_register (__NR_Linux + 427) +#define __NR_open_tree (__NR_Linux + 428) +#define __NR_move_mount (__NR_Linux + 429) +#define __NR_fsopen (__NR_Linux + 430) +#define __NR_fsconfig (__NR_Linux + 431) +#define __NR_fsmount (__NR_Linux + 432) +#define __NR_fspick (__NR_Linux + 433)#endif /* _ASM_MIPS_UNISTD_N32_H */
linux-headers/asm-mips/unistd_n64.h +10 -0
@@ -329,6 +329,16 @@#define __NR_statx (__NR_Linux + 326)#define __NR_rseq (__NR_Linux + 327)#define __NR_io_pgetevents (__NR_Linux + 328) +#define __NR_pidfd_send_signal (__NR_Linux + 424) +#define __NR_io_uring_setup (__NR_Linux + 425) +#define __NR_io_uring_enter (__NR_Linux + 426) +#define __NR_io_uring_register (__NR_Linux + 427) +#define __NR_open_tree (__NR_Linux + 428) +#define __NR_move_mount (__NR_Linux + 429) +#define __NR_fsopen (__NR_Linux + 430) +#define __NR_fsconfig (__NR_Linux + 431) +#define __NR_fsmount (__NR_Linux + 432) +#define __NR_fspick (__NR_Linux + 433)#endif /* _ASM_MIPS_UNISTD_N64_H */
linux-headers/asm-mips/unistd_o32.h +40 -0
@@ -369,6 +369,46 @@#define __NR_statx (__NR_Linux + 366)#define __NR_rseq (__NR_Linux + 367)#define __NR_io_pgetevents (__NR_Linux + 368) +#define __NR_semget (__NR_Linux + 393) +#define __NR_semctl (__NR_Linux + 394) +#define __NR_shmget (__NR_Linux + 395) +#define __NR_shmctl (__NR_Linux + 396) +#define __NR_shmat (__NR_Linux + 397) +#define __NR_shmdt (__NR_Linux + 398) +#define __NR_msgget (__NR_Linux + 399) +#define __NR_msgsnd (__NR_Linux + 400) +#define __NR_msgrcv (__NR_Linux + 401) +#define __NR_msgctl (__NR_Linux + 402) +#define __NR_clock_gettime64 (__NR_Linux + 403) +#define __NR_clock_settime64 (__NR_Linux + 404) +#define __NR_clock_adjtime64 (__NR_Linux + 405) +#define __NR_clock_getres_time64 (__NR_Linux + 406) +#define __NR_clock_nanosleep_time64 (__NR_Linux + 407) +#define __NR_timer_gettime64 (__NR_Linux + 408) +#define __NR_timer_settime64 (__NR_Linux + 409) +#define __NR_timerfd_gettime64 (__NR_Linux + 410) +#define __NR_timerfd_settime64 (__NR_Linux + 411) +#define __NR_utimensat_time64 (__NR_Linux + 412) +#define __NR_pselect6_time64 (__NR_Linux + 413) +#define __NR_ppoll_time64 (__NR_Linux + 414) +#define __NR_io_pgetevents_time64 (__NR_Linux + 416) +#define __NR_recvmmsg_time64 (__NR_Linux + 417) +#define __NR_mq_timedsend_time64 (__NR_Linux + 418) +#define __NR_mq_timedreceive_time64 (__NR_Linux + 419) +#define __NR_semtimedop_time64 (__NR_Linux + 420) +#define __NR_rt_sigtimedwait_time64 (__NR_Linux + 421) +#define __NR_futex_time64 (__NR_Linux + 422) +#define __NR_sched_rr_get_interval_time64 (__NR_Linux + 423) +#define __NR_pidfd_send_signal (__NR_Linux + 424) +#define __NR_io_uring_setup (__NR_Linux + 425) +#define __NR_io_uring_enter (__NR_Linux + 426) +#define __NR_io_uring_register (__NR_Linux + 427) +#define __NR_open_tree (__NR_Linux + 428) +#define __NR_move_mount (__NR_Linux + 429) +#define __NR_fsopen (__NR_Linux + 430) +#define __NR_fsconfig (__NR_Linux + 431) +#define __NR_fsmount (__NR_Linux + 432) +#define __NR_fspick (__NR_Linux + 433)#endif /* _ASM_MIPS_UNISTD_O32_H */
linux-headers/asm-powerpc/kvm.h +48 -0
68 lines not on this page · raw message
linux-headers/asm-powerpc/unistd_32.h +40 -0
@@ -376,6 +376,46 @@#define __NR_pkey_mprotect 386#define __NR_rseq 387#define __NR_io_pgetevents 388 +#define __NR_semget 393 +#define __NR_semctl 394 +#define __NR_shmget 395 +#define __NR_shmctl 396 +#define __NR_shmat 397 +#define __NR_shmdt 398 +#define __NR_msgget 399 +#define __NR_msgsnd 400 +#define __NR_msgrcv 401 +#define __NR_msgctl 402 +#define __NR_clock_gettime64 403 +#define __NR_clock_settime64 404 +#define __NR_clock_adjtime64 405 +#define __NR_clock_getres_time64 406 +#define __NR_clock_nanosleep_time64 407 +#define __NR_timer_gettime64 408 +#define __NR_timer_settime64 409 +#define __NR_timerfd_gettime64 410 +#define __NR_timerfd_settime64 411 +#define __NR_utimensat_time64 412 +#define __NR_pselect6_time64 413 +#define __NR_ppoll_time64 414 +#define __NR_io_pgetevents_time64 416 +#define __NR_recvmmsg_time64 417 +#define __NR_mq_timedsend_time64 418 +#define __NR_mq_timedreceive_time64 419 +#define __NR_semtimedop_time64 420 +#define __NR_rt_sigtimedwait_time64 421 +#define __NR_futex_time64 422 +#define __NR_sched_rr_get_interval_time64 423 +#define __NR_pidfd_send_signal 424 +#define __NR_io_uring_setup 425 +#define __NR_io_uring_enter 426 +#define __NR_io_uring_register 427 +#define __NR_open_tree 428 +#define __NR_move_mount 429 +#define __NR_fsopen 430 +#define __NR_fsconfig 431 +#define __NR_fsmount 432 +#define __NR_fspick 433#endif /* _ASM_POWERPC_UNISTD_32_H */
linux-headers/asm-powerpc/unistd_64.h +21 -0
@@ -367,6 +367,27 @@#define __NR_pkey_mprotect 386#define __NR_rseq 387#define __NR_io_pgetevents 388 +#define __NR_semtimedop 392 +#define __NR_semget 393 +#define __NR_semctl 394 +#define __NR_shmget 395 +#define __NR_shmctl 396 +#define __NR_shmat 397 +#define __NR_shmdt 398 +#define __NR_msgget 399 +#define __NR_msgsnd 400 +#define __NR_msgrcv 401 +#define __NR_msgctl 402 +#define __NR_pidfd_send_signal 424 +#define __NR_io_uring_setup 425 +#define __NR_io_uring_enter 426 +#define __NR_io_uring_register 427 +#define __NR_open_tree 428 +#define __NR_move_mount 429 +#define __NR_fsopen 430 +#define __NR_fsconfig 431 +#define __NR_fsmount 432 +#define __NR_fspick 433#endif /* _ASM_POWERPC_UNISTD_64_H */
linux-headers/asm-s390/kvm.h +4 -1
@@ -152,7 +152,10 @@ struct kvm_s390_vm_cpu_subfunc {__u8 pcc[16 ];/* with MSA4 */ __u8 ppno[16 ];/* with MSA5 */ __u8 kma[16 ];/* with MSA8 */ -__u8 reserved[1808 ]; +__u8 kdsa[16 ];/* with MSA9 */ +__u8 sortl[32 ];/* with STFLE.150 */ +__u8 dfltcc[32 ];/* with STFLE.151 */ +__u8 reserved[1728 ]; };/* kvm attributes for crypto */
linux-headers/asm-s390/unistd_32.h +43 -0
48 lines not on this page · raw message
linux-headers/asm-s390/unistd_64.h +24 -0
@@ -330,5 +330,29 @@#define __NR_kexec_file_load 381#define __NR_io_pgetevents 382#define __NR_rseq 383 +#define __NR_pkey_mprotect 384 +#define __NR_pkey_alloc 385 +#define __NR_pkey_free 386 +#define __NR_semtimedop 392 +#define __NR_semget 393 +#define __NR_semctl 394 +#define __NR_shmget 395 +#define __NR_shmctl 396 +#define __NR_shmat 397 +#define __NR_shmdt 398 +#define __NR_msgget 399 +#define __NR_msgsnd 400 +#define __NR_msgrcv 401 +#define __NR_msgctl 402 +#define __NR_pidfd_send_signal 424 +#define __NR_io_uring_setup 425 +#define __NR_io_uring_enter 426 +#define __NR_io_uring_register 427 +#define __NR_open_tree 428 +#define __NR_move_mount 429 +#define __NR_fsopen 430 +#define __NR_fsconfig 431 +#define __NR_fsmount 432 +#define __NR_fspick 433#endif /* _ASM_S390_UNISTD_64_H */
linux-headers/asm-x86/kvm.h +1 -0
@@ -381,6 +381,7 @@ struct kvm_sync_regs {#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1)#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2) +#define KVM_X86_QUIRK_OUT_7E_INC_RIP (1 << 3)#define KVM_STATE_NESTED_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_RUN_PENDING 0x00000002
linux-headers/asm-x86/unistd_32.h +40 -0
@@ -384,5 +384,45 @@#define __NR_arch_prctl 384#define __NR_io_pgetevents 385#define __NR_rseq 386 +#define __NR_semget 393 +#define __NR_semctl 394 +#define __NR_shmget 395 +#define __NR_shmctl 396 +#define __NR_shmat 397 +#define __NR_shmdt 398 +#define __NR_msgget 399 +#define __NR_msgsnd 400 +#define __NR_msgrcv 401 +#define __NR_msgctl 402 +#define __NR_clock_gettime64 403 +#define __NR_clock_settime64 404 +#define __NR_clock_adjtime64 405 +#define __NR_clock_getres_time64 406 +#define __NR_clock_nanosleep_time64 407 +#define __NR_timer_gettime64 408 +#define __NR_timer_settime64 409 +#define __NR_timerfd_gettime64 410 +#define __NR_timerfd_settime64 411 +#define __NR_utimensat_time64 412 +#define __NR_pselect6_time64 413 +#define __NR_ppoll_time64 414 +#define __NR_io_pgetevents_time64 416 +#define __NR_recvmmsg_time64 417 +#define __NR_mq_timedsend_time64 418 +#define __NR_mq_timedreceive_time64 419 +#define __NR_semtimedop_time64 420 +#define __NR_rt_sigtimedwait_time64 421 +#define __NR_futex_time64 422 +#define __NR_sched_rr_get_interval_time64 423 +#define __NR_pidfd_send_signal 424 +#define __NR_io_uring_setup 425 +#define __NR_io_uring_enter 426 +#define __NR_io_uring_register 427 +#define __NR_open_tree 428 +#define __NR_move_mount 429 +#define __NR_fsopen 430 +#define __NR_fsconfig 431 +#define __NR_fsmount 432 +#define __NR_fspick 433#endif /* _ASM_X86_UNISTD_32_H */
linux-headers/asm-x86/unistd_64.h +10 -0
@@ -336,5 +336,15 @@#define __NR_statx 332#define __NR_io_pgetevents 333#define __NR_rseq 334 +#define __NR_pidfd_send_signal 424 +#define __NR_io_uring_setup 425 +#define __NR_io_uring_enter 426 +#define __NR_io_uring_register 427 +#define __NR_open_tree 428 +#define __NR_move_mount 429 +#define __NR_fsopen 430 +#define __NR_fsconfig 431 +#define __NR_fsmount 432 +#define __NR_fspick 433#endif /* _ASM_X86_UNISTD_64_H */
linux-headers/asm-x86/unistd_x32.h +10 -0
@@ -289,6 +289,16 @@#define __NR_statx (__X32_SYSCALL_BIT + 332)#define __NR_io_pgetevents (__X32_SYSCALL_BIT + 333)#define __NR_rseq (__X32_SYSCALL_BIT + 334) +#define __NR_pidfd_send_signal (__X32_SYSCALL_BIT + 424) +#define __NR_io_uring_setup (__X32_SYSCALL_BIT + 425) +#define __NR_io_uring_enter (__X32_SYSCALL_BIT + 426) +#define __NR_io_uring_register (__X32_SYSCALL_BIT + 427) +#define __NR_open_tree (__X32_SYSCALL_BIT + 428) +#define __NR_move_mount (__X32_SYSCALL_BIT + 429) +#define __NR_fsopen (__X32_SYSCALL_BIT + 430) +#define __NR_fsconfig (__X32_SYSCALL_BIT + 431) +#define __NR_fsmount (__X32_SYSCALL_BIT + 432) +#define __NR_fspick (__X32_SYSCALL_BIT + 433)#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/kvm.h +13 -2
@@ -986,8 +986,13 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163#define KVM_CAP_EXCEPTION_PAYLOAD 164#define KVM_CAP_ARM_VM_IPA_SIZE 165 -#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166 +#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166/* Obsolete */ #define KVM_CAP_HYPERV_CPUID 167 +#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 168 +#define KVM_CAP_PPC_IRQ_XIVE 169 +#define KVM_CAP_ARM_SVE 170 +#define KVM_CAP_ARM_PTRAUTH_ADDRESS 171 +#define KVM_CAP_ARM_PTRAUTH_GENERIC 172#ifdef KVM_CAP_IRQ_ROUTING
@@ -1145,6 +1150,7 @@ struct kvm_dirty_tlb {#define KVM_REG_SIZE_U256 0x0050000000000000ULL#define KVM_REG_SIZE_U512 0x0060000000000000ULL#define KVM_REG_SIZE_U1024 0x0070000000000000ULL +#define KVM_REG_SIZE_U2048 0x0080000000000000ULLstruct kvm_reg_list {__u64 n;/* number of regs */
@@ -1211,6 +1217,8 @@ enum kvm_device_type {#define KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_ITS,#define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS + KVM_DEV_TYPE_XIVE, +#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_MAX, };
@@ -1434,12 +1442,15 @@ struct kvm_enc_region {#define KVM_GET_NESTED_STATE _IOWR(KVMIO, 0xbe, struct kvm_nested_state)#define KVM_SET_NESTED_STATE _IOW(KVMIO, 0xbf, struct kvm_nested_state) -/* Available with KVM_CAP_MANUAL_DIRTY_LOG_PROTECT */ +/* Available with KVM_CAP_MANUAL_DIRTY_LOG_PROTECT_2 */ #define KVM_CLEAR_DIRTY_LOG _IOWR(KVMIO, 0xc0, struct kvm_clear_dirty_log)/* Available with KVM_CAP_HYPERV_CPUID */ #define KVM_GET_SUPPORTED_HV_CPUID _IOWR(KVMIO, 0xc1, struct kvm_cpuid2) +/* Available with KVM_CAP_ARM_SVE */ +#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int) +/* Secure Encrypted Virtualization command */ enum sev_cmd_id {/* Guest initialization commands */
linux-headers/linux/mman.h +4 -0
@@ -12,6 +12,10 @@#define OVERCOMMIT_ALWAYS 1#define OVERCOMMIT_NEVER 2 +#define MAP_SHARED 0x01/* Share changes */ +#define MAP_PRIVATE 0x02/* Changes are private */ +#define MAP_SHARED_VALIDATE 0x03/* share + validate extension flags */ +/* * Huge page size encoding when MAP_HUGETLB is specified, and a huge page * size other than the default is desired. See hugetlb_encode.h.
linux-headers/linux/psci.h +7 -0
@@ -49,8 +49,11 @@#define PSCI_1_0_FN_PSCI_FEATURES PSCI_0_2_FN(10)#define PSCI_1_0_FN_SYSTEM_SUSPEND PSCI_0_2_FN(14) +#define PSCI_1_0_FN_SET_SUSPEND_MODE PSCI_0_2_FN(15) +#define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18)#define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14) +#define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18)/* PSCI v0.2 power state encoding for CPU_SUSPEND function */ #define PSCI_0_2_POWER_STATE_ID_MASK 0xffff
@@ -97,6 +100,10 @@#define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_MASK \ (0x1 << PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT) +#define PSCI_1_0_OS_INITIATED BIT(0) +#define PSCI_1_0_SUSPEND_MODE_PC 0 +#define PSCI_1_0_SUSPEND_MODE_OSI 1 +/* PSCI return values (inclusive of all PSCI versions) */ #define PSCI_RET_SUCCESS 0#define PSCI_RET_NOT_SUPPORTED -1
linux-headers/linux/psp-sev.h +14 -4
@@ -6,8 +6,7 @@* * Author: Brijesh Singh <[email protected]> * -* SEV spec 0.14 is available at: -* http://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf +* SEV API specification is available at: https://developer.amd.com/sev/ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -30,7 +29,8 @@ enum {SEV_PDH_GEN ,SEV_PDH_CERT_EXPORT ,SEV_PEK_CERT_IMPORT , -SEV_GET_ID , +SEV_GET_ID ,/* This command is deprecated, use SEV_GET_ID2 */ +SEV_GET_ID2 , SEV_MAX, };
@@ -125,7 +125,7 @@ struct sev_user_data_pdh_cert_export { } __attribute__((packed));/** -* struct sev_user_data_get_id - GET_ID command parameters +* struct sev_user_data_get_id - GET_ID command parameters (deprecated) * * @socket1: Buffer to pass unique ID of first socket * @socket2: Buffer to pass unique ID of second socket
@@ -135,6 +135,16 @@ struct sev_user_data_get_id {__u8 socket2[64 ];/* Out */ } __attribute__((packed)); +/** +* struct sev_user_data_get_id2 - GET_ID command parameters +* @address: Buffer to store unique ID +* @length: length of the unique ID +*/ +struct sev_user_data_get_id2 { +__u64 address;/* In */ +__u32 length;/* In/Out */ +} __attribute__((packed)); +/** * struct sev_issue_cmd - SEV ioctl parameters *
linux-headers/linux/vfio.h +4 -0
@@ -353,6 +353,10 @@ struct vfio_region_gfx_edid {#define VFIO_DEVICE_GFX_LINK_STATE_DOWN 2 }; +#define VFIO_REGION_TYPE_CCW (2) +/* ccw sub-types */ +#define VFIO_REGION_SUBTYPE_CCW_ASYNC_CMD (1) +/* * 10de vendor sub-type *
linux-headers/linux/vfio_ccw.h +12 -0
@@ -12,6 +12,7 @@#include <linux/types.h> +/* used for START SUBCHANNEL, always present */ struct ccw_io_region {#define ORB_AREA_SIZE 12__u8 orb_area[ORB_AREA_SIZE ];
@@ -22,4 +23,15 @@ struct ccw_io_region {__u32 ret_code; } __attribute__((packed)); +/* +* used for processing commands that trigger asynchronous actions +* Note: this is controlled by a capability +*/ +#define VFIO_CCW_ASYNC_CMD_HSCH (1 << 0) +#define VFIO_CCW_ASYNC_CMD_CSCH (1 << 1) +struct ccw_cmd_region { +__u32 command; +__u32 ret_code; +} __attribute__((packed)); +#endif
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH] linux-headers: Update linux headers to 5.2-rc1
Quoted 4 lines · On Mon, 20 May 2019 08:25:52 +0200 Cédric Le Goater <[email protected]> wrote:
Update the QEMU copy of the Linux headers to upstream 5.2-rc1 (linux commit
a188339ca5a3).Signed-off-by Cédric Le Goater <[email protected]>
FWIW, I have a headers update queued in my s390-next branch as well, and I plan to send a pull req soonish.
Re: [Qemu-devel] [PATCH] linux-headers: Update linux headers to 5.2-rc1
Quoted 10 lines · Cornelia Huck
Quoted 4 lines · On Mon, 20 May 2019 08:25:52 +0200 Cédric Le Goater <[email protected]> wrote:
Update the QEMU copy of the Linux headers to upstream 5.2-rc1 (linux commit
a188339ca5a3).Signed-off-by Cédric Le Goater <[email protected]>FWIW, I have a headers update queued in my s390-next branch as well, and I plan to send a pull req soonish.
That's perfect.
I have sent a patchset to David and the KVM definitions are the gating factor. If your PR goes first, we can drop the first patch of my series.
Thanks,
C.
PATCH v4 2/14 spapr/xive: add KVM support
In reply to Cédric Le GoaterThis introduces a set of helpers when KVM is in use, which create the KVM XIVE device, initialize the interrupt sources at a KVM level and connect the interrupt presenters to the vCPU.
They also handle the initialization of the TIMA and the source ESB memory regions of the controller. These have a different type under KVM. They are 'ram device' memory mappings, similarly to VFIO, exposed to the guest and the associated VMAs on the host are populated dynamically with the appropriate pages using a fault handler.
--- include/hw/ppc/spapr_xive.h | 10 ++ include/hw/ppc/xive.h | 13 ++ target/ppc/kvm_ppc.h | 6 + hw/intc/spapr_xive.c | 48 +++++++- hw/intc/spapr_xive_kvm.c | 237 ++++++++++++++++++++++++++++++++++++ hw/intc/xive.c | 21 +++- hw/ppc/spapr_irq.c | 6 +- target/ppc/kvm.c | 7 ++ hw/intc/Makefile.objs | 1 + hw/ppc/Kconfig | 5 + 10 files changed, 344 insertions(+), 10 deletions(-) create mode 100644 hw/intc/spapr_xive_kvm.c
include/hw/ppc/spapr_xive.h +10 -0
@@ -38,6 +38,10 @@ typedef struct SpaprXive {/* TIMA mapping address */ hwaddr tm_base;MemoryRegion tm_mmio; + +/* KVM support */ +int fd; +void *tm_mmap; } SpaprXive;bool spapr_xive_irq_claim (SpaprXive *xive,uint32_t lisn,bool lsi);
@@ -49,5 +53,11 @@ void spapr_dt_xive(SpaprMachineState *spapr, uint32_t nr_servers, void *fdt, uint32_t phandle);void spapr_xive_set_tctx_os_cam (XiveTCTX *tctx);void spapr_xive_mmio_set_enabled (SpaprXive *xive,bool enable); +void spapr_xive_map_mmio (SpaprXive *xive); + +/* +* KVM XIVE device helpers +*/ +void kvmppc_xive_connect (SpaprXive *xive,Error **errp);#endif /* PPC_SPAPR_XIVE_H */
include/hw/ppc/xive.h +13 -0
@@ -140,6 +140,7 @@#ifndef PPC_XIVE_H #define PPC_XIVE_H +#include "sysemu/kvm.h" #include "hw/qdev-core.h" #include "hw/sysbus.h" #include "hw/ppc/xive_regs.h"
@@ -194,6 +195,9 @@ typedef struct XiveSource {uint32_t esb_shift;MemoryRegion esb_mmio; +/* KVM support */ +void *esb_mmap; +XiveNotifier *xive; } XiveSource;
@@ -423,4 +427,13 @@ static inline uint32_t xive_nvt_cam_line(uint8_t nvt_blk, uint32_t nvt_idx) return (nvt_blk << 19) | nvt_idx; } +/* +* KVM XIVE device helpers +*/ + +void kvmppc_xive_source_reset_one (XiveSource *xsrc,int srcno,Error **errp); +void kvmppc_xive_source_reset (XiveSource *xsrc,Error **errp); +void kvmppc_xive_source_set_irq (void *opaque,int srcno,int val); +void kvmppc_xive_cpu_connect (XiveTCTX *tctx,Error **errp); +#endif /* PPC_XIVE_H */
target/ppc/kvm_ppc.h +6 -0
@@ -60,6 +60,7 @@ bool kvmppc_has_cap_fixup_hcalls(void);bool kvmppc_has_cap_htm (void );bool kvmppc_has_cap_mmu_radix (void );bool kvmppc_has_cap_mmu_hash_v3 (void ); +bool kvmppc_has_cap_xive (void );int kvmppc_get_cap_safe_cache (void );int kvmppc_get_cap_safe_bounds_check (void );int kvmppc_get_cap_safe_indirect_branch (void );
@@ -316,6 +317,11 @@ static inline bool kvmppc_has_cap_mmu_hash_v3(void)return false; } +static inline bool kvmppc_has_cap_xive (void ) +{ +return false; +} +static inline int kvmppc_get_cap_safe_cache (void ) {return 0 ;
hw/intc/spapr_xive.c +42 -6
84 lines not on this page · raw message
hw/intc/spapr_xive_kvm.c new file +237 -0
237 lines not on this page · raw message
hw/intc/xive.c +18 -3
@@ -555,6 +555,15 @@ static void xive_tctx_realize(DeviceState *dev, Error **errp)return ; } +/* Connect the presenter to the VCPU (required for CPU hotplug) */ +if (kvm_irqchip_in_kernel ()) { +kvmppc_xive_cpu_connect (tctx, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + } +qemu_register_reset (xive_tctx_reset, dev); }
@@ -957,6 +966,10 @@ static void xive_source_reset(void *dev)/* PQs are initialized to 0b01 (Q=1) which corresponds to "ints off" */ memset (xsrc->status,XIVE_ESB_OFF , xsrc->nr_irqs); + +if (kvm_irqchip_in_kernel ()) { +kvmppc_xive_source_reset (xsrc, &error_fatal); + } }static void xive_source_realize (DeviceState *dev,Error **errp)
@@ -990,9 +1003,11 @@ static void xive_source_realize(DeviceState *dev, Error **errp) xsrc->status =g_malloc0 (xsrc->nr_irqs); xsrc->lsi_map =bitmap_new (xsrc->nr_irqs); -memory_region_init_io (&xsrc->esb_mmio,OBJECT (xsrc), - &xive_source_esb_ops, xsrc,"xive.esb" , - (1ull << xsrc->esb_shift) * xsrc->nr_irqs); +if (!kvm_irqchip_in_kernel ()) { +memory_region_init_io (&xsrc->esb_mmio,OBJECT (xsrc), + &xive_source_esb_ops, xsrc,"xive.esb" , + (1ull << xsrc->esb_shift) * xsrc->nr_irqs); + }qemu_register_reset (xive_source_reset, dev); }
hw/ppc/spapr_irq.c +5 -1
@@ -372,7 +372,11 @@ static void spapr_irq_set_irq_xive(void *opaque, int srcno, int val) {SpaprMachineState *spapr = opaque; -xive_source_set_irq (&spapr->xive->source, srcno, val); +if (kvm_irqchip_in_kernel ()) { +kvmppc_xive_source_set_irq (&spapr->xive->source, srcno, val); + }else { +xive_source_set_irq (&spapr->xive->source, srcno, val); + } }static const char *spapr_irq_get_nodename_xive (SpaprMachineState *spapr)
target/ppc/kvm.c +7 -0
@@ -75,6 +75,7 @@ static int cap_fixup_hcalls;static int cap_htm;/* Hardware transactional memory support */ static int cap_mmu_radix;static int cap_mmu_hash_v3; +static int cap_xive;static int cap_resize_hpt;static int cap_ppc_pvr_compat;static int cap_ppc_safe_cache;
@@ -146,6 +147,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_htm =kvm_vm_check_extension (s,KVM_CAP_PPC_HTM ); cap_mmu_radix =kvm_vm_check_extension (s,KVM_CAP_PPC_MMU_RADIX ); cap_mmu_hash_v3 =kvm_vm_check_extension (s,KVM_CAP_PPC_MMU_HASH_V3 ); + cap_xive =kvm_vm_check_extension (s,KVM_CAP_PPC_IRQ_XIVE ); cap_resize_hpt =kvm_vm_check_extension (s,KVM_CAP_SPAPR_RESIZE_HPT );kvmppc_get_cpu_characteristics (s); cap_ppc_nested_kvm_hv =kvm_vm_check_extension (s,KVM_CAP_PPC_NESTED_HV );
@@ -2478,6 +2480,11 @@ static int parse_cap_ppc_count_cache_flush_assist(struct kvm_ppc_cpu_char c)return 0 ; } +bool kvmppc_has_cap_xive (void ) +{ +return cap_xive; +} +static void kvmppc_get_cpu_characteristics (KVMState *s) {struct kvm_ppc_cpu_char c;
hw/intc/Makefile.objs +1 -0
@@ -39,6 +39,7 @@ obj-$(CONFIG_XICS_SPAPR) += xics_spapr.o obj-$(CONFIG_XICS_KVM) += xics_kvm.o obj-$(CONFIG_XIVE) += xive.o obj-$(CONFIG_XIVE_SPAPR) += spapr_xive.o +obj-$(CONFIG_XIVE_KVM) += spapr_xive_kvm.o obj-$(CONFIG_POWERNV) += xics_pnv.o pnv_xive.o obj-$(CONFIG_ALLWINNER_A10_PIC) += allwinner-a10-pic.o obj-$(CONFIG_S390_FLIC) += s390_flic.o
hw/ppc/Kconfig +5 -0
@@ -122,3 +122,8 @@ config XIVE_SPAPR default y depends on PSERIES select XIVE + +config XIVE_KVM + bool + default y + depends on XIVE_SPAPR && KVM
Signature · 1 line
2.20.1
PATCH v4 3/14 spapr/xive: add hcall support when under KVM
In reply to Cédric Le GoaterXIVE hcalls are all redirected to QEMU as none are on a fast path. When necessary, QEMU invokes KVM through specific ioctls to perform host operations. QEMU should have done the necessary checks before calling KVM and, in case of failure, H_HARDWARE is simply returned.
H_INT_ESB is a special case that could have been handled under KVM but the impact on performance was low when under QEMU. Here are some figures :
kernel irqchip OFF ON
H_INT_ESB KVM QEMU
rtl8139 (LSI ) 1.19 1.24 1.23 Gbits/sec
virtio 31.80 42.30 -- Gbits/sec
---
Changes since v3:
- added usage of xive_end_qaddr() helper
include/hw/ppc/spapr_xive.h | 15 +++ hw/intc/spapr_xive.c | 90 ++++++++++++++-- hw/intc/spapr_xive_kvm.c | 197 ++++++++++++++++++++++++++++++++++++ 3 files changed, 294 insertions(+), 8 deletions(-)
include/hw/ppc/spapr_xive.h +15 -0
@@ -55,9 +55,24 @@ void spapr_xive_set_tctx_os_cam(XiveTCTX *tctx);void spapr_xive_mmio_set_enabled (SpaprXive *xive,bool enable);void spapr_xive_map_mmio (SpaprXive *xive); +int spapr_xive_end_to_target (uint8_t end_blk,uint32_t end_idx, +uint32_t *out_server,uint8_t *out_prio); +/* * KVM XIVE device helpers */ void kvmppc_xive_connect (SpaprXive *xive,Error **errp); +void kvmppc_xive_reset (SpaprXive *xive,Error **errp); +void kvmppc_xive_set_source_config (SpaprXive *xive,uint32_t lisn,XiveEAS *eas, +Error **errp); +void kvmppc_xive_sync_source (SpaprXive *xive,uint32_t lisn,Error **errp); +uint64_t kvmppc_xive_esb_rw (XiveSource *xsrc,int srcno,uint32_t offset, +uint64_t data,bool write); +void kvmppc_xive_set_queue_config (SpaprXive *xive,uint8_t end_blk, +uint32_t end_idx,XiveEND *end, +Error **errp); +void kvmppc_xive_get_queue_config (SpaprXive *xive,uint8_t end_blk, +uint32_t end_idx,XiveEND *end, +Error **errp);#endif /* PPC_SPAPR_XIVE_H */
hw/intc/spapr_xive.c +82 -8
134 lines not on this page · raw message
hw/intc/spapr_xive_kvm.c +197 -0
215 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 4/14 spapr/xive: add state synchronization with KVM
In reply to Cédric Le GoaterThis extends the KVM XIVE device backend with 'synchronize_state' methods used to retrieve the state from KVM. The HW state of the sources, the KVM device and the thread interrupt contexts are collected for the monitor usage and also migration.
These get operations rely on their KVM counterpart in the host kernel which acts as a proxy for OPAL, the host firmware. The set operations will be added for migration support later.
--- include/hw/ppc/spapr_xive.h | 8 ++++ include/hw/ppc/xive.h | 1 + hw/intc/spapr_xive.c | 17 ++++--- hw/intc/spapr_xive_kvm.c | 90 +++++++++++++++++++++++++++++++++++++ hw/intc/xive.c | 10 +++++ 5 files changed, 119 insertions(+), 7 deletions(-)
include/hw/ppc/spapr_xive.h +8 -0
@@ -44,6 +44,13 @@ typedef struct SpaprXive {void *tm_mmap; } SpaprXive; +/* +* The sPAPR machine has a unique XIVE IC device. Assign a fixed value +* to the controller block id value. It can nevertheless be changed +* for testing purpose. +*/ +#define SPAPR_XIVE_BLOCK_ID 0x0 +bool spapr_xive_irq_claim (SpaprXive *xive,uint32_t lisn,bool lsi);bool spapr_xive_irq_free (SpaprXive *xive,uint32_t lisn);void spapr_xive_pic_print_info (SpaprXive *xive,Monitor *mon);
@@ -74,5 +81,6 @@ void kvmppc_xive_set_queue_config(SpaprXive *xive, uint8_t end_blk,void kvmppc_xive_get_queue_config (SpaprXive *xive,uint8_t end_blk,uint32_t end_idx,XiveEND *end,Error **errp); +void kvmppc_xive_synchronize_state (SpaprXive *xive,Error **errp);#endif /* PPC_SPAPR_XIVE_H */
include/hw/ppc/xive.h +1 -0
@@ -435,5 +435,6 @@ void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp);void kvmppc_xive_source_reset (XiveSource *xsrc,Error **errp);void kvmppc_xive_source_set_irq (void *opaque,int srcno,int val);void kvmppc_xive_cpu_connect (XiveTCTX *tctx,Error **errp); +void kvmppc_xive_cpu_synchronize_state (XiveTCTX *tctx,Error **errp);#endif /* PPC_XIVE_H */
hw/intc/spapr_xive.c +10 -7
@@ -40,13 +40,6 @@#define SPAPR_XIVE_NVT_BASE 0x400 -/* -* The sPAPR machine has a unique XIVE IC device. Assign a fixed value -* to the controller block id value. It can nevertheless be changed -* for testing purpose. -*/ -#define SPAPR_XIVE_BLOCK_ID 0x0 -/* * sPAPR NVT and END indexing helpers */
@@ -157,6 +150,16 @@ void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon)XiveSource *xsrc = &xive->source;int i; +if (kvm_irqchip_in_kernel ()) { +Error *local_err =NULL ; + +kvmppc_xive_synchronize_state (xive, &local_err); +if (local_err) { +error_report_err (local_err); +return ; + } + } +monitor_printf (mon," LISN PQ EISN CPU/PRIO EQ\n" );for (i =0 ; i < xive->nr_irqs; i++) {
hw/intc/spapr_xive_kvm.c +90 -0
108 lines not on this page · raw message
hw/intc/xive.c +10 -0
@@ -493,6 +493,16 @@ void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon)int cpu_index = tctx->cs ? tctx->cs->cpu_index :-1 ;int i; +if (kvm_irqchip_in_kernel ()) { +Error *local_err =NULL ; + +kvmppc_xive_cpu_synchronize_state (tctx, &local_err); +if (local_err) { +error_report_err (local_err); +return ; + } + } +monitor_printf (mon,"CPU[%04x]: QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR" " W2\n" , cpu_index);
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v4 04/14] spapr/xive: add state synchronization with KVM
Quoted 10 lines · Cédric Le Goater
This extends the KVM XIVE device backend with '
synchronize_state' methods used to retrieve the state from KVM. The HW state of the sources, the KVM device and the thread interrupt contexts are collected for the monitor usage and also migration.These get operations rely on their KVM counterpart in the host kernel which acts as a proxy for OPAL, the host firmware. The set operations will be added for migration support later.
Signed-off-by Cédric Le Goater <[email protected]>
Quoted 215 lines
--- include/hw/ppc/spapr_xive.h | 8 ++++ include/hw/ppc/xive.h | 1 + hw/intc/spapr_xive.c | 17 ++++--- hw/intc/spapr_xive_kvm.c | 90 +++++++++++++++++++++++++++++++++++++ hw/intc/xive.c | 10 +++++ 5 files changed, 119 insertions(+), 7 deletions(-)include/hw/ppc/spapr_xive.h +8
-0@@ -44,6 +44,13 @@ typedef struct SpaprXive {void *tm_mmap; } SpaprXive; +/* +* The sPAPR machine has a unique XIVE IC device. Assign a fixed value +* to the controller block id value. It can nevertheless be changed +* for testing purpose. +*/ +#define SPAPR_XIVE_BLOCK_ID 0x0 +bool spapr_xive_irq_claim (SpaprXive *xive,uint32_t lisn,bool lsi);bool spapr_xive_irq_free (SpaprXive *xive,uint32_t lisn);void spapr_xive_pic_print_info (SpaprXive *xive,Monitor *mon);@@ -74,5 +81,6 @@ void kvmppc_xive_set_queue_config(SpaprXive *xive, uint8_t end_blk,void kvmppc_xive_get_queue_config (SpaprXive *xive,uint8_t end_blk,uint32_t end_idx,XiveEND *end,Error **errp); +void kvmppc_xive_synchronize_state (SpaprXive *xive,Error **errp);#endif /* PPC_SPAPR_XIVE_H */ include/hw/ppc/xive.h +1
-0@@ -435,5 +435,6 @@ void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp);void kvmppc_xive_source_reset (XiveSource *xsrc,Error **errp);void kvmppc_xive_source_set_irq (void *opaque,int srcno,int val);void kvmppc_xive_cpu_connect (XiveTCTX *tctx,Error **errp); +void kvmppc_xive_cpu_synchronize_state (XiveTCTX *tctx,Error **errp);#endif /* PPC_XIVE_H */ hw/intc/spapr_xive.c +10
-7@@ -40,13 +40,6 @@#define SPAPR_XIVE_NVT_BASE 0x400 -/* -* The sPAPR machine has a unique XIVE IC device. Assign a fixed value -* to the controller block id value. It can nevertheless be changed -* for testing purpose. -*/ -#define SPAPR_XIVE_BLOCK_ID 0x0 -/* * sPAPR NVT and END indexing helpers */ @@ -157,6 +150,16 @@ void spapr_xive_pic_print_info(SpaprXive *xive, Monitor *mon)XiveSource *xsrc = &xive->source;int i; +if (kvm_irqchip_in_kernel ()) { +Error *local_err =NULL ; + +kvmppc_xive_synchronize_state (xive, &local_err); +if (local_err) { +error_report_err (local_err); +return ; + } + } +monitor_printf (mon," LISN PQ EISN CPU/PRIO EQ\n" );for (i =0 ; i < xive->nr_irqs; i++) {hw/intc/spapr_xive_kvm.c +90
-0@@ -60,6 +60,54 @@ static void kvm_cpu_enable(CPUState *cs)/* * XIVE Thread Interrupt Management context (KVM) */ +static void kvmppc_xive_cpu_get_state (XiveTCTX *tctx,Error **errp) +{ +uint64_t state[2 ] = {0 }; +int ret; + + ret =kvm_get_one_reg (tctx->cs,KVM_REG_PPC_VP_STATE , state); +if (ret !=0 ) { +error_setg_errno (errp, errno, +"XIVE: could not capture KVM state of CPU %ld" , +kvm_arch_vcpu_id (tctx->cs)); +return ; + } + +/* word0 and word1 of the OS ring. */ + *((uint64_t *) &tctx->regs[TM_QW1_OS ]) = state[0 ]; +} + +typedef struct { +XiveTCTX *tctx; +Error *err; +}XiveCpuGetState ; + +static void kvmppc_xive_cpu_do_synchronize_state (CPUState *cpu, +run_on_cpu_data arg) +{ +XiveCpuGetState *s = arg.host_ptr; + +kvmppc_xive_cpu_get_state (s->tctx, &s->err); +} + +void kvmppc_xive_cpu_synchronize_state (XiveTCTX *tctx,Error **errp) +{ +XiveCpuGetState s = { + .tctx = tctx, + .err =NULL , + }; + +/* +* Kick the vCPU to make sure they are available for the KVM ioctl. +*/ +run_on_cpu (tctx->cs, kvmppc_xive_cpu_do_synchronize_state, +RUN_ON_CPU_HOST_PTR (&s)); + +if (s.err) { +error_propagate (errp, s.err); +return ; + } +}void kvmppc_xive_cpu_connect (XiveTCTX *tctx,Error **errp) {@@ -227,6 +275,19 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset, } } +static void kvmppc_xive_source_get_state (XiveSource *xsrc) +{ +int i; + +for (i =0 ; i < xsrc->nr_irqs; i++) { +/* Perform a load without side effect to retrieve the PQ bits */ +uint8_t pq =xive_esb_read (xsrc, i,XIVE_ESB_GET ); + +/* and save PQ locally */ +xive_source_esb_set (xsrc, i, pq); + } +} +void kvmppc_xive_source_set_irq (void *opaque,int srcno,int val) {XiveSource *xsrc = opaque;@@ -353,6 +414,35 @@ void kvmppc_xive_reset(SpaprXive *xive, Error **errp) NULL, true, errp); } +static void kvmppc_xive_get_queues (SpaprXive *xive,Error **errp) +{ +Error *local_err =NULL ; +int i; + +for (i =0 ; i < xive->nr_ends; i++) { +if (!xive_end_is_valid (&xive->endt[i])) { +continue ; + } + +kvmppc_xive_get_queue_config (xive,SPAPR_XIVE_BLOCK_ID , i, + &xive->endt[i], &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + } +} + +void kvmppc_xive_synchronize_state (SpaprXive *xive,Error **errp) +{ +kvmppc_xive_source_get_state (&xive->source); + +/* EAT: there is no extra state to query from KVM */ + +/* ENDT */ +kvmppc_xive_get_queues (xive, errp); +} +static void *kvmppc_xive_mmap (SpaprXive *xive,int pgoff,size_t len,Error **errp) {hw/intc/xive.c +10
-0@@ -493,6 +493,16 @@ void xive_tctx_pic_print_info(XiveTCTX *tctx, Monitor *mon)int cpu_index = tctx->cs ? tctx->cs->cpu_index :-1 ;int i; +if (kvm_irqchip_in_kernel ()) { +Error *local_err =NULL ; + +kvmppc_xive_cpu_synchronize_state (tctx, &local_err); +if (local_err) { +error_report_err (local_err); +return ; + } + } +monitor_printf (mon,"CPU[%04x]: QW NSR CPPR IPB LSMFB ACK# INC AGE PIPR" " W2\n" , cpu_index);
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH v4 5/14 spapr/xive: introduce a VM state change handler
In reply to Cédric Le GoaterThis handler is in charge of stabilizing the flow of event notifications in the XIVE controller before migrating a guest. This is a requirement before transferring the guest EQ pages to a destination.
When the VM is stopped, the handler sets the source PQs to PENDING to stop the flow of events and to possibly catch a triggered interrupt occuring while the VM is stopped. Their previous state is saved. The XIVE controller is then synced through KVM to flush any in-flight event notification and to stabilize the EQs. At this stage, the EQ pages are marked dirty to make sure the EQ pages are transferred if a migration sequence is in progress.
The previous configuration of the sources is restored when the VM resumes, after a migration or a stop. If an interrupt was queued while the VM was stopped, the handler simply generates the missing trigger.
--- include/hw/ppc/spapr_xive.h | 1 + hw/intc/spapr_xive_kvm.c | 96 ++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 1 deletion(-)
include/hw/ppc/spapr_xive.h +1 -0
@@ -42,6 +42,7 @@ typedef struct SpaprXive {/* KVM support */ int fd;void *tm_mmap; +VMChangeStateEntry *change; } SpaprXive;/*
hw/intc/spapr_xive_kvm.c +95 -1
110 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 6/14 spapr/xive: add migration support for KVM
In reply to Cédric Le GoaterWhen the VM is stopped, the VM state handler stabilizes the XIVE IC and marks the EQ pages dirty. These are then transferred to destination before the transfer of the device vmstates starts.
The SpaprXive interrupt controller model captures the XIVE internal tables, EAT and ENDT and the XiveTCTX model does the same for the thread interrupt context registers.
At restart, the SpaprXive 'post_load' method restores all the XIVE states. It is called by the sPAPR machine 'post_load' method, when all XIVE states have been transferred and loaded.
Finally, the source states are restored in the VM change state handler when the machine reaches the running state.
--- include/hw/ppc/spapr_xive.h | 3 ++ include/hw/ppc/xive.h | 1 + hw/intc/spapr_xive.c | 24 ++++++++++ hw/intc/spapr_xive_kvm.c | 95 ++++++++++++++++++++++++++++++++++++- hw/intc/xive.c | 17 +++++++ hw/ppc/spapr_irq.c | 2 +- 6 files changed, 140 insertions(+), 2 deletions(-)
include/hw/ppc/spapr_xive.h +3 -0
@@ -55,6 +55,7 @@ typedef struct SpaprXive {bool spapr_xive_irq_claim (SpaprXive *xive,uint32_t lisn,bool lsi);bool spapr_xive_irq_free (SpaprXive *xive,uint32_t lisn);void spapr_xive_pic_print_info (SpaprXive *xive,Monitor *mon); +int spapr_xive_post_load (SpaprXive *xive,int version_id);void spapr_xive_hcall_init (SpaprMachineState *spapr); void spapr_dt_xive(SpaprMachineState *spapr, uint32_t nr_servers, void *fdt,
@@ -83,5 +84,7 @@ void kvmppc_xive_get_queue_config(SpaprXive *xive, uint8_t end_blk, uint32_t end_idx, XiveEND *end, Error **errp);void kvmppc_xive_synchronize_state (SpaprXive *xive,Error **errp); +int kvmppc_xive_pre_save (SpaprXive *xive); +int kvmppc_xive_post_load (SpaprXive *xive,int version_id);#endif /* PPC_SPAPR_XIVE_H */
include/hw/ppc/xive.h +1 -0
@@ -436,5 +436,6 @@ void kvmppc_xive_source_reset(XiveSource *xsrc, Error **errp);void kvmppc_xive_source_set_irq (void *opaque,int srcno,int val);void kvmppc_xive_cpu_connect (XiveTCTX *tctx,Error **errp);void kvmppc_xive_cpu_synchronize_state (XiveTCTX *tctx,Error **errp); +void kvmppc_xive_cpu_get_state (XiveTCTX *tctx,Error **errp);#endif /* PPC_XIVE_H */
hw/intc/spapr_xive.c +24 -0
@@ -472,10 +472,34 @@ static const VMStateDescription vmstate_spapr_xive_eas = { }, }; +static int vmstate_spapr_xive_pre_save (void *opaque) +{ +if (kvm_irqchip_in_kernel ()) { +return kvmppc_xive_pre_save (SPAPR_XIVE (opaque)); + } + +return 0 ; +} + +/* +* Called by the sPAPR IRQ backend 'post_load' method at the machine +* level. +*/ +int spapr_xive_post_load (SpaprXive *xive,int version_id) +{ +if (kvm_irqchip_in_kernel ()) { +return kvmppc_xive_post_load (xive, version_id); + } + +return 0 ; +} +static const VMStateDescription vmstate_spapr_xive = { .name =TYPE_SPAPR_XIVE , .version_id =1 , .minimum_version_id =1 , + .pre_save = vmstate_spapr_xive_pre_save, + .post_load =NULL ,/* handled at the machine level */ .fields = (VMStateField []) {VMSTATE_UINT32_EQUAL (nr_irqs, SpaprXive,NULL ), VMSTATE_STRUCT_VARRAY_POINTER_UINT32(eat, SpaprXive, nr_irqs,
hw/intc/spapr_xive_kvm.c +94 -1
113 lines not on this page · raw message
hw/intc/xive.c +17 -0
@@ -582,10 +582,27 @@ static void xive_tctx_unrealize(DeviceState *dev, Error **errp)qemu_unregister_reset (xive_tctx_reset, dev); } +static int vmstate_xive_tctx_pre_save (void *opaque) +{ +Error *local_err =NULL ; + +if (kvm_irqchip_in_kernel ()) { +kvmppc_xive_cpu_get_state (XIVE_TCTX (opaque), &local_err); +if (local_err) { +error_report_err (local_err); +return -1 ; + } + } + +return 0 ; +} +static const VMStateDescription vmstate_xive_tctx = { .name =TYPE_XIVE_TCTX , .version_id =1 , .minimum_version_id =1 , + .pre_save = vmstate_xive_tctx_pre_save, + .post_load =NULL ,/* handled by the sPAPRxive model */ .fields = (VMStateField []) {VMSTATE_BUFFER (regs, XiveTCTX),VMSTATE_END_OF_LIST ()
hw/ppc/spapr_irq.c +1 -1
@@ -350,7 +350,7 @@ static void spapr_irq_cpu_intc_create_xive(SpaprMachineState *spapr,static int spapr_irq_post_load_xive (SpaprMachineState *spapr,int version_id) { -return 0 ; +return spapr_xive_post_load (spapr->xive, version_id); }static void spapr_irq_reset_xive (SpaprMachineState *spapr,Error **errp)
Signature · 1 line
2.20.1
PATCH v4 7/14 spapr/xive: activate KVM support
In reply to Cédric Le GoaterAll is in place for KVM now. State synchronization and migration will come next.
--- hw/ppc/spapr_irq.c | 9 --------- 1 file changed, 9 deletions(-)
hw/ppc/spapr_irq.c +0 -9
@@ -248,19 +248,10 @@ SpaprIrq spapr_irq_xics = {static void spapr_irq_init_xive (SpaprMachineState *spapr,int nr_irqs,Error **errp) { -MachineState *machine =MACHINE (spapr);uint32_t nr_servers =spapr_max_server_number (spapr);DeviceState *dev;int i; -/* KVM XIVE device not yet available */ -if (kvm_enabled ()) { -if (machine_kernel_irqchip_required (machine)) { -error_setg (errp,"kernel_irqchip requested. no KVM XIVE support" ); -return ; - } - } - dev =qdev_create (NULL ,TYPE_SPAPR_XIVE );qdev_prop_set_uint32 (dev,"nr-irqs" , nr_irqs);/*
Signature · 1 line
2.20.1
PATCH v4 8/14 sysbus: add a sysbus_mmio_unmap() helper
In reply to Cédric Le GoaterThis will be used to remove the MMIO regions of the POWER9 XIVE interrupt controller when the sPAPR machine is reseted.
--- include/hw/sysbus.h | 1 + hw/core/sysbus.c | 10 ++++++++++ 2 files changed, 11 insertions(+)
include/hw/sysbus.h +1 -0
@@ -89,6 +89,7 @@ qemu_irq sysbus_get_connected_irq(SysBusDevice *dev, int n);void sysbus_mmio_map (SysBusDevice *dev,int n,hwaddr addr);void sysbus_mmio_map_overlap (SysBusDevice *dev,int n,hwaddr addr,int priority); +void sysbus_mmio_unmap (SysBusDevice *dev,int n);void sysbus_add_io (SysBusDevice *dev,hwaddr addr,MemoryRegion *mem);MemoryRegion *sysbus_address_space (SysBusDevice *dev);
hw/core/sysbus.c +10 -0
@@ -153,6 +153,16 @@ static void sysbus_mmio_map_common(SysBusDevice *dev, int n, hwaddr addr, } } +void sysbus_mmio_unmap (SysBusDevice *dev,int n) +{ +assert (n >=0 && n < dev->num_mmio); + +if (dev->mmio[n].addr != (hwaddr)-1 ) { +memory_region_del_subregion (get_system_memory (), dev->mmio[n].memory); + dev->mmio[n].addr = (hwaddr)-1 ; + } +} +void sysbus_mmio_map (SysBusDevice *dev,int n,hwaddr addr) {sysbus_mmio_map_common (dev, n, addr, false,0 );
Signature · 1 line
2.20.1
PATCH v4 9/14 spapr: introduce routines to delete the KVM IRQ device
In reply to Cédric Le GoaterIf a new interrupt mode is chosen by CAS, the machine generates a reset to reconfigure. At this point, the connection with the previous KVM device needs to be closed and a new connection needs to opened with the KVM device operating the chosen interrupt mode.
New routines are introduced to destroy the XICS and the XIVE KVM devices. They make use of a new KVM device ioctl which destroys the device and also disconnects the IRQ presenters from the vCPUs.
---
Changes since v3:
- removed KVM_DESTROY_DEVICE control. KVM device is destroyed when the fd is closed.
include/hw/ppc/spapr_xive.h | 1 + include/hw/ppc/xics_spapr.h | 1 + hw/intc/spapr_xive_kvm.c | 56 +++++++++++++++++++++++++++++++++++++ hw/intc/xics_kvm.c | 51 +++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+)
include/hw/ppc/spapr_xive.h +1 -0
@@ -71,6 +71,7 @@ int spapr_xive_end_to_target(uint8_t end_blk, uint32_t end_idx,* KVM XIVE device helpers */ void kvmppc_xive_connect (SpaprXive *xive,Error **errp); +void kvmppc_xive_disconnect (SpaprXive *xive,Error **errp);void kvmppc_xive_reset (SpaprXive *xive,Error **errp);void kvmppc_xive_set_source_config (SpaprXive *xive,uint32_t lisn,XiveEAS *eas,Error **errp);
include/hw/ppc/xics_spapr.h +1 -0
@@ -34,6 +34,7 @@void spapr_dt_xics (SpaprMachineState *spapr,uint32_t nr_servers,void *fdt,uint32_t phandle);int xics_kvm_init (SpaprMachineState *spapr,Error **errp); +void xics_kvm_disconnect (SpaprMachineState *spapr,Error **errp);void xics_spapr_init (SpaprMachineState *spapr);#endif /* XICS_SPAPR_H */
hw/intc/spapr_xive_kvm.c +56 -0
65 lines not on this page · raw message
hw/intc/xics_kvm.c +51 -0
60 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 10/14 spapr: check for the activation of the KVM IRQ device
In reply to Cédric Le GoaterThe activation of the KVM IRQ device depends on the interrupt mode chosen at CAS time by the machine and some methods used at reset or by the migration need to be protected.
---
May be we can improve these checkd by using spapr->ov5_cas in some cases.
Changes since v3:
- update in kvmppc_xive_source_reset_one()
hw/intc/spapr_xive_kvm.c | 33 +++++++++++++++++++++++++++++++++ hw/intc/xics_kvm.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-)
hw/intc/spapr_xive_kvm.c +33 -0
@@ -90,9 +90,15 @@ static void kvmppc_xive_cpu_set_state(XiveTCTX *tctx, Error **errp)void kvmppc_xive_cpu_get_state (XiveTCTX *tctx,Error **errp) { +SpaprXive *xive =SPAPR_MACHINE (qdev_get_machine ())->xive;uint64_t state[2 ] = {0 };int ret; +/* The KVM XIVE device is not in use */ +if (xive->fd ==-1 ) { +return ; + } + ret =kvm_get_one_reg (tctx->cs,KVM_REG_PPC_VP_STATE , state);if (ret !=0 ) { error_setg_errno(errp, errno,
@@ -143,6 +149,11 @@ void kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp)unsigned long vcpu_id;int ret; +/* The KVM XIVE device is not in use */ +if (xive->fd ==-1 ) { +return ; + } +/* Check if CPU was hot unplugged and replugged. */ if (kvm_cpu_is_enabled (tctx->cs)) {return ;
@@ -219,6 +230,11 @@ void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)SpaprXive *xive =SPAPR_XIVE (xsrc->xive);uint64_t state =0 ; +/* The KVM XIVE device is not in use */ +if (xive->fd ==-1 ) { +return ; + } +if (xive_source_irq_is_lsi (xsrc, srcno)) { state |=KVM_XIVE_LEVEL_SENSITIVE ;if (xsrc->status[srcno] &XIVE_STATUS_ASSERTED ) {
@@ -319,9 +335,13 @@ static void kvmppc_xive_source_get_state(XiveSource *xsrc)void kvmppc_xive_source_set_irq (void *opaque,int srcno,int val) {XiveSource *xsrc = opaque; +SpaprXive *xive =SPAPR_XIVE (xsrc->xive);struct kvm_irq_level args;int rc; +/* The KVM XIVE device should be in use */ +assert (xive->fd !=-1 ); + args.irq = srcno;if (!xive_source_irq_is_lsi (xsrc, srcno)) {if (!val) {
@@ -546,6 +566,11 @@ static void kvmppc_xive_change_state_handler(void *opaque, int running,void kvmppc_xive_synchronize_state (SpaprXive *xive,Error **errp) { +/* The KVM XIVE device is not in use */ +if (xive->fd ==-1 ) { +return ; + } +/* * When the VM is stopped, the sources are masked and the previous * state is saved in anticipation of a migration. We should not
@@ -571,6 +596,11 @@ int kvmppc_xive_pre_save(SpaprXive *xive) {Error *local_err =NULL ; +/* The KVM XIVE device is not in use */ +if (xive->fd ==-1 ) { +return 0 ; + } +/* EAT: there is no extra state to query from KVM */ /* ENDT */
@@ -595,6 +625,9 @@ int kvmppc_xive_post_load(SpaprXive *xive, int version_id)CPUState *cs;int i; +/* The KVM XIVE device should be in use */ +assert (xive->fd !=-1 ); +/* Restore the ENDT first. The targetting depends on it. */ for (i =0 ; i < xive->nr_ends; i++) {if (!xive_end_is_valid (&xive->endt[i])) {
hw/intc/xics_kvm.c +30 -1
@@ -69,6 +69,11 @@ void icp_get_kvm_state(ICPState *icp)uint64_t state;int ret; +/* The KVM XICS device is not in use */ +if (kernel_xics_fd ==-1 ) { +return ; + } +/* ICP for this CPU thread is not in use, exiting */ if (!icp->cs) {return ;
@@ -105,6 +110,11 @@ int icp_set_kvm_state(ICPState *icp)uint64_t state;int ret; +/* The KVM XICS device is not in use */ +if (kernel_xics_fd ==-1 ) { +return 0 ; + } +/* ICP for this CPU thread is not in use, exiting */ if (!icp->cs) {return 0 ;
@@ -133,8 +143,9 @@ void icp_kvm_realize(DeviceState *dev, Error **errp)unsigned long vcpu_id;int ret; +/* The KVM XICS device is not in use */ if (kernel_xics_fd ==-1 ) { -abort (); +return ; } cs = icp->cs;
@@ -170,6 +181,11 @@ void ics_get_kvm_state(ICSState *ics)uint64_t state;int i; +/* The KVM XICS device is not in use */ +if (kernel_xics_fd ==-1 ) { +return ; + } +for (i =0 ; i < ics->nr_irqs; i++) {ICSIRQState *irq = &ics->irqs[i];
@@ -230,6 +246,11 @@ int ics_set_kvm_state_one(ICSState *ics, int srcno)ICSIRQState *irq = &ics->irqs[srcno];int ret; +/* The KVM XICS device is not in use */ +if (kernel_xics_fd ==-1 ) { +return 0 ; + } + state = irq->server; state |= (uint64_t )(irq->saved_priority &KVM_XICS_PRIORITY_MASK ) <<KVM_XICS_PRIORITY_SHIFT ;
@@ -269,6 +290,11 @@ int ics_set_kvm_state(ICSState *ics) {int i; +/* The KVM XICS device is not in use */ +if (kernel_xics_fd ==-1 ) { +return 0 ; + } +for (i =0 ; i < ics->nr_irqs; i++) {int ret;
@@ -286,6 +312,9 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val)struct kvm_irq_level args;int rc; +/* The KVM XICS device should be in use */ +assert (kernel_xics_fd !=-1 ); + args.irq = srcno + ics->offset;if (ics->irqs[srcno].flags &XICS_FLAGS_IRQ_MSI ) {if (!val) {
Signature · 1 line
2.20.1
PATCH v4 11/14 spapr/irq: introduce a spapr_irq_init_device() helper
In reply to Cédric Le GoaterThe way the XICS and the XIVE devices are initialized follows the same pattern. First, try to connect to the KVM device and if not possible fallback on the emulated device, unless a kernel_irqchip is required. The spapr_irq_init_device() routine implements this sequence in generic way using new sPAPR IRQ handlers ->init_emu() and ->init_kvm().
The XIVE init sequence is moved under the associated sPAPR IRQ ->init() handler. This will change again when KVM support is added for the dual interrupt mode.
--- include/hw/ppc/spapr_irq.h | 2 + include/hw/ppc/spapr_xive.h | 1 + hw/intc/spapr_xive.c | 26 +++-------- hw/ppc/spapr_irq.c | 89 +++++++++++++++++++++++++++++-------- 4 files changed, 78 insertions(+), 40 deletions(-)
include/hw/ppc/spapr_irq.h +2 -0
@@ -48,6 +48,8 @@ typedef struct SpaprIrq {void (*reset)(SpaprMachineState *spapr,Error **errp);void (*set_irq)(void *opaque,int srcno,int val);const char *(*get_nodename)(SpaprMachineState *spapr); +void (*init_emu)(SpaprMachineState *spapr,Error **errp); +void (*init_kvm)(SpaprMachineState *spapr,Error **errp); } SpaprIrq;extern SpaprIrq spapr_irq_xics;
include/hw/ppc/spapr_xive.h +1 -0
@@ -66,6 +66,7 @@ void spapr_xive_map_mmio(SpaprXive *xive);int spapr_xive_end_to_target (uint8_t end_blk,uint32_t end_idx,uint32_t *out_server,uint8_t *out_prio); +void spapr_xive_init (SpaprXive *xive,Error **errp);/* * KVM XIVE device helpers
hw/intc/spapr_xive.c +5 -21
@@ -281,7 +281,6 @@ static void spapr_xive_realize(DeviceState *dev, Error **errp)XiveSource *xsrc = &xive->source;XiveENDSource *end_xsrc = &xive->end_source;Error *local_err =NULL ; -MachineState *machine =MACHINE (qdev_get_machine ());if (!xive->nr_irqs) {error_setg (errp,"Number of interrupt needs to be greater 0" );
@@ -332,27 +331,12 @@ static void spapr_xive_realize(DeviceState *dev, Error **errp) xive->tm_base + XIVE_TM_USER_PAGE * (1 << TM_SHIFT));qemu_register_reset (spapr_xive_reset, dev); +} -if (kvm_enabled () &&machine_kernel_irqchip_allowed (machine)) { -kvmppc_xive_connect (xive, &local_err); -if (local_err &&machine_kernel_irqchip_required (machine)) { -error_prepend (&local_err, -"kernel_irqchip requested but unavailable: " ); -error_propagate (errp, local_err); -return ; - } - -if (!local_err) { -return ; - } - -/* -* We failed to initialize the XIVE KVM device, fallback to -* emulated mode -*/ -error_prepend (&local_err,"kernel_irqchip allowed but unavailable: " ); -warn_report_err (local_err); - } +void spapr_xive_init (SpaprXive *xive,Error **errp) +{ +XiveSource *xsrc = &xive->source; +XiveENDSource *end_xsrc = &xive->end_source;/* TIMA initialization */ memory_region_init_io(&xive->tm_mmio, OBJECT(xive), &xive_tm_ops, xive,
hw/ppc/spapr_irq.c +70 -19
148 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 12/14 spapr/irq: initialize the IRQ device only once
In reply to Cédric Le GoaterAdd a check to make sure that the routine initializing the emulated IRQ device is called once. We don't have much to test on the XICS side, so we introduce a 'init' boolean under ICSState.
---
Changes since v3:
- introduced a 'init' boolean under ICSState
include/hw/ppc/xics.h | 1 + hw/intc/spapr_xive.c | 9 +++++++++ hw/intc/xics_spapr.c | 7 +++++++ 3 files changed, 17 insertions(+)
include/hw/ppc/xics.h +1 -0
@@ -119,6 +119,7 @@ struct ICSState {uint32_t offset;ICSIRQState *irqs;XICSFabric *xics; +bool init;/* sPAPR ICS device initialized */ };#define ICS_PROP_XICS "xics"
hw/intc/spapr_xive.c +9 -0
@@ -338,6 +338,15 @@ void spapr_xive_init(SpaprXive *xive, Error **errp)XiveSource *xsrc = &xive->source;XiveENDSource *end_xsrc = &xive->end_source; +/* +* The emulated XIVE device can only be initialized once. If the +* ESB memory region has been already mapped, it means we have been +* through there. +*/ +if (memory_region_is_mapped (&xsrc->esb_mmio)) { +return ; + } +/* TIMA initialization */ memory_region_init_io (&xive->tm_mmio,OBJECT (xive), &xive_tm_ops, xive,"xive.tima" ,4ull <<TM_SHIFT );
hw/intc/xics_spapr.c +7 -0
@@ -239,6 +239,13 @@ static void rtas_int_on(PowerPCCPU *cpu, SpaprMachineState *spapr,void xics_spapr_init (SpaprMachineState *spapr) { +/* Emulated mode can only be initialized once. */ +if (spapr->ics->init) { +return ; + } + + spapr->ics->init = true; +/* Registration of global state belongs into realize */ spapr_rtas_register (RTAS_IBM_SET_XIVE ,"ibm,set-xive" , rtas_set_xive);spapr_rtas_register (RTAS_IBM_GET_XIVE ,"ibm,get-xive" , rtas_get_xive);
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v4 12/14] spapr/irq: initialize the IRQ device only once
Quoted 5 lines · Cédric Le Goater
Add a check to make sure that the routine initializing the emulated IRQ device is called once. We don't have much to test on the XICS side, so we introduce a 'init' boolean under ICSState.
Signed-off-by Cédric Le Goater <[email protected]>
I'm not entirely sure it's the best way to accomplish what we need, but it will do for now.
Quoted 61 lines
---
Changes since v3:
- introduced a 'init' boolean under ICSState
include/hw/ppc/xics.h | 1 + hw/intc/spapr_xive.c | 9 +++++++++ hw/intc/xics_spapr.c | 7 +++++++ 3 files changed, 17 insertions(+)include/hw/ppc/xics.h +1
-0@@ -119,6 +119,7 @@ struct ICSState {uint32_t offset;ICSIRQState *irqs;XICSFabric *xics; +bool init;/* sPAPR ICS device initialized */ };#define ICS_PROP_XICS "xics"hw/intc/spapr_xive.c +9
-0@@ -338,6 +338,15 @@ void spapr_xive_init(SpaprXive *xive, Error **errp)XiveSource *xsrc = &xive->source;XiveENDSource *end_xsrc = &xive->end_source; +/* +* The emulated XIVE device can only be initialized once. If the +* ESB memory region has been already mapped, it means we have been +* through there. +*/ +if (memory_region_is_mapped (&xsrc->esb_mmio)) { +return ; + } +/* TIMA initialization */ memory_region_init_io (&xive->tm_mmio,OBJECT (xive), &xive_tm_ops, xive,"xive.tima" ,4ull <<TM_SHIFT );hw/intc/xics_spapr.c +7
-0@@ -239,6 +239,13 @@ static void rtas_int_on(PowerPCCPU *cpu, SpaprMachineState *spapr,void xics_spapr_init (SpaprMachineState *spapr) { +/* Emulated mode can only be initialized once. */ +if (spapr->ics->init) { +return ; + } + + spapr->ics->init = true; +/* Registration of global state belongs into realize */ spapr_rtas_register (RTAS_IBM_SET_XIVE ,"ibm,set-xive" , rtas_set_xive);spapr_rtas_register (RTAS_IBM_GET_XIVE ,"ibm,get-xive" , rtas_get_xive);
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH v4 13/14 ppc/xics: fix irq priority in ics_set_irq_type()
In reply to Cédric Le GoaterRecent commits changed the behavior of ics_set_irq_type() to initialize correctly LSIs at the KVM level. ics_set_irq_type() is also called by the realize routine of the different devices of the machine when initial interrupts are claimed, before the ICSState device is reseted.
In the case, the ICSIRQState priority is 0x0 and the call to ics_set_irq_type() results in configuring the target of the interrupt. On P9, when using the KVM XICS-on-XIVE device, the target is configured to be server 0, priority 0 and the event queue 0 is created automatically by KVM.
With the dual interrupt mode creating the KVM device at reset, it leads to unexpected effects on the guest, mostly blocking IPIs. This is wrong, fix it by reseting the ICSIRQState structure when ics_set_irq_type() is called.
--- hw/intc/xics.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
hw/intc/xics.c +8 -2
@@ -610,6 +610,12 @@ static const TypeInfo ics_simple_info = { .class_size = sizeof(ICSStateClass), }; +static void ics_reset_irq (ICSIRQState *irq) +{ + irq->priority =0xff ; + irq->saved_priority =0xff ; +} +static void ics_base_reset (DeviceState *dev) {ICSState *ics =ICS_BASE (dev);
@@ -623,8 +629,7 @@ static void ics_base_reset(DeviceState *dev)memset (ics->irqs,0 ,sizeof (ICSIRQState) * ics->nr_irqs);for (i =0 ; i < ics->nr_irqs; i++) { - ics->irqs[i].priority =0xff ; - ics->irqs[i].saved_priority =0xff ; +ics_reset_irq (ics->irqs + i); ics->irqs[i].flags = flags[i]; } }
@@ -760,6 +765,7 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) lsi ?XICS_FLAGS_IRQ_LSI :XICS_FLAGS_IRQ_MSI ;if (kvm_irqchip_in_kernel ()) { +ics_reset_irq (ics->irqs + srcno);ics_set_kvm_state_one (ics, srcno); } }
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v4 13/14] ppc/xics: fix irq priority in ics_set_irq_type()
Quoted 12 lines · Cédric Le Goater
Recent commits changed the behavior of
ics_set_irq_type()to initialize correctly LSIs at the KVM level.ics_set_irq_type()is also called by the realize routine of the different devices of the machine when initial interrupts are claimed, before the ICSState device is reseted.In the case, the ICSIRQState priority is
0x0and the call toics_set_irq_type()results in configuring the target of the interrupt. On P9, when using the KVM XICS-on-XIVE device, the target is configured to be server 0, priority 0 and the event queue 0 is created automatically by KVM.
Quoted 8 lines
With the dual interrupt mode creating the KVM device at reset, it leads to unexpected effects on the guest, mostly blocking IPIs. This is wrong, fix it by reseting the ICSIRQState structure when
ics_set_irq_type()is called.Fixes commit 6cead90c5c9c ("xics: Write source state to KVM at claim time")Signed-off-by Greg Kurz <[email protected]>Signed-off-by Cédric Le Goater <[email protected]>
Quoted 39 lines
--- hw/intc/xics.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)hw/intc/xics.c +8
-2@@ -610,6 +610,12 @@ static const TypeInfo ics_simple_info = { .class_size = sizeof(ICSStateClass), }; +static void ics_reset_irq (ICSIRQState *irq) +{ + irq->priority =0xff ; + irq->saved_priority =0xff ; +} +static void ics_base_reset (DeviceState *dev) {ICSState *ics =ICS_BASE (dev);@@ -623,8 +629,7 @@ static void ics_base_reset(DeviceState *dev)memset (ics->irqs,0 ,sizeof (ICSIRQState) * ics->nr_irqs);for (i =0 ; i < ics->nr_irqs; i++) { - ics->irqs[i].priority =0xff ; - ics->irqs[i].saved_priority =0xff ; +ics_reset_irq (ics->irqs + i); ics->irqs[i].flags = flags[i]; } }@@ -760,6 +765,7 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) lsi ?XICS_FLAGS_IRQ_LSI :XICS_FLAGS_IRQ_MSI ;if (kvm_irqchip_in_kernel ()) { +ics_reset_irq (ics->irqs + srcno);ics_set_kvm_state_one (ics, srcno); } }
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH v4 14/14 spapr/irq: add KVM support to the 'dual' machine
In reply to Cédric Le GoaterThe interrupt mode is chosen by the CAS negotiation process and activated after a reset to take into account the required changes in the machine. This brings new constraints on how the associated KVM IRQ device is initialized.
Currently, each model takes care of the initialization of the KVM device in their realize method but this is not possible anymore as the initialization needs to be done globaly when the interrupt mode is known, i.e. when machine is reseted. It also means that we need a way to delete a KVM device when another mode is chosen.
Also, to support migration, the QEMU objects holding the state to transfer should always be available but not necessarily activated.
The overall approach of this proposal is to initialize both interrupt mode at the QEMU level to keep the IRQ number space in sync and to allow switching from one mode to another. For the KVM side of things, the whole initialization of the KVM device, sources and presenters, is grouped in a single routine. The XICS and XIVE sPAPR IRQ reset handlers are modified accordingly to handle the init and the delete sequences of the KVM device.
---
Changes since v3:
- removed extra spapr_irq_init_device() in spapr_irq_init_xive()
- reworked slightly the code sequence in xics_kvm_init() creating the presenters and connecting them to the KVM XICS device.
include/hw/ppc/xive.h | 1 - hw/intc/spapr_xive_kvm.c | 29 +++++++++++++++++++- hw/intc/xics_kvm.c | 31 +++++++++++++++++++++ hw/intc/xive.c | 4 --- hw/ppc/spapr_irq.c | 58 ++++++++++++++++++++++++++-------------- 5 files changed, 97 insertions(+), 26 deletions(-)
include/hw/ppc/xive.h +0 -1
@@ -432,7 +432,6 @@ static inline uint32_t xive_nvt_cam_line(uint8_t nvt_blk, uint32_t nvt_idx)*/ void kvmppc_xive_source_reset_one (XiveSource *xsrc,int srcno,Error **errp); -void kvmppc_xive_source_reset (XiveSource *xsrc,Error **errp);void kvmppc_xive_source_set_irq (void *opaque,int srcno,int val);void kvmppc_xive_cpu_connect (XiveTCTX *tctx,Error **errp);void kvmppc_xive_cpu_synchronize_state (XiveTCTX *tctx,Error **errp);
hw/intc/spapr_xive_kvm.c +28 -1
@@ -246,7 +246,7 @@ void kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp) true, errp); } -void kvmppc_xive_source_reset (XiveSource *xsrc,Error **errp) +static void kvmppc_xive_source_reset (XiveSource *xsrc,Error **errp) {int i;
@@ -697,6 +697,15 @@ void kvmppc_xive_connect(SpaprXive *xive, Error **errp)Error *local_err =NULL ;size_t esb_len = (1ull << xsrc->esb_shift) * xsrc->nr_irqs;size_t tima_len =4ull <<TM_SHIFT ; +CPUState *cs; + +/* +* The KVM XIVE device already in use. This is the case when +* rebooting under the XIVE-only interrupt mode. +*/ +if (xive->fd !=-1 ) { +return ; + }if (!kvmppc_has_cap_xive ()) {error_setg (errp,"IRQ_XIVE capability must be present for KVM" );
@@ -745,6 +754,24 @@ void kvmppc_xive_connect(SpaprXive *xive, Error **errp) xive->change =qemu_add_vm_change_state_handler ( kvmppc_xive_change_state_handler, xive); +/* Connect the presenters to the initial VCPUs of the machine */ +CPU_FOREACH (cs) { +PowerPCCPU *cpu =POWERPC_CPU (cs); + +kvmppc_xive_cpu_connect (spapr_cpu_state (cpu)->tctx, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + } + +/* Update the KVM sources */ +kvmppc_xive_source_reset (xsrc, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + kvm_kernel_irqchip = true; kvm_msi_via_irqfd_allowed = true; kvm_gsi_direct_mapping = true;
hw/intc/xics_kvm.c +31 -0
@@ -33,6 +33,7 @@#include "trace.h" #include "sysemu/kvm.h" #include "hw/ppc/spapr.h" +#include "hw/ppc/spapr_cpu_core.h" #include "hw/ppc/xics.h" #include "hw/ppc/xics_spapr.h" #include "kvm_ppc.h"
@@ -342,6 +343,16 @@ static void rtas_dummy(PowerPCCPU *cpu, SpaprMachineState *spapr,int xics_kvm_init (SpaprMachineState *spapr,Error **errp) {int rc; +CPUState *cs; +Error *local_err =NULL ; + +/* +* The KVM XICS device already in use. This is the case when +* rebooting under the XICS-only interrupt mode. +*/ +if (kernel_xics_fd !=-1 ) { +return 0 ; + }if (!kvm_enabled () || !kvm_check_extension (kvm_state,KVM_CAP_IRQ_XICS )) { error_setg(errp,
@@ -390,6 +401,26 @@ int xics_kvm_init(SpaprMachineState *spapr, Error **errp) kvm_msi_via_irqfd_allowed = true; kvm_gsi_direct_mapping = true; +/* Create the presenters */ +CPU_FOREACH (cs) { +PowerPCCPU *cpu =POWERPC_CPU (cs); + +icp_kvm_realize (DEVICE (spapr_cpu_state (cpu)->icp), &local_err); +if (local_err) { +error_propagate (errp, local_err); + goto fail; + } + } + +/* Update the KVM sources */ +ics_set_kvm_state (spapr->ics); + +/* Connect the presenters to the initial VCPUs of the machine */ +CPU_FOREACH (cs) { +PowerPCCPU *cpu =POWERPC_CPU (cs); +icp_set_kvm_state (spapr_cpu_state (cpu)->icp); + } +return 0 ; fail:
hw/intc/xive.c +0 -4
@@ -993,10 +993,6 @@ static void xive_source_reset(void *dev)/* PQs are initialized to 0b01 (Q=1) which corresponds to "ints off" */ memset (xsrc->status,XIVE_ESB_OFF , xsrc->nr_irqs); - -if (kvm_irqchip_in_kernel ()) { -kvmppc_xive_source_reset (xsrc, &error_fatal); - } }static void xive_source_realize (DeviceState *dev,Error **errp)
hw/ppc/spapr_irq.c +38 -20
126 lines not on this page · raw message
Signature · 1 line
2.20.1
Quoted 8 lines · Cédric Le Goater
Hello,
This is the v4 of the QEMU/KVM patchset.
The first patches introduce the XIVE KVM device, state synchronization and migration support under KVM. The second part of the patchset modifies the XICS and XIVE interrupt models to add KVM support to the 'dual' IRQ backend.
Ok, I've applied this to my tree, and I'm prepping for a pull request right now.
Quoted 98 lines
GitHub trees available here :
QEMU sPAPR:
https://github.com/legoater/qemu/commits/xive-next
Linux/KVM:
https://github.com/legoater/linux/commits/xive-5.1
Thanks,
C.
Changes since v3:
- updates of the kvm headers are synced with commit
0caecf5b0019(kvm-ppc-next-5.2-1) in branch kvm-ppc-next. will conflict with kvm-arm.
- added usage ofxive_end_qaddr()helper
- removedKVM_DESTROY_DEVICEcontrol. KVM device is destroyed when the fd is closed.
- update inkvmppc_xive_source_reset_one()
- introduced a 'init' boolean under ICSState
- removed extraspapr_irq_init_device()inspapr_irq_init_xive()
- reworked slightly the code sequence inxics_kvm_init()creating the presenters and connecting them to the KVM XICS device.Changes since v2:
- update linux headers to 5.1-rc1
- rebased on new naming scheme
- rebased on new configuration system
- replacederror_report_err()bywarn_report_err()
- added anassert()inspapr_xive_end_to_target()
- movedxive_end_is_valid()check out ofkvmppc_xive_set_queue_config()
- dealt with MASKED EAS
- reworked ESB memory operations
- improvedKVM_XIVE_EQ_ALWAYS_NOTIFYhandling
- removed the capture of the OS CAM line value from KVM
- merged in the handling of pending interrupts while the VM is stopped.
- did an update inics_set_kvm_state_one()
- removedspapr_ics_create()
- introduced aspapr_irq_init_device()helper
- reworked test on single initialization of the emulated IRQ deviceChanges since v1:
- Reworked most of the KVM interface
- Reworked *All* hcalls which are now handled at the QEMU level, possibly extended with a KVM device ioctl when required.
- TIMA and ESB special mapping done on the KVM device fd.
- Tested on nested
- Implemented the device fallback mode when akernel_irqchipis not available and not required. Useful on nested to use XIVE.
- Fix device hotplug when VM is stopped (Is this necessary ?)Cédric Le Goater (14):
linux-headers: update linux headers to kvm-ppc-next-5.2-1 spapr/xive: add KVM support
spapr/xive: add hcall support when under KVM spapr/xive: add state synchronization with KVM spapr/xive: introduce a VM state change handler spapr/xive: add migration support for KVM spapr/xive: activate KVM support
sysbus: add asysbus_mmio_unmap()helper
spapr: introduce routines to delete the KVM IRQ device
spapr: check for the activation of the KVM IRQ device spapr/irq: introduce aspapr_irq_init_device()helper spapr/irq: initialize the IRQ device only once ppc/xics: fix irq priority inics_set_irq_type()spapr/irq: add KVM support to the 'dual' machineinclude/hw/ppc/spapr_irq.h | 2 + include/hw/ppc/spapr_xive.h | 39 ++ include/hw/ppc/xics.h | 1 + include/hw/ppc/xics_spapr.h | 1 + include/hw/ppc/xive.h | 14 + include/hw/sysbus.h | 1 + linux-headers/asm-powerpc/kvm.h | 46 ++ linux-headers/linux/kvm.h | 3 + target/ppc/kvm_ppc.h | 6 + hw/core/sysbus.c | 10 + hw/intc/spapr_xive.c | 172 ++++++- hw/intc/spapr_xive_kvm.c | 827 ++++++++++++++++++++++++++++++++ hw/intc/xics.c | 10 +- hw/intc/xics_kvm.c | 113 ++++- hw/intc/xics_spapr.c | 7 + hw/intc/xive.c | 44 +- hw/ppc/spapr_irq.c | 140 ++++-- target/ppc/kvm.c | 7 + hw/intc/Makefile.objs | 1 + hw/ppc/Kconfig | 5 + 20 files changed, 1384 insertions(+), 65 deletions(-) create mode 100644 hw/intc/spapr_xive_kvm.c
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson