ppc/spapr: Support reboot of secure pseries guest
v4 cover ppc/spapr: Support reboot of secure pseries guest
This patchset adds KVM_PPC_SVM_OFF ioctl which is required to support reset of secure guest. This includes linux-headers update so that we get the newly introduced ioctl.
v3: https://lists.gnu.org/archive/html/qemu-devel/2019-12/msg03685.html
Changes in v4:
-------------
- s/error_setg/error_setg_errno (Greg Kurz)
Bharata B Rao (2):
linux-headers: Update
ppc/spapr: Support reboot of secure pseries guest
hw/ppc/spapr.c | 1 + include/standard-headers/asm-x86/bootparam.h | 7 +- .../infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 15 +++- include/standard-headers/drm/drm_fourcc.h | 28 ++++++- .../linux/input-event-codes.h | 77 +++++++++++++++++++ include/standard-headers/linux/pci_regs.h | 3 + .../standard-headers/rdma/vmw_pvrdma-abi.h | 5 ++ linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 15 ++++ target/ppc/kvm_ppc.h | 6 ++ 10 files changed, 154 insertions(+), 4 deletions(-)
Signature · 1 line
2.21.0
PATCH v4 1/2 linux-headers: Update
Update to mainline commit: d1eef1c61974 ("Linux 5.5-rc2")
--- include/standard-headers/asm-x86/bootparam.h | 7 +- .../infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 15 +++- include/standard-headers/drm/drm_fourcc.h | 28 ++++++- .../linux/input-event-codes.h | 77 +++++++++++++++++++ include/standard-headers/linux/pci_regs.h | 3 + .../standard-headers/rdma/vmw_pvrdma-abi.h | 5 ++ linux-headers/linux/kvm.h | 1 + 7 files changed, 132 insertions(+), 4 deletions(-)
include/standard-headers/asm-x86/bootparam.h +6 -1
@@ -2,7 +2,7 @@#ifndef _ASM_X86_BOOTPARAM_H#define _ASM_X86_BOOTPARAM_H -/* setup_data types */ +/* setup_data/setup_indirect types */ #define SETUP_NONE 0#define SETUP_E820_EXT 1#define SETUP_DTB 2
@@ -11,6 +11,11 @@#define SETUP_APPLE_PROPERTIES 5#define SETUP_JAILHOUSE 6 +#define SETUP_INDIRECT (1<<31) + +/* SETUP_INDIRECT | max(SETUP_*) */ +#define SETUP_TYPE_MAX (SETUP_INDIRECT | SETUP_JAILHOUSE) +/* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF#define RAMDISK_PROMPT_FLAG 0x8000
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h +14 -1
@@ -58,7 +58,8 @@#define PVRDMA_ROCEV1_VERSION 17#define PVRDMA_ROCEV2_VERSION 18#define PVRDMA_PPN64_VERSION 19 -#define PVRDMA_VERSION PVRDMA_PPN64_VERSION +#define PVRDMA_QPHANDLE_VERSION 20 +#define PVRDMA_VERSION PVRDMA_QPHANDLE_VERSION#define PVRDMA_BOARD_ID 1#define PVRDMA_REV_ID 1
@@ -581,6 +582,17 @@ struct pvrdma_cmd_create_qp_resp {uint32_t max_inline_data; }; +struct pvrdma_cmd_create_qp_resp_v2 { +struct pvrdma_cmd_resp_hdr hdr; +uint32_t qpn; +uint32_t qp_handle; +uint32_t max_send_wr; +uint32_t max_recv_wr; +uint32_t max_send_sge; +uint32_t max_recv_sge; +uint32_t max_inline_data; +}; +struct pvrdma_cmd_modify_qp {struct pvrdma_cmd_hdr hdr;uint32_t qp_handle;
@@ -663,6 +675,7 @@ union pvrdma_cmd_resp {struct pvrdma_cmd_create_cq_resp create_cq_resp;struct pvrdma_cmd_resize_cq_resp resize_cq_resp;struct pvrdma_cmd_create_qp_resp create_qp_resp; +struct pvrdma_cmd_create_qp_resp_v2 create_qp_resp_v2;struct pvrdma_cmd_query_qp_resp query_qp_resp;struct pvrdma_cmd_destroy_qp_resp destroy_qp_resp;struct pvrdma_cmd_create_srq_resp create_srq_resp;
include/standard-headers/drm/drm_fourcc.h +26 -2
@@ -68,7 +68,7 @@ extern "C" {#define fourcc_code (a, b, c, d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \ ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24)) -#define DRM_FORMAT_BIG_ENDIAN (1<<31)/* format is big endian instead of little endian */ +#define DRM_FORMAT_BIG_ENDIAN (1U<<31)/* format is big endian instead of little endian */ /* Reserve 0 for the invalid format specifier */ #define DRM_FORMAT_INVALID 0
@@ -647,7 +647,21 @@ extern "C" {* Further information on the use of AFBC modifiers can be found in * Documentation/gpu/afbc.rst */ -#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) fourcc_mod_code(ARM, __afbc_mode) + +/* +* The top 4 bits (out of the 56 bits alloted for specifying vendor specific +* modifiers) denote the category for modifiers. Currently we have only two +* categories of modifiers ie AFBC and MISC. We can have a maximum of sixteen +* different categories. +*/ +#define DRM_FORMAT_MOD_ARM_CODE (__type, __val) \ + fourcc_mod_code(ARM, ((uint64_t)(__type) << 52) | ((__val) & 0x000fffffffffffffULL)) + +#define DRM_FORMAT_MOD_ARM_TYPE_AFBC 0x00 +#define DRM_FORMAT_MOD_ARM_TYPE_MISC 0x01 + +#define DRM_FORMAT_MOD_ARM_AFBC (__afbc_mode) \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_AFBC, __afbc_mode)/* * AFBC superblock size
@@ -741,6 +755,16 @@ extern "C" {*/ #define AFBC_FORMAT_MOD_BCH (1ULL << 11) +/* +* Arm 16x16 Block U-Interleaved modifier +* +* This is used by Arm Mali Utgard and Midgard GPUs. It divides the image +* into 16x16 pixel blocks. Blocks are stored linearly in order, but pixels +* in the block are reordered. +*/ +#define DRM_FORMAT_MOD_ARM_16X16_BLOCK_U_INTERLEAVED \ + DRM_FORMAT_MOD_ARM_CODE(DRM_FORMAT_MOD_ARM_TYPE_MISC, 1ULL) +/* * Allwinner tiled modifier *
include/standard-headers/linux/input-event-codes.h +77 -0
83 lines not on this page · raw message
include/standard-headers/linux/pci_regs.h +3 -0
@@ -34,6 +34,7 @@* of which the first 64 bytes are standardized as follows: */ #define PCI_STD_HEADER_SIZEOF 64 +#define PCI_STD_NUM_BARS 6/* Number of standard BARs */ #define PCI_VENDOR_ID 0x00/* 16 bits */ #define PCI_DEVICE_ID 0x02/* 16 bits */ #define PCI_COMMAND 0x04/* 16 bits */
@@ -673,6 +674,8 @@#define PCI_EXP_LNKCTL2_TLS_8_0GT 0x0003/* Supported Speed 8GT/s */ #define PCI_EXP_LNKCTL2_TLS_16_0GT 0x0004/* Supported Speed 16GT/s */ #define PCI_EXP_LNKCTL2_TLS_32_0GT 0x0005/* Supported Speed 32GT/s */ +#define PCI_EXP_LNKCTL2_ENTER_COMP 0x0010/* Enter Compliance */ +#define PCI_EXP_LNKCTL2_TX_MARGIN 0x0380/* Transmit Margin */ #define PCI_EXP_LNKSTA2 50/* Link Status 2 */ #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 52/* v2 endpoints with link end here */ #define PCI_EXP_SLTCAP2 52/* Slot Capabilities 2 */
include/standard-headers/rdma/vmw_pvrdma-abi.h +5 -0
@@ -179,6 +179,11 @@ struct pvrdma_create_qp {uint64_t __attribute__((aligned (8 ))) qp_addr; }; +struct pvrdma_create_qp_resp { +uint32_t qpn; +uint32_t qp_handle; +}; +/* PVRDMA masked atomic compare and swap */ struct pvrdma_ex_cmp_swap {uint64_t __attribute__((aligned (8 ))) swap_val;
linux-headers/linux/kvm.h +1 -0
@@ -1348,6 +1348,7 @@ struct kvm_s390_ucas_mapping {#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)/* Available with KVM_CAP_PMU_EVENT_FILTER */ #define KVM_SET_PMU_EVENT_FILTER _IOW(KVMIO, 0xb2, struct kvm_pmu_event_filter) +#define KVM_PPC_SVM_OFF _IO(KVMIO, 0xb3)/* ioctl for vm fd */ #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
Signature · 1 line
2.21.0
PATCH v4 2/2 ppc/spapr: Support reboot of secure pseries guest
In reply to Bharata B RaoA pseries guest can be run as a secure guest on Ultravisor-enabled POWER platforms. When such a secure guest is reset, we need to release/reset a few resources both on ultravisor and hypervisor side. This is achieved by invoking this new ioctl KVM_PPC_SVM_OFF from the machine reset path.
As part of this ioctl, the secure guest is essentially transitioned back to normal mode so that it can reboot like a regular guest and become secure again.
This ioctl has no effect when invoked for a normal guest. If this ioctl fails for a secure guest, the guest is terminated.
--- hw/ppc/spapr.c | 1 + target/ppc/kvm.c | 15 +++++++++++++++ target/ppc/kvm_ppc.h | 6 ++++++ 3 files changed, 22 insertions(+)
hw/ppc/spapr.c +1 -0
@@ -1597,6 +1597,7 @@ static void spapr_machine_reset(MachineState *machine)void *fdt;int rc; +kvmppc_svm_off (&error_fatal);spapr_caps_apply (spapr); first_ppc_cpu =POWERPC_CPU (first_cpu);
target/ppc/kvm.c +15 -0
@@ -2900,3 +2900,18 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset)kvm_set_one_reg (cs,KVM_REG_PPC_TB_OFFSET , &tb_offset); } } + +/* +* Don't set error if KVM_PPC_SVM_OFF ioctl is invoked on kernels +* that don't support this ioctl. +*/ +void kvmppc_svm_off (Error **errp) +{ +int rc; +KVMState *s =KVM_STATE (current_machine->accelerator); + + rc =kvm_vm_ioctl (s,KVM_PPC_SVM_OFF ); +if (rc && rc != -ENOTTY ) { +error_setg_errno (errp, -rc,"KVM_PPC_SVM_OFF ioctl failed" ); + } +}
target/ppc/kvm_ppc.h +6 -0
@@ -37,6 +37,7 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu);target_ulong kvmppc_configure_v3_mmu (PowerPCCPU *cpu,bool radix,bool gtse,uint64_t proc_tbl); +void kvmppc_svm_off (Error **errp);#ifndef CONFIG_USER_ONLY bool kvmppc_spapr_use_multitce (void );int kvmppc_spapr_enable_inkernel_multitce (void );
@@ -201,6 +202,11 @@ static inline target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu,return 0 ; } +static inline void kvmppc_svm_off (Error **errp) +{ +return ; +} +static inline void kvmppc_set_reg_ppc_online (PowerPCCPU *cpu,unsigned int online) {
Signature · 1 line
2.21.0
Quoted 39 lines · Bharata B Rao
A pseries guest can be run as a secure guest on Ultravisor-enabled POWER platforms. When such a secure guest is reset, we need to release/reset a few resources both on ultravisor and hypervisor side. This is achieved by invoking this new ioctl
KVM_PPC_SVM_OFFfrom the machine reset path.As part of this ioctl, the secure guest is essentially transitioned back to normal mode so that it can reboot like a regular guest and become secure again.
This ioctl has no effect when invoked for a normal guest. If this ioctl fails for a secure guest, the guest is terminated.
Signed-off-by Bharata B Rao <[email protected]>--- hw/ppc/spapr.c | 1 + target/ppc/kvm.c | 15 +++++++++++++++ target/ppc/kvm_ppc.h | 6 ++++++ 3 files changed, 22 insertions(+)hw/ppc/spapr.c +1
-0@@ -1597,6 +1597,7 @@ static void spapr_machine_reset(MachineState *machine)void *fdt;int rc; +kvmppc_svm_off (&error_fatal);spapr_caps_apply (spapr); first_ppc_cpu =POWERPC_CPU (first_cpu);target/ppc/kvm.c +0
-0@@ -2900,3 +2900,18 @@ void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset)kvm_set_one_reg (cs,KVM_REG_PPC_TB_OFFSET , &tb_offset); }
target/ppc/kvm.c void kvmppc_set_reg_tb_offset(PowerPCCPU *cpu, int64_t tb_offset) · line 2911
Quoted 10 lines
target/ppc/kvm.c +9
-0} + +/* +* Don't set error if KVM_PPC_SVM_OFF ioctl is invoked on kernels +* that don't support this ioctl. +*/ +void kvmppc_svm_off (Error **errp) +{ +int rc; +KVMState *s =KVM_STATE (current_machine->accelerator);
Crashed when TCG:
Thread 1 "qemu-system-ppc" hit Breakpoint 4, 0x00007ffff79c1068 in __GI_abort () at abort.c:51
51 abort.c: No such file or directory.
#0 0x00007ffff79c1068 in __GI_abort () at abort.c:51
#1 0x0000000010752f70 in object_dynamic_cast_assert (obj=0x10f84a90, typename=0x109d4da0 "kvm-accel", file=0x109d4c88 "/home/aik/p/qemu-killslof/target/ppc/kvm.c", line=0xb59, func=0x109d5a40 <__func__.32829> "kvmppc_svm_off") at /home/aik/p/qemu-killslof/qom/object.c:791 #2 0x0000000010344c2c in kvmppc_svm_off (errp=0x10dd56a8 <error_fatal>) at /home/aik/p/qemu-killslof/target/ppc/kvm.c:2905
#3 0x00000000101d4ebc in spapr_machine_reset (machine=0x10f72870) at /home/aik/p/qemu-killslof/hw/ppc/spapr.c:1621
#4 0x00000000103bccf8 in qemu_system_reset (reason=SHUTDOWN_CAUSE_NONE) at /home/aik/p/qemu-killslof/vl.c:1427
#5 0x00000000103c720c in main (argc=0x19, argv=0x7ffffffff228, envp=0x7ffffffff2f8) at /home/aik/p/qemu-killslof/vl.c:4277 (gdb)
Quoted 31 lines
target/ppc/kvm.c +6
-0+ + rc =kvm_vm_ioctl (s,KVM_PPC_SVM_OFF ); +if (rc && rc != -ENOTTY ) { +error_setg_errno (errp, -rc,"KVM_PPC_SVM_OFF ioctl failed" ); + } +}target/ppc/kvm_ppc.h +6
-0@@ -37,6 +37,7 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu);target_ulong kvmppc_configure_v3_mmu (PowerPCCPU *cpu,bool radix,bool gtse,uint64_t proc_tbl); +void kvmppc_svm_off (Error **errp);#ifndef CONFIG_USER_ONLY bool kvmppc_spapr_use_multitce (void );int kvmppc_spapr_enable_inkernel_multitce (void );@@ -201,6 +202,11 @@ static inline target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu,return 0 ; } +static inline void kvmppc_svm_off (Error **errp) +{ +return ; +} +static inline void kvmppc_set_reg_ppc_online (PowerPCCPU *cpu,unsigned int online) {
Signature · 1 line
Alexey
David Gibson
AppliedQuoted 6 lines · Bharata B Rao
This patchset adds
KVM_PPC_SVM_OFFioctl which is required to support reset of secure guest. This includes linux-headers update so that we get the newly introduced ioctl.v3:
https://lists.gnu.org/archive/html/qemu-devel/2019-12/msg03685.html
Applied to ppc-for-5.0, thanks.
Quoted 21 lines
Changes in v4:
-------------
- s/error_setg/error_setg_errno (Greg Kurz)Bharata B Rao (2):
linux-headers: Update
ppc/spapr: Support reboot of secure pseries guesthw/ppc/spapr.c | 1 + include/standard-headers/asm-x86/bootparam.h | 7 +- .../infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 15 +++- include/standard-headers/drm/drm_fourcc.h | 28 ++++++- .../linux/input-event-codes.h | 77 +++++++++++++++++++ include/standard-headers/linux/pci_regs.h | 3 + .../standard-headers/rdma/vmw_pvrdma-abi.h | 5 ++ linux-headers/linux/kvm.h | 1 + target/ppc/kvm.c | 15 ++++ target/ppc/kvm_ppc.h | 6 ++ 10 files changed, 154 insertions(+), 4 deletions(-)
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