Enable support for H_RPT_INVALIDATE hcall
cover Enable support for H_RPT_INVALIDATE hcall
Hi,
This series enables the support for H_RPT_INVALIDATE hcall which was added to upstream kernel recently.
It adds a new sPAPR machine capability cap-rpt-invalidate and if it is set by the user, checks for the availability of H_RPT_INVALIDATE hcall in the hypervisor (via KVM_CAP_RPT_INVALIDATE KVM capability) and enables the same.
Headers update is needed for KVM_CAP_PPC_RPT_INVALIDATE.
v0: https://lore.kernel.org/qemu-devel/[email protected]/
Bharata B Rao (2):
linux-headers: Update
target/ppc: Support for H_RPT_INVALIDATE hcall
hw/ppc/spapr.c | 6 + hw/ppc/spapr_caps.c | 41 +++++++ include/hw/ppc/spapr.h | 8 +- include/standard-headers/asm-x86/kvm_para.h | 13 +++ include/standard-headers/drm/drm_fourcc.h | 7 ++ include/standard-headers/linux/ethtool.h | 4 +- .../linux/input-event-codes.h | 1 + include/standard-headers/linux/virtio_ids.h | 2 +- include/standard-headers/linux/virtio_vsock.h | 9 ++ linux-headers/asm-arm64/kvm.h | 11 ++ linux-headers/asm-generic/mman-common.h | 3 + linux-headers/asm-generic/unistd.h | 4 +- linux-headers/asm-mips/mman.h | 3 + linux-headers/asm-mips/unistd_n32.h | 1 + linux-headers/asm-mips/unistd_n64.h | 1 + linux-headers/asm-mips/unistd_o32.h | 1 + linux-headers/asm-powerpc/unistd_32.h | 1 + linux-headers/asm-powerpc/unistd_64.h | 1 + linux-headers/asm-s390/unistd_32.h | 1 + linux-headers/asm-s390/unistd_64.h | 1 + linux-headers/asm-x86/kvm.h | 13 +++ linux-headers/asm-x86/unistd_32.h | 7 +- linux-headers/asm-x86/unistd_64.h | 7 +- linux-headers/asm-x86/unistd_x32.h | 7 +- linux-headers/linux/kvm.h | 105 ++++++++++++++++++ linux-headers/linux/userfaultfd.h | 11 +- target/ppc/kvm.c | 12 ++ target/ppc/kvm_ppc.h | 12 ++ 28 files changed, 274 insertions(+), 19 deletions(-)
Signature · 1 line
2.31.1
PATCH 1/2 linux-headers: Update
Update to mainline commit: 79160a603bdb ("Merge tag 'usb-5.14-rc1' ofgit://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb"
--- include/standard-headers/asm-x86/kvm_para.h | 13 +++ include/standard-headers/drm/drm_fourcc.h | 7 ++ include/standard-headers/linux/ethtool.h | 4 +- .../linux/input-event-codes.h | 1 + include/standard-headers/linux/virtio_ids.h | 2 +- include/standard-headers/linux/virtio_vsock.h | 9 ++ linux-headers/asm-arm64/kvm.h | 11 ++ linux-headers/asm-generic/mman-common.h | 3 + linux-headers/asm-generic/unistd.h | 4 +- linux-headers/asm-mips/mman.h | 3 + linux-headers/asm-mips/unistd_n32.h | 1 + linux-headers/asm-mips/unistd_n64.h | 1 + linux-headers/asm-mips/unistd_o32.h | 1 + linux-headers/asm-powerpc/unistd_32.h | 1 + linux-headers/asm-powerpc/unistd_64.h | 1 + linux-headers/asm-s390/unistd_32.h | 1 + linux-headers/asm-s390/unistd_64.h | 1 + linux-headers/asm-x86/kvm.h | 13 +++ linux-headers/asm-x86/unistd_32.h | 7 +- linux-headers/asm-x86/unistd_64.h | 7 +- linux-headers/asm-x86/unistd_x32.h | 7 +- linux-headers/linux/kvm.h | 105 ++++++++++++++++++ linux-headers/linux/userfaultfd.h | 11 +- 23 files changed, 197 insertions(+), 17 deletions(-)
include/standard-headers/asm-x86/kvm_para.h +13 -0
@@ -33,6 +33,8 @@#define KVM_FEATURE_PV_SCHED_YIELD 13#define KVM_FEATURE_ASYNC_PF_INT 14#define KVM_FEATURE_MSI_EXT_DEST_ID 15 +#define KVM_FEATURE_HC_MAP_GPA_RANGE 16 +#define KVM_FEATURE_MIGRATION_CONTROL 17#define KVM_HINTS_REALTIME 0
@@ -54,6 +56,7 @@#define MSR_KVM_POLL_CONTROL 0x4b564d05#define MSR_KVM_ASYNC_PF_INT 0x4b564d06#define MSR_KVM_ASYNC_PF_ACK 0x4b564d07 +#define MSR_KVM_MIGRATION_CONTROL 0x4b564d08struct kvm_steal_time {uint64_t steal;
@@ -90,6 +93,16 @@ struct kvm_clock_pairing {/* MSR_KVM_ASYNC_PF_INT */ #define KVM_ASYNC_PF_VEC_MASK GENMASK(7, 0) +/* MSR_KVM_MIGRATION_CONTROL */ +#define KVM_MIGRATION_READY (1 << 0) + +/* KVM_HC_MAP_GPA_RANGE */ +#define KVM_MAP_GPA_RANGE_PAGE_SZ_4K 0 +#define KVM_MAP_GPA_RANGE_PAGE_SZ_2M (1 << 0) +#define KVM_MAP_GPA_RANGE_PAGE_SZ_1G (1 << 1) +#define KVM_MAP_GPA_RANGE_ENC_STAT (n) (n << 4) +#define KVM_MAP_GPA_RANGE_ENCRYPTED KVM_MAP_GPA_RANGE_ENC_STAT(1) +#define KVM_MAP_GPA_RANGE_DECRYPTED KVM_MAP_GPA_RANGE_ENC_STAT(0)/* Operations for KVM_HC_MMU_OP */ #define KVM_MMU_OP_WRITE_PTE 1
include/standard-headers/drm/drm_fourcc.h +7 -0
@@ -167,6 +167,13 @@ extern "C" {#define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0')/* [31:0] R:G:B:A 10:10:10:2 little endian */ #define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0')/* [31:0] B:G:R:A 10:10:10:2 little endian */ +/* 64 bpp RGB */ +#define DRM_FORMAT_XRGB16161616 fourcc_code('X', 'R', '4', '8')/* [63:0] x:R:G:B 16:16:16:16 little endian */ +#define DRM_FORMAT_XBGR16161616 fourcc_code('X', 'B', '4', '8')/* [63:0] x:B:G:R 16:16:16:16 little endian */ + +#define DRM_FORMAT_ARGB16161616 fourcc_code('A', 'R', '4', '8')/* [63:0] A:R:G:B 16:16:16:16 little endian */ +#define DRM_FORMAT_ABGR16161616 fourcc_code('A', 'B', '4', '8')/* [63:0] A:B:G:R 16:16:16:16 little endian */ +/* * Floating point 64bpp RGB * IEEE 754-2008 binary16 half-precision float
include/standard-headers/linux/ethtool.h +2 -2
@@ -233,7 +233,7 @@ enum tunable_id {ETHTOOL_PFC_PREVENTION_TOUT ,/* timeout in msecs */ /* * Add your fresh new tunable attribute above and remember to update -* tunable_strings[] in net/core/ethtool.c +* tunable_strings[] in net/ethtool/common.c */ __ETHTOOL_TUNABLE_COUNT, };
@@ -297,7 +297,7 @@ enum phy_tunable_id {ETHTOOL_PHY_EDPD ,/* * Add your fresh new phy tunable attribute above and remember to update -* phy_tunable_strings[] in net/core/ethtool.c +* phy_tunable_strings[] in net/ethtool/common.c */ __ETHTOOL_PHY_TUNABLE_COUNT, };
include/standard-headers/linux/input-event-codes.h +1 -0
@@ -611,6 +611,7 @@#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_EMOJI_PICKER 0x249/* Show/hide emoji picker (HUTRR101) */ #define KEY_BRIGHTNESS_MIN 0x250/* Set Brightness to Minimum */ #define KEY_BRIGHTNESS_MAX 0x251/* Set Brightness to Maximum */
include/standard-headers/linux/virtio_ids.h +1 -1
@@ -54,7 +54,7 @@#define VIRTIO_ID_SOUND 25/* virtio sound */ #define VIRTIO_ID_FS 26/* virtio filesystem */ #define VIRTIO_ID_PMEM 27/* virtio pmem */ -#define VIRTIO_ID_BT 28/* virtio bluetooth */ #define VIRTIO_ID_MAC80211_HWSIM 29/* virtio mac80211-hwsim */ +#define VIRTIO_ID_BT 40/* virtio bluetooth */ #endif /* _LINUX_VIRTIO_IDS_H */
include/standard-headers/linux/virtio_vsock.h +9 -0
@@ -38,6 +38,9 @@#include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_config.h" +/* The feature bitmap for virtio vsock */ +#define VIRTIO_VSOCK_F_SEQPACKET 1/* SOCK_SEQPACKET supported */ +struct virtio_vsock_config {uint64_t guest_cid; }QEMU_PACKED ;
@@ -65,6 +68,7 @@ struct virtio_vsock_hdr {enum virtio_vsock_type {VIRTIO_VSOCK_TYPE_STREAM =1 , +VIRTIO_VSOCK_TYPE_SEQPACKET =2 , };enum virtio_vsock_op {
@@ -91,4 +95,9 @@ enum virtio_vsock_shutdown { VIRTIO_VSOCK_SHUTDOWN_SEND = 2, }; +/* VIRTIO_VSOCK_OP_RW flags values */ +enum virtio_vsock_rw { +VIRTIO_VSOCK_SEQ_EOR =1 , +}; +#endif /* _LINUX_VIRTIO_VSOCK_H */
linux-headers/asm-arm64/kvm.h +11 -0
@@ -184,6 +184,17 @@ struct kvm_vcpu_events {__u32 reserved[12 ]; }; +struct kvm_arm_copy_mte_tags { +__u64 guest_ipa; +__u64 length; +void *addr; +__u64 flags; +__u64 reserved[2 ]; +}; + +#define KVM_ARM_TAGS_TO_GUEST 0 +#define KVM_ARM_TAGS_FROM_GUEST 1 +/* If you need to interpret the index values, here is the key: */ #define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000#define KVM_REG_ARM_COPROC_SHIFT 16
linux-headers/asm-generic/mman-common.h +3 -0
@@ -72,6 +72,9 @@#define MADV_COLD 20/* deactivate these pages */ #define MADV_PAGEOUT 21/* reclaim these pages */ +#define MADV_POPULATE_READ 22/* populate (prefault) page tables readable */ +#define MADV_POPULATE_WRITE 23/* populate (prefault) page tables writable */ +/* compatibility flags */ #define MAP_FILE 0
linux-headers/asm-generic/unistd.h +2 -2
@@ -863,8 +863,8 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)#define __NR_mount_setattr 442 __SYSCALL(__NR_mount_setattr, sys_mount_setattr) -#define __NR_quotactl_path 443 -__SYSCALL(__NR_quotactl_path, sys_quotactl_path) +#define __NR_quotactl_fd 443 +__SYSCALL(__NR_quotactl_fd, sys_quotactl_fd)#define __NR_landlock_create_ruleset 444__SYSCALL (__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
linux-headers/asm-mips/mman.h +3 -0
@@ -98,6 +98,9 @@#define MADV_COLD 20/* deactivate these pages */ #define MADV_PAGEOUT 21/* reclaim these pages */ +#define MADV_POPULATE_READ 22/* populate (prefault) page tables readable */ +#define MADV_POPULATE_WRITE 23/* populate (prefault) page tables writable */ +/* compatibility flags */ #define MAP_FILE 0
linux-headers/asm-mips/unistd_n32.h +1 -0
@@ -372,6 +372,7 @@#define __NR_process_madvise (__NR_Linux + 440)#define __NR_epoll_pwait2 (__NR_Linux + 441)#define __NR_mount_setattr (__NR_Linux + 442) +#define __NR_quotactl_fd (__NR_Linux + 443)#define __NR_landlock_create_ruleset (__NR_Linux + 444)#define __NR_landlock_add_rule (__NR_Linux + 445)#define __NR_landlock_restrict_self (__NR_Linux + 446)
linux-headers/asm-mips/unistd_n64.h +1 -0
@@ -348,6 +348,7 @@#define __NR_process_madvise (__NR_Linux + 440)#define __NR_epoll_pwait2 (__NR_Linux + 441)#define __NR_mount_setattr (__NR_Linux + 442) +#define __NR_quotactl_fd (__NR_Linux + 443)#define __NR_landlock_create_ruleset (__NR_Linux + 444)#define __NR_landlock_add_rule (__NR_Linux + 445)#define __NR_landlock_restrict_self (__NR_Linux + 446)
linux-headers/asm-mips/unistd_o32.h +1 -0
@@ -418,6 +418,7 @@#define __NR_process_madvise (__NR_Linux + 440)#define __NR_epoll_pwait2 (__NR_Linux + 441)#define __NR_mount_setattr (__NR_Linux + 442) +#define __NR_quotactl_fd (__NR_Linux + 443)#define __NR_landlock_create_ruleset (__NR_Linux + 444)#define __NR_landlock_add_rule (__NR_Linux + 445)#define __NR_landlock_restrict_self (__NR_Linux + 446)
linux-headers/asm-powerpc/unistd_32.h +1 -0
@@ -425,6 +425,7 @@#define __NR_process_madvise 440#define __NR_epoll_pwait2 441#define __NR_mount_setattr 442 +#define __NR_quotactl_fd 443#define __NR_landlock_create_ruleset 444#define __NR_landlock_add_rule 445#define __NR_landlock_restrict_self 446
linux-headers/asm-powerpc/unistd_64.h +1 -0
@@ -397,6 +397,7 @@#define __NR_process_madvise 440#define __NR_epoll_pwait2 441#define __NR_mount_setattr 442 +#define __NR_quotactl_fd 443#define __NR_landlock_create_ruleset 444#define __NR_landlock_add_rule 445#define __NR_landlock_restrict_self 446
linux-headers/asm-s390/unistd_32.h +1 -0
@@ -415,6 +415,7 @@#define __NR_process_madvise 440#define __NR_epoll_pwait2 441#define __NR_mount_setattr 442 +#define __NR_quotactl_fd 443#define __NR_landlock_create_ruleset 444#define __NR_landlock_add_rule 445#define __NR_landlock_restrict_self 446
linux-headers/asm-s390/unistd_64.h +1 -0
@@ -363,6 +363,7 @@#define __NR_process_madvise 440#define __NR_epoll_pwait2 441#define __NR_mount_setattr 442 +#define __NR_quotactl_fd 443#define __NR_landlock_create_ruleset 444#define __NR_landlock_add_rule 445#define __NR_landlock_restrict_self 446
linux-headers/asm-x86/kvm.h +13 -0
@@ -159,6 +159,19 @@ struct kvm_sregs {__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS +63 ) /64 ]; }; +struct kvm_sregs2 { +/* out (KVM_GET_SREGS2) / in (KVM_SET_SREGS2) */ +struct kvm_segment cs, ds, es, fs, gs, ss; +struct kvm_segment tr, ldt; +struct kvm_dtable gdt, idt; +__u64 cr0, cr2, cr3, cr4, cr8; +__u64 efer; +__u64 apic_base; +__u64 flags; +__u64 pdptrs[4 ]; +}; +#define KVM_SREGS2_FLAGS_PDPTRS_VALID 1 +/* for KVM_GET_FPU and KVM_SET_FPU */ struct kvm_fpu {__u8 fpr[8 ][16 ];
linux-headers/asm-x86/unistd_32.h +4 -3
@@ -1,5 +1,5 @@ -#ifndef _ASM_X86_UNISTD_32_H -#define _ASM_X86_UNISTD_32_H 1 +#ifndef _ASM_UNISTD_32_H +#define _ASM_UNISTD_32_H#define __NR_restart_syscall 0#define __NR_exit 1
@@ -433,9 +433,10 @@#define __NR_process_madvise 440#define __NR_epoll_pwait2 441#define __NR_mount_setattr 442 +#define __NR_quotactl_fd 443#define __NR_landlock_create_ruleset 444#define __NR_landlock_add_rule 445#define __NR_landlock_restrict_self 446 -#endif /* _ASM_X86_UNISTD_32_H */ +#endif /* _ASM_UNISTD_32_H */
linux-headers/asm-x86/unistd_64.h +4 -3
@@ -1,5 +1,5 @@ -#ifndef _ASM_X86_UNISTD_64_H -#define _ASM_X86_UNISTD_64_H 1 +#ifndef _ASM_UNISTD_64_H +#define _ASM_UNISTD_64_H#define __NR_read 0#define __NR_write 1
@@ -355,9 +355,10 @@#define __NR_process_madvise 440#define __NR_epoll_pwait2 441#define __NR_mount_setattr 442 +#define __NR_quotactl_fd 443#define __NR_landlock_create_ruleset 444#define __NR_landlock_add_rule 445#define __NR_landlock_restrict_self 446 -#endif /* _ASM_X86_UNISTD_64_H */ +#endif /* _ASM_UNISTD_64_H */
linux-headers/asm-x86/unistd_x32.h +4 -3
@@ -1,5 +1,5 @@ -#ifndef _ASM_X86_UNISTD_X32_H -#define _ASM_X86_UNISTD_X32_H 1 +#ifndef _ASM_UNISTD_X32_H +#define _ASM_UNISTD_X32_H#define __NR_read (__X32_SYSCALL_BIT + 0)#define __NR_write (__X32_SYSCALL_BIT + 1)
@@ -308,6 +308,7 @@#define __NR_process_madvise (__X32_SYSCALL_BIT + 440)#define __NR_epoll_pwait2 (__X32_SYSCALL_BIT + 441)#define __NR_mount_setattr (__X32_SYSCALL_BIT + 442) +#define __NR_quotactl_fd (__X32_SYSCALL_BIT + 443)#define __NR_landlock_create_ruleset (__X32_SYSCALL_BIT + 444)#define __NR_landlock_add_rule (__X32_SYSCALL_BIT + 445)#define __NR_landlock_restrict_self (__X32_SYSCALL_BIT + 446)
@@ -349,4 +350,4 @@#define __NR_pwritev2 (__X32_SYSCALL_BIT + 547) -#endif /* _ASM_X86_UNISTD_X32_H */ +#endif /* _ASM_UNISTD_X32_H */
linux-headers/linux/kvm.h +105 -0
139 lines not on this page · raw message
linux-headers/linux/userfaultfd.h +8 -3
@@ -31,7 +31,8 @@ UFFD_FEATURE_MISSING_SHMEM | \ UFFD_FEATURE_SIGBUS | \ UFFD_FEATURE_THREAD_ID | \ - UFFD_FEATURE_MINOR_HUGETLBFS) + UFFD_FEATURE_MINOR_HUGETLBFS | \ + UFFD_FEATURE_MINOR_SHMEM)#define UFFD_API_IOCTLS \ ((__u64)1 << _UFFDIO_REGISTER | \ (__u64)1 << _UFFDIO_UNREGISTER | \
@@ -80,8 +81,8 @@ struct uffdio_zeropage)#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, \ struct uffdio_writeprotect) -#define UFFDIO_CONTINUE _IOR(UFFDIO, _UFFDIO_CONTINUE, \ - struct uffdio_continue) +#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, \ + struct uffdio_continue)/* read() structure */ struct uffd_msg {
@@ -185,6 +186,9 @@ struct uffdio_api {* UFFD_FEATURE_MINOR_HUGETLBFS indicates that minor faults * can be intercepted (via REGISTER_MODE_MINOR) for * hugetlbfs-backed pages. +* +* UFFD_FEATURE_MINOR_SHMEM indicates the same support as +* UFFD_FEATURE_MINOR_HUGETLBFS, but for shmem-backed pages instead. */ #define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0)#define UFFD_FEATURE_EVENT_FORK (1<<1)
@@ -196,6 +200,7 @@ struct uffdio_api {#define UFFD_FEATURE_SIGBUS (1<<7)#define UFFD_FEATURE_THREAD_ID (1<<8)#define UFFD_FEATURE_MINOR_HUGETLBFS (1<<9) +#define UFFD_FEATURE_MINOR_SHMEM (1<<10)__u64 features;__u64 ioctls;
Signature · 1 line
2.31.1
PATCH 2/2 target/ppc: Support for H_RPT_INVALIDATE hcall
In reply to Bharata B RaoIf KVM_CAP_RPT_INVALIDATE KVM capability is enabled, then
- indicate the availability of H_RPT_INVALIDATE hcall to the guest via ibm,hypertas-functions property.
- Enable the hcall
Both the above are done only if the new sPAPR machine capability cap-rpt-invalidate is set.
--- hw/ppc/spapr.c | 6 ++++++ hw/ppc/spapr_caps.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 8 ++++++-- target/ppc/kvm.c | 12 ++++++++++++ target/ppc/kvm_ppc.h | 12 ++++++++++++ 5 files changed, 77 insertions(+), 2 deletions(-)
hw/ppc/spapr.c +6 -0
@@ -880,6 +880,10 @@ static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt)add_str (hypertas,"hcall-copy" );add_str (hypertas,"hcall-debug" );add_str (hypertas,"hcall-vphn" ); +if (spapr_get_cap (spapr,SPAPR_CAP_RPT_INVALIDATE ) ==SPAPR_CAP_ON ) { +add_str (hypertas,"hcall-rpt-invalidate" ); + } +add_str (qemu_hypertas,"hcall-memop1" );if (!kvm_enabled () ||kvmppc_spapr_use_multitce ()) {
@@ -2018,6 +2022,7 @@ static const VMStateDescription vmstate_spapr = { &vmstate_spapr_cap_ccf_assist, &vmstate_spapr_cap_fwnmi, &vmstate_spapr_fwnmi, + &vmstate_spapr_cap_rpt_invalidate, NULL } };
@@ -4573,6 +4578,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_FWNMI ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_RPT_INVALIDATE ] =SPAPR_CAP_OFF ;spapr_caps_add_properties (smc); smc->irq = &spapr_irq_dual; smc->dr_phb_enabled = true;
hw/ppc/spapr_caps.c +41 -0
59 lines not on this page · raw message
include/hw/ppc/spapr.h +6 -2
@@ -74,8 +74,10 @@ typedef enum {#define SPAPR_CAP_CCF_ASSIST 0x09/* Implements PAPR FWNMI option */ #define SPAPR_CAP_FWNMI 0x0A +/* Support H_RPT_INVALIDATE */ +#define SPAPR_CAP_RPT_INVALIDATE 0x0B/* Num Caps */ -#define SPAPR_CAP_NUM (SPAPR_CAP_FWNMI + 1) +#define SPAPR_CAP_NUM (SPAPR_CAP_RPT_INVALIDATE + 1)/* * Capability Values
@@ -542,8 +544,9 @@ struct SpaprMachineState {#define H_SCM_UNBIND_MEM 0x3F0#define H_SCM_UNBIND_ALL 0x3FC#define H_SCM_HEALTH 0x400 +#define H_RPT_INVALIDATE 0x448 -#define MAX_HCALL_OPCODE H_SCM_HEALTH +#define MAX_HCALL_OPCODE H_RPT_INVALIDATE/* The hcalls above are standardized in PAPR and implemented by pHyp * as well.
@@ -932,6 +935,7 @@ extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;extern const VMStateDescription vmstate_spapr_cap_large_decr;extern const VMStateDescription vmstate_spapr_cap_ccf_assist;extern const VMStateDescription vmstate_spapr_cap_fwnmi; +extern const VMStateDescription vmstate_spapr_cap_rpt_invalidate;static inline uint8_t spapr_get_cap (SpaprMachineState *spapr,int cap) {
target/ppc/kvm.c +12 -0
@@ -89,6 +89,7 @@ static int cap_ppc_count_cache_flush_assist;static int cap_ppc_nested_kvm_hv;static int cap_large_decr;static int cap_fwnmi; +static int cap_rpt_invalidate;static uint32_t debug_inst_opcode;
@@ -152,6 +153,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)exit (1 ); } + cap_rpt_invalidate =kvm_vm_check_extension (s,KVM_CAP_PPC_RPT_INVALIDATE );kvm_ppc_register_host_cpu_type ();return 0 ;
@@ -2040,6 +2042,11 @@ void kvmppc_enable_h_page_init(void)kvmppc_enable_hcall (kvm_state,H_PAGE_INIT ); } +void kvmppc_enable_h_rpt_invalidate (void ) +{ +kvmppc_enable_hcall (kvm_state,H_RPT_INVALIDATE ); +} +void kvmppc_set_papr (PowerPCCPU *cpu) {CPUState *cs =CPU (cpu);
@@ -2551,6 +2558,11 @@ int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable)return 0 ; } +int kvmppc_has_cap_rpt_invalidate (void ) +{ +return cap_rpt_invalidate; +} +PowerPCCPUClass *kvm_ppc_get_host_cpu_class (void ) {uint32_t host_pvr =mfpvr ();
target/ppc/kvm_ppc.h +12 -0
@@ -24,6 +24,7 @@ void kvmppc_enable_logical_ci_hcalls(void);void kvmppc_enable_set_mode_hcall (void );void kvmppc_enable_clear_ref_mod_hcalls (void );void kvmppc_enable_h_page_init (void ); +void kvmppc_enable_h_rpt_invalidate (void );void kvmppc_set_papr (PowerPCCPU *cpu);int kvmppc_set_compat (PowerPCCPU *cpu,uint32_t compat_pvr);void kvmppc_set_mpic_proxy (PowerPCCPU *cpu,int mpic_proxy);
@@ -71,6 +72,7 @@ bool kvmppc_has_cap_nested_kvm_hv(void);int kvmppc_set_cap_nested_kvm_hv (int enable);int kvmppc_get_cap_large_decr (void );int kvmppc_enable_cap_large_decr (PowerPCCPU *cpu,int enable); +int kvmppc_has_cap_rpt_invalidate (void );int kvmppc_enable_hwrng (void );int kvmppc_put_books_sregs (PowerPCCPU *cpu);PowerPCCPUClass *kvm_ppc_get_host_cpu_class (void );
@@ -150,6 +152,11 @@ static inline void kvmppc_enable_h_page_init(void) { } +static inline void kvmppc_enable_h_rpt_invalidate (void ) +{ +g_assert_not_reached (); +} +static inline void kvmppc_set_papr (PowerPCCPU *cpu) { }
@@ -381,6 +388,11 @@ static inline int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable)return -1 ; } +static inline int kvmppc_has_cap_rpt_invalidate (void ) +{ +return false; +} +static inline int kvmppc_enable_hwrng (void ) {return -1 ;
Signature · 1 line
2.31.1
David Gibson
AppliedRe: [PATCH v1 2/2] target/ppc: Support for H_RPT_INVALIDATE hcall
Quoted 10 lines · Bharata B Rao
If
KVM_CAP_RPT_INVALIDATEKVM capability is enabled, then- indicate the availability of
H_RPT_INVALIDATEhcall to the guest via ibm,hypertas-functions property.
- Enable the hcallBoth the above are done only if the new sPAPR machine capability cap-rpt-invalidate is set.
Signed-off-by Bharata B Rao <[email protected]>
Applied to ppc-for-6.1, but one note below.
Quoted 49 lines
--- hw/ppc/spapr.c | 6 ++++++ hw/ppc/spapr_caps.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 8 ++++++-- target/ppc/kvm.c | 12 ++++++++++++ target/ppc/kvm_ppc.h | 12 ++++++++++++ 5 files changed, 77 insertions(+), 2 deletions(-)hw/ppc/spapr.c +6
-0@@ -880,6 +880,10 @@ static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt)add_str (hypertas,"hcall-copy" );add_str (hypertas,"hcall-debug" );add_str (hypertas,"hcall-vphn" ); +if (spapr_get_cap (spapr,SPAPR_CAP_RPT_INVALIDATE ) ==SPAPR_CAP_ON ) { +add_str (hypertas,"hcall-rpt-invalidate" ); + } +add_str (qemu_hypertas,"hcall-memop1" );if (!kvm_enabled () ||kvmppc_spapr_use_multitce ()) {@@ -2018,6 +2022,7 @@ static const VMStateDescription vmstate_spapr = { &vmstate_spapr_cap_ccf_assist, &vmstate_spapr_cap_fwnmi, &vmstate_spapr_fwnmi, + &vmstate_spapr_cap_rpt_invalidate, NULL } };@@ -4573,6 +4578,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_FWNMI ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_RPT_INVALIDATE ] =SPAPR_CAP_OFF ;spapr_caps_add_properties (smc); smc->irq = &spapr_irq_dual; smc->dr_phb_enabled = true;hw/ppc/spapr_caps.c +2
-0@@ -582,6 +582,37 @@ static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, } } +static void cap_rpt_invalidate_apply (SpaprMachineState *spapr, +uint8_t val,Error **errp)
hw/ppc/spapr_caps.c static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, · line 596
Quoted 10 lines
hw/ppc/spapr_caps.c +10
-0+{ +ERRP_GUARD (); + +if (!val) { +/* capability disabled by default */ +return ; + } + +if (tcg_enabled ()) { +error_setg (errp,"No H_RPT_INVALIDATE support in TCG" );
This will need to be fixed before the default can be changed to on.
Quoted 169 lines
hw/ppc/spapr_caps.c +29
-0+error_append_hint (errp, +"Try appending -machine cap-rpt-invalidate=off\n" ); + }else if (kvm_enabled ()) { +if (!kvmppc_has_cap_mmu_radix ()) { +error_setg (errp,"H_RPT_INVALIDATE only supported on Radix" ); +return ; + } + +if (!kvmppc_has_cap_rpt_invalidate ()) { +error_setg (errp, +"KVM implementation does not support H_RPT_INVALIDATE" ); +error_append_hint (errp, +"Try appending -machine cap-rpt-invalidate=off\n" ); + }else { +kvmppc_enable_h_rpt_invalidate (); + } + } +} +SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM ] = { [SPAPR_CAP_HTM ] = { .name ="htm" ,@@ -690,6 +721,15 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = { .type = "bool", .apply = cap_fwnmi_apply, }, + [SPAPR_CAP_RPT_INVALIDATE] = { + .name = "rpt-invalidate", + .description = "Allow H_RPT_INVALIDATE", + .index = SPAPR_CAP_RPT_INVALIDATE, + .get = spapr_cap_get_bool, + .set = spapr_cap_set_bool, + .type = "bool", + .apply = cap_rpt_invalidate_apply, + }, }; static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr,@@ -830,6 +870,7 @@ SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);SPAPR_CAP_MIG_STATE (large_decr,SPAPR_CAP_LARGE_DECREMENTER );SPAPR_CAP_MIG_STATE (ccf_assist,SPAPR_CAP_CCF_ASSIST );SPAPR_CAP_MIG_STATE (fwnmi,SPAPR_CAP_FWNMI ); +SPAPR_CAP_MIG_STATE (rpt_invalidate,SPAPR_CAP_RPT_INVALIDATE );void spapr_caps_init (SpaprMachineState *spapr) {include/hw/ppc/spapr.h +6
-2@@ -74,8 +74,10 @@ typedef enum {#define SPAPR_CAP_CCF_ASSIST 0x09/* Implements PAPR FWNMI option */ #define SPAPR_CAP_FWNMI 0x0A +/* Support H_RPT_INVALIDATE */ +#define SPAPR_CAP_RPT_INVALIDATE 0x0B/* Num Caps */ -#define SPAPR_CAP_NUM (SPAPR_CAP_FWNMI + 1) +#define SPAPR_CAP_NUM (SPAPR_CAP_RPT_INVALIDATE + 1)/* * Capability Values @@ -542,8 +544,9 @@ struct SpaprMachineState {#define H_SCM_UNBIND_MEM 0x3F0#define H_SCM_UNBIND_ALL 0x3FC#define H_SCM_HEALTH 0x400 +#define H_RPT_INVALIDATE 0x448 -#define MAX_HCALL_OPCODE H_SCM_HEALTH +#define MAX_HCALL_OPCODE H_RPT_INVALIDATE/* The hcalls above are standardized in PAPR and implemented by pHyp * as well. @@ -932,6 +935,7 @@ extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;extern const VMStateDescription vmstate_spapr_cap_large_decr;extern const VMStateDescription vmstate_spapr_cap_ccf_assist;extern const VMStateDescription vmstate_spapr_cap_fwnmi; +extern const VMStateDescription vmstate_spapr_cap_rpt_invalidate;static inline uint8_t spapr_get_cap (SpaprMachineState *spapr,int cap) {target/ppc/kvm.c +12
-0@@ -89,6 +89,7 @@ static int cap_ppc_count_cache_flush_assist;static int cap_ppc_nested_kvm_hv;static int cap_large_decr;static int cap_fwnmi; +static int cap_rpt_invalidate;static uint32_t debug_inst_opcode;@@ -152,6 +153,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)exit (1 ); } + cap_rpt_invalidate =kvm_vm_check_extension (s,KVM_CAP_PPC_RPT_INVALIDATE );kvm_ppc_register_host_cpu_type ();return 0 ;@@ -2040,6 +2042,11 @@ void kvmppc_enable_h_page_init(void)kvmppc_enable_hcall (kvm_state,H_PAGE_INIT ); } +void kvmppc_enable_h_rpt_invalidate (void ) +{ +kvmppc_enable_hcall (kvm_state,H_RPT_INVALIDATE ); +} +void kvmppc_set_papr (PowerPCCPU *cpu) {CPUState *cs =CPU (cpu);@@ -2551,6 +2558,11 @@ int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable)return 0 ; } +int kvmppc_has_cap_rpt_invalidate (void ) +{ +return cap_rpt_invalidate; +} +PowerPCCPUClass *kvm_ppc_get_host_cpu_class (void ) {uint32_t host_pvr =mfpvr ();target/ppc/kvm_ppc.h +12
-0@@ -24,6 +24,7 @@ void kvmppc_enable_logical_ci_hcalls(void);void kvmppc_enable_set_mode_hcall (void );void kvmppc_enable_clear_ref_mod_hcalls (void );void kvmppc_enable_h_page_init (void ); +void kvmppc_enable_h_rpt_invalidate (void );void kvmppc_set_papr (PowerPCCPU *cpu);int kvmppc_set_compat (PowerPCCPU *cpu,uint32_t compat_pvr);void kvmppc_set_mpic_proxy (PowerPCCPU *cpu,int mpic_proxy);@@ -71,6 +72,7 @@ bool kvmppc_has_cap_nested_kvm_hv(void);int kvmppc_set_cap_nested_kvm_hv (int enable);int kvmppc_get_cap_large_decr (void );int kvmppc_enable_cap_large_decr (PowerPCCPU *cpu,int enable); +int kvmppc_has_cap_rpt_invalidate (void );int kvmppc_enable_hwrng (void );int kvmppc_put_books_sregs (PowerPCCPU *cpu);PowerPCCPUClass *kvm_ppc_get_host_cpu_class (void );@@ -150,6 +152,11 @@ static inline void kvmppc_enable_h_page_init(void) { } +static inline void kvmppc_enable_h_rpt_invalidate (void ) +{ +g_assert_not_reached (); +} +static inline void kvmppc_set_papr (PowerPCCPU *cpu) { }@@ -381,6 +388,11 @@ static inline int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable)return -1 ; } +static inline int kvmppc_has_cap_rpt_invalidate (void ) +{ +return false; +} +static inline int kvmppc_enable_hwrng (void ) {return -1 ;
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