s390x: Protected Virtualization support
v11 cover s390x: Protected Virtualization support
Most of the QEMU changes for PV are related to the new IPL type with subcodes 8 - 10 and the execution of the necessary Ultravisor calls to IPL secure guests. Note that we can only boot into secure mode from normal mode, i.e. stfle 161 is not active in secure mode.
The other changes related to data gathering for emulation and disabling addressing checks in secure mode, as well as CPU resets.
v11:
* Review fixes
v10:
* Moved documentation into subfolder
* Added huge page fencing
* Cleared up IO questions that were remaining
* Added exits/abbort/assert for conditions where we can't recover
v9:
* Moved pv.h into include/hw/s390x/
* Replaced cmd strings with macro
* Moved s390_is_pv() to pv.h
* Added new copyright dates and authors
v8:
* Removed the iplb_valid changes as they are picked
* Checkpatch fixes
* Review fixes
* Replaced env/ms->pv with s390_is_pv()
v7:
* Merged the diag 308 subcode patches and the unpack
* Moved the SIDA memops into the sync patch
* Bailout for the none machien and fencing of CONFIG_USER_ONLY
* Changes due to review
v6:
* diag308 rc numbers were changed by architecture
* IPL pv block received one more reserved field by architecture
* Officially added the bios patch to the series
* Dropped picked constant rename patch
v5:
* Moved docs into docs/system
* Some more enable/disable changes
* Moved enablement/disablement of pv in separate functions
* Some review fixes
v4:
* Sync with KVM changes
* Review changes
V3:
* Use dedicated functions to access SIDA
* Smaller cleanups and segfault fixes
* Error reporting for Ultravisor calls
* Inject of RC of diag308 subcode 10 fails
V2:
* Split out cleanups
* Internal PV state tracking
* Review feedback
Christian Borntraeger (1):
s390x: Add unpack facility feature to GA1
Janosch Frank (15):
s390x: Move diagnose 308 subcodes and rcs into ipl.h Sync pv
s390x: protvirt: Support unpack facility
s390x: protvirt: Add migration blocker
s390x: protvirt: Inhibit balloon when switching to protected mode
s390x: protvirt: KVM intercept changes
s390x: Add SIDA memory ops
s390x: protvirt: Move STSI data over SIDAD
s390x: protvirt: SCLP interpretation
s390x: protvirt: Set guest IPL PSW
s390x: protvirt: Move diag 308 data over SIDA
s390x: protvirt: Disable address checks for PV guest IO emulation
s390x: protvirt: Move IO control structures over SIDA
s390x: protvirt: Handle SIGP store status correctly
docs: system: Add protvirt docs
MAINTAINERS | 2 + docs/system/s390x/protvirt.rst | 60 +++++++++++ docs/system/target-s390x.rst | 5 + hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 59 ++++++++++- hw/s390x/ipl.h | 102 ++++++++++++++++++- hw/s390x/pv.c | 98 ++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 148 +++++++++++++++++++++++++++- hw/s390x/sclp.c | 56 ++++++++--- include/hw/s390x/pv.h | 55 +++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + include/hw/s390x/sclp.h | 2 + linux-headers/linux/kvm.h | 45 ++++++++- target/s390x/cpu.c | 27 +++-- target/s390x/cpu.h | 7 +- target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 77 +++++++++++---- target/s390x/gen-features.c | 1 + target/s390x/helper.c | 6 ++ target/s390x/ioinst.c | 96 +++++++++++++----- target/s390x/kvm-stub.c | 5 + target/s390x/kvm.c | 79 +++++++++++++-- target/s390x/kvm_s390x.h | 3 + target/s390x/mmu_helper.c | 14 +++ 24 files changed, 870 insertions(+), 80 deletions(-) create mode 100644 docs/system/s390x/protvirt.rst create mode 100644 hw/s390x/pv.c create mode 100644 include/hw/s390x/pv.h
Signature · 1 line
2.25.1
PATCH v11 1/16 s390x: Move diagnose 308 subcodes and rcs into ipl.h
They are part of the IPL process, so let's put them into the ipl header.
--- hw/s390x/ipl.h | 11 +++++++++++ target/s390x/diag.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-)
hw/s390x/ipl.h +11 -0
@@ -159,6 +159,17 @@ struct S390IPLState {typedef struct S390IPLState S390IPLState ;QEMU_BUILD_BUG_MSG (offsetof(S390IPLState , iplb) &3 ,"alignment of iplb wrong" ); +#define DIAG_308_RC_OK 0x0001 +#define DIAG_308_RC_NO_CONF 0x0102 +#define DIAG_308_RC_INVALID 0x0402 + +#define DIAG308_RESET_MOD_CLR 0 +#define DIAG308_RESET_LOAD_NORM 1 +#define DIAG308_LOAD_CLEAR 3 +#define DIAG308_LOAD_NORMAL_DUMP 4 +#define DIAG308_SET 5 +#define DIAG308_STORE 6 +#define S390_IPL_TYPE_FCP 0x00#define S390_IPL_TYPE_CCW 0x02#define S390_IPL_TYPE_QEMU_SCSI 0xff
target/s390x/diag.c +0 -11
@@ -49,17 +49,6 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)return diag288_class->handle_timer (diag288, func, timeout); } -#define DIAG_308_RC_OK 0x0001 -#define DIAG_308_RC_NO_CONF 0x0102 -#define DIAG_308_RC_INVALID 0x0402 - -#define DIAG308_RESET_MOD_CLR 0 -#define DIAG308_RESET_LOAD_NORM 1 -#define DIAG308_LOAD_CLEAR 3 -#define DIAG308_LOAD_NORMAL_DUMP 4 -#define DIAG308_SET 5 -#define DIAG308_STORE 6 -static int diag308_parm_check (CPUS390XState *env,uint64_t r1,uint64_t addr,uintptr_t ra,bool write) {
Signature · 1 line
2.25.1
Re: [PATCH v11 01/16] s390x: Move diagnose 308 subcodes and rcs into ipl.h
Quoted 46 lines · Janosch Frank
They are part of the IPL process, so let's put them into the ipl header.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Cornelia Huck <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>--- hw/s390x/ipl.h | 11 +++++++++++ target/s390x/diag.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-)hw/s390x/ipl.h +11
-0@@ -159,6 +159,17 @@ struct S390IPLState {typedef struct S390IPLState S390IPLState ;QEMU_BUILD_BUG_MSG (offsetof(S390IPLState , iplb) &3 ,"alignment of iplb wrong" ); +#define DIAG_308_RC_OK 0x0001 +#define DIAG_308_RC_NO_CONF 0x0102 +#define DIAG_308_RC_INVALID 0x0402 + +#define DIAG308_RESET_MOD_CLR 0 +#define DIAG308_RESET_LOAD_NORM 1 +#define DIAG308_LOAD_CLEAR 3 +#define DIAG308_LOAD_NORMAL_DUMP 4 +#define DIAG308_SET 5 +#define DIAG308_STORE 6 +#define S390_IPL_TYPE_FCP 0x00#define S390_IPL_TYPE_CCW 0x02#define S390_IPL_TYPE_QEMU_SCSI 0xfftarget/s390x/diag.c +0
-4@@ -49,17 +49,6 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)return diag288_class->handle_timer (diag288, func, timeout); } -#define DIAG_308_RC_OK 0x0001 -#define DIAG_308_RC_NO_CONF 0x0102 -#define DIAG_308_RC_INVALID 0x0402 -
target/s390x/diag.c int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3) · line 54
Quoted 10 lines
target/s390x/diag.c +0
-7-#define DIAG308_RESET_MOD_CLR 0 -#define DIAG308_RESET_LOAD_NORM 1 -#define DIAG308_LOAD_CLEAR 3 -#define DIAG308_LOAD_NORMAL_DUMP 4 -#define DIAG308_SET 5 -#define DIAG308_STORE 6 -static int diag308_parm_check (CPUS390XState *env,uint64_t r1,uint64_t addr,uintptr_t ra,bool write) {
Signature · 3 lines
Thanks, David / dhildenb
PATCH v11 2/16 Sync pv
In reply to Janosch Frank--- linux-headers/linux/kvm.h | 45 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)
linux-headers/linux/kvm.h +43 -2
@@ -474,12 +474,17 @@ struct kvm_s390_mem_op {__u32 size;/* amount of bytes */ __u32 op;/* type of operation */ __u64 buf;/* buffer in userspace */ -__u8 ar;/* the access register number */ -__u8 reserved[31 ];/* should be set to 0 */ +union { +__u8 ar;/* the access register number */ +__u32 sida_offset;/* offset into the sida */ +__u8 reserved[32 ];/* should be set to 0 */ + }; };/* types for kvm_s390_mem_op->op */ #define KVM_S390_MEMOP_LOGICAL_READ 0#define KVM_S390_MEMOP_LOGICAL_WRITE 1 +#define KVM_S390_MEMOP_SIDA_READ 2 +#define KVM_S390_MEMOP_SIDA_WRITE 3/* flags for kvm_s390_mem_op->flags */ #define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
@@ -1010,6 +1015,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_ARM_NISV_TO_USER 177#define KVM_CAP_ARM_INJECT_EXT_DABT 178#define KVM_CAP_S390_VCPU_RESETS 179 +#define KVM_CAP_S390_PROTECTED 180#ifdef KVM_CAP_IRQ_ROUTING
@@ -1478,6 +1484,41 @@ struct kvm_enc_region {#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) +struct kvm_s390_pv_sec_parm { +__u64 origin; +__u64 length; +}; + +struct kvm_s390_pv_unp { +__u64 addr; +__u64 size; +__u64 tweak; +}; + +enum pv_cmd_id { +KVM_PV_ENABLE , +KVM_PV_DISABLE , +KVM_PV_VM_SET_SEC_PARMS , +KVM_PV_VM_UNPACK , +KVM_PV_VM_VERIFY , +KVM_PV_VM_PREP_RESET , +KVM_PV_VM_UNSHARE_ALL , +KVM_PV_VCPU_CREATE , +KVM_PV_VCPU_DESTROY , +}; + +struct kvm_pv_cmd { +__u32 cmd;/* Command to be executed */ +__u16 rc;/* Ultravisor return code */ +__u16 rrc;/* Ultravisor return reason code */ +__u64 data;/* Data or address */ +__u32 flags;/* flags for future extensions. Must be 0 for now */ +__u32 reserved[3 ]; +}; + +/* Available with KVM_CAP_S390_PROTECTED */ +#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd) +/* Secure Encrypted Virtualization command */ enum sev_cmd_id {/* Guest initialization commands */
Signature · 1 line
2.25.1
PATCH v11 3/16 s390x: protvirt: Support unpack facility
In reply to Janosch FrankThe unpack facility provides the means to setup a protected guest. A protected guest cannot be introspected by the hypervisor or any user/administrator of the machine it is running on.
Protected guests are encrypted at rest and need a special boot mechanism via diag308 subcode 8 and 10.
Code 8 sets the PV specific IPLB which is retained separately from those set via code 5.
Code 10 is used to unpack the VM into protected memory, verify its integrity and start it.
to machine]
--- MAINTAINERS | 2 + hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 59 +++++++++++++- hw/s390x/ipl.h | 91 ++++++++++++++++++++- hw/s390x/pv.c | 98 +++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 119 +++++++++++++++++++++++++++- include/hw/s390x/pv.h | 55 +++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 1 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 39 ++++++++- target/s390x/kvm-stub.c | 5 ++ target/s390x/kvm.c | 5 ++ target/s390x/kvm_s390x.h | 1 + 14 files changed, 468 insertions(+), 10 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 include/hw/s390x/pv.h
MAINTAINERS +2 -0
@@ -391,6 +391,8 @@ F: target/s390x/machine.c F: target/s390x/sigp.c F: target/s390x/cpu_features*.[ch] F: target/s390x/cpu_models.[ch] +F: hw/s390x/pv.c +F: include/hw/s390x/pv.h F: hw/intc/s390_flic.c F: hw/intc/s390_flic_kvm.c F: include/hw/s390x/s390_flic.h
hw/s390x/Makefile.objs +1 -0
@@ -31,6 +31,7 @@ obj-y += tod-qemu.o obj-$(CONFIG_KVM) += tod-kvm.o obj-$(CONFIG_KVM) += s390-skeys-kvm.o obj-$(CONFIG_KVM) += s390-stattrib-kvm.o +obj-$(CONFIG_KVM) += pv.o obj-y += s390-ccw.o obj-y += ap-device.o obj-y += ap-bridge.o
hw/s390x/ipl.c +56 -3
90 lines not on this page · raw message
hw/s390x/ipl.h +90 -1
160 lines not on this page · raw message
hw/s390x/pv.c new file +98 -0
98 lines not on this page · raw message
hw/s390x/s390-virtio-ccw.c +115 -4
171 lines not on this page · raw message
include/hw/s390x/pv.h new file +55 -0
55 lines not on this page · raw message
include/hw/s390x/s390-virtio-ccw.h +1 -0
@@ -28,6 +28,7 @@ typedef struct S390CcwMachineState {/*< public >*/ bool aes_key_wrap;bool dea_key_wrap; +bool pv;uint8_t loadparm[8 ]; } S390CcwMachineState;
target/s390x/cpu.c +1 -0
@@ -37,6 +37,7 @@#include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY +#include "hw/s390x/pv.h" #include "hw/boards.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h"
target/s390x/cpu_features_def.inc.h +1 -0
@@ -107,6 +107,7 @@ DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility ( DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") +DEF_FEAT (UNPACK ,"unpack" ,STFL ,161 ,"Unpack facility" ) /* Features exposed via SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */DEF_FEAT (SIE_GSLS ,"gsls" ,SCLP_CONF_CHAR ,40 ,"SIE: Guest-storage-limit-suppression facility" )
target/s390x/diag.c +37 -2
@@ -20,6 +20,8 @@#include "sysemu/cpus.h" #include "hw/s390x/ipl.h" #include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/pv.h" +#include "kvm_s390x.h" int handle_diag_288 (CPUS390XState *env,uint64_t r1,uint64_t r3) {
@@ -52,6 +54,10 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)static int diag308_parm_check (CPUS390XState *env,uint64_t r1,uint64_t addr,uintptr_t ra,bool write) { +/* Handled by the Ultravisor */ +if (s390_is_pv ()) { +return 0 ; + }if ((r1 &1 ) || (addr & ~TARGET_PAGE_MASK )) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return -1 ;
@@ -67,6 +73,7 @@ static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64_t addr,void handle_diag_308 (CPUS390XState *env,uint64_t r1,uint64_t r3,uintptr_t ra) { +bool valid;CPUState *cs =env_cpu (env);uint64_t addr = env->regs[r1];uint64_t subcode = env->regs[r3];
@@ -82,6 +89,11 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)return ; } +if (subcode >=DIAG308_PV_SET && !s390_has_feat (S390_FEAT_UNPACK )) { +s390_program_interrupt (env,PGM_SPECIFICATION , ra); +return ; + } +switch (subcode) {case DIAG308_RESET_MOD_CLR :s390_ipl_reset_request (cs,S390_RESET_MODIFIED_CLEAR );
@@ -94,6 +106,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)s390_ipl_reset_request (cs,S390_RESET_REIPL );break ;case DIAG308_SET : +case DIAG308_PV_SET :if (diag308_parm_check (env, r1, addr, ra, false)) {return ; }
@@ -106,7 +119,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)cpu_physical_memory_read (addr, iplb,be32_to_cpu (iplb->len)); -if (!iplb_valid (iplb)) { + valid = subcode ==DIAG308_PV_SET ?iplb_valid_pv (iplb) :iplb_valid (iplb); +if (!valid) { env->regs[r1 +1 ] =DIAG_308_RC_INVALID ; goto out; }
@@ -117,10 +131,15 @@ out:g_free (iplb);return ;case DIAG308_STORE : +case DIAG308_PV_STORE :if (diag308_parm_check (env, r1, addr, ra, true)) {return ; } - iplb =s390_ipl_get_iplb (); +if (subcode ==DIAG308_PV_STORE ) { + iplb =s390_ipl_get_iplb_pv (); + }else { + iplb =s390_ipl_get_iplb (); + }if (iplb) {cpu_physical_memory_write (addr, iplb,be32_to_cpu (iplb->len)); env->regs[r1 +1 ] =DIAG_308_RC_OK ;
@@ -128,6 +147,22 @@ out: env->regs[r1 +1 ] =DIAG_308_RC_NO_CONF ; }return ; +case DIAG308_PV_START : + iplb =s390_ipl_get_iplb_pv (); +if (!iplb) { + env->regs[r1 +1 ] =DIAG_308_RC_NO_PV_CONF ; +return ; + } + +if (kvm_s390_get_hpage_1m ()) { +error_report ("Protected VMs can currently not be backed with " +"huge pages" ); + env->regs[r1 +1 ] =DIAG_308_RC_INVAL_FOR_PV ; +return ; + } + +s390_ipl_reset_request (cs,S390_RESET_PV ); +break ;default :s390_program_interrupt (env,PGM_SPECIFICATION , ra);break ;
target/s390x/kvm-stub.c +5 -0
@@ -39,6 +39,11 @@ int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu)return 0 ; } +int kvm_s390_get_hpage_1m (void ) +{ +return 0 ; +} +int kvm_s390_get_ri (void ) {return 0 ;
target/s390x/kvm.c +5 -0
@@ -321,6 +321,11 @@ void kvm_s390_set_max_pagesize(uint64_t pagesize, Error **errp) cap_hpage_1m =1 ; } +int kvm_s390_get_hpage_1m (void ) +{ +return cap_hpage_1m; +} +static void ccw_machine_class_foreach (ObjectClass *oc,void *opaque) {MachineClass *mc =MACHINE_CLASS (oc);
target/s390x/kvm_s390x.h +1 -0
@@ -23,6 +23,7 @@ void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code);int kvm_s390_set_cpu_state (S390CPU *cpu,uint8_t cpu_state);void kvm_s390_vcpu_interrupt_pre_save (S390CPU *cpu);int kvm_s390_vcpu_interrupt_post_load (S390CPU *cpu); +int kvm_s390_get_hpage_1m (void );int kvm_s390_get_ri (void );int kvm_s390_get_gs (void );int kvm_s390_get_clock (uint8_t *tod_high,uint64_t *tod_clock);
Signature · 1 line
2.25.1
Re: [PATCH v11 03/16] s390x: protvirt: Support unpack facility
Quoted 132 lines · Janosch Frank
The unpack facility provides the means to setup a protected guest. A protected guest cannot be introspected by the hypervisor or any user/administrator of the machine it is running on.
Protected guests are encrypted at rest and need a special boot mechanism via diag308 subcode 8 and 10.
Code 8 sets the PV specific IPLB which is retained separately from those set via code 5.
Code 10 is used to unpack the VM into protected memory, verify its integrity and start it.
Signed-off-by Janosch Frank <[email protected]>Co-developed-by Christian Borntraeger <[email protected]>[Changes
to machine]Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Cornelia Huck <[email protected]>--- MAINTAINERS | 2 + hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 59 +++++++++++++- hw/s390x/ipl.h | 91 ++++++++++++++++++++- hw/s390x/pv.c | 98 +++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 119 +++++++++++++++++++++++++++- include/hw/s390x/pv.h | 55 +++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 1 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 39 ++++++++- target/s390x/kvm-stub.c | 5 ++ target/s390x/kvm.c | 5 ++ target/s390x/kvm_s390x.h | 1 + 14 files changed, 468 insertions(+), 10 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 include/hw/s390x/pv.hMAINTAINERS +2
-0@@ -391,6 +391,8 @@ F: target/s390x/machine.c F: target/s390x/sigp.c F: target/s390x/cpu_features*.[ch] F: target/s390x/cpu_models.[ch] +F: hw/s390x/pv.c +F: include/hw/s390x/pv.h F: hw/intc/s390_flic.c F: hw/intc/s390_flic_kvm.c F: include/hw/s390x/s390_flic.hhw/s390x/Makefile.objs +1
-0@@ -31,6 +31,7 @@ obj-y += tod-qemu.o obj-$(CONFIG_KVM) += tod-kvm.o obj-$(CONFIG_KVM) += s390-skeys-kvm.o obj-$(CONFIG_KVM) += s390-stattrib-kvm.o +obj-$(CONFIG_KVM) += pv.o obj-y += s390-ccw.o obj-y += ap-device.o obj-y += ap-bridge.ohw/s390x/ipl.c +2
-1@@ -1,10 +1,11 @@/* * bootloader support * -* Copyright IBM, Corp. 2012 +* Copyright IBM, Corp. 2012, 2020 * * Authors: * Christian Borntraeger <[email protected]> +* Janosch Frank <[email protected]> * * This work is licensed under the terms of the GNU GPL, version 2 or (at your
* option) any later version. See the COPYING file in the top-level
directory.hw/s390x/ipl.c +22
-2@@ -27,6 +28,7 @@#include "hw/s390x/vfio-ccw.h" #include "hw/s390x/css.h" #include "hw/s390x/ebcdic.h" +#include "hw/s390x/pv.h" #include "ipl.h" #include "qemu/error-report.h" #include "qemu/config-file.h" @@ -566,12 +568,31 @@ void s390_ipl_update_diag308(IplParameterBlock *iplb) {S390IPLState *ipl =get_ipl_device (); - ipl->iplb = *iplb; - ipl->iplb_valid = true; +/* +* The IPLB set and retrieved by subcodes 8/9 is completely +* separate from the one managed via subcodes 5/6. +*/ +if (iplb->pbt ==S390_IPL_TYPE_PV ) { + ipl->iplb_pv = *iplb; + ipl->iplb_valid_pv = true; + }else { + ipl->iplb = *iplb; + ipl->iplb_valid = true; + } ipl->netboot =is_virtio_net_device (iplb);update_machine_ipl_properties (iplb); } +IplParameterBlock *s390_ipl_get_iplb_pv (void ) +{ +S390IPLState *ipl =get_ipl_device (); + +if (!ipl->iplb_valid_pv) { +return NULL ; + } +return &ipl->iplb_pv; +} +IplParameterBlock *s390_ipl_get_iplb (void ) {S390IPLState *ipl = get_ipl_device();hw/s390x/ipl.c +1
-0@@ -660,6 +681,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu)cpu_physical_memory_unmap (addr, len,1 , len); } +int s390_ipl_prepare_pv_header (void )
hw/s390x/ipl.c static void s390_ipl_prepare_qipl(S390CPU *cpu) · line 694
Quoted 10 lines
hw/s390x/ipl.c +10
-0+{ +IplParameterBlock *ipib =s390_ipl_get_iplb_pv (); +IPLBlockPV *ipib_pv = &ipib->pv; +void *hdr =g_malloc (ipib_pv->pv_header_len); +int rc; + +cpu_physical_memory_read (ipib_pv->pv_header_addr, hdr, + ipib_pv->pv_header_len); + rc =s390_pv_set_sec_parms ((uint64_t )hdr, + ipib_pv->pv_header_len);
This causes a compiler issue when building for 32 bit x86 as follows:
/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c: In function 's390_ipl_prepare_pv_header':/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c:659:32: error:
cast from pointer to integer of different size [-Werror=pointer-to-int- cast]
659 | rc = s390_pv_set_sec_parms((uint64_t)hdr,
| ^
- Bruce
Re: [PATCH v11 03/16] s390x: protvirt: Support unpack facility
[...]
Quoted 13 lines
Review
Quoted 11 lines
(quoted diff) +11
-0+int s390_ipl_prepare_pv_header(void) +{ + IplParameterBlock *ipib = s390_ipl_get_iplb_pv(); + IPLBlockPV *ipib_pv = &ipib->pv; + void *hdr = g_malloc(ipib_pv->pv_header_len); + int rc; + + cpu_physical_memory_read(ipib_pv->pv_header_addr, hdr, + ipib_pv->pv_header_len); + rc = s390_pv_set_sec_parms((uint64_t)hdr, + ipib_pv->pv_header_len);This causes a compiler issue when building for 32 bit x86 as follows:
Quoted 7 lines
/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c: In function 's390_ipl_prepare_pv_header':/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c:659:32: error:
cast from pointer to integer of different size [-Werror=pointer-to-int- cast]
659 | rc = s390_pv_set_sec_parms((uint64_t)hdr,
| ^
Interesting. It seems that there is no travis-ci coverage for this case.
I guess we need something like this.
hw/s390x/ipl.c +1 -1
@@ -656,7 +656,7 @@ int s390_ipl_prepare_pv_header(void)cpu_physical_memory_read (ipib_pv->pv_header_addr, hdr, ipib_pv->pv_header_len); - rc =s390_pv_set_sec_parms ((uint64_t )hdr, + rc =s390_pv_set_sec_parms ((uint64_t )(unsigned long ) hdr, ipib_pv->pv_header_len);g_free (hdr);return rc;
Re: [PATCH v11 03/16] s390x: protvirt: Support unpack facility
Quoted 33 lines · Christian Borntraeger
[...]
Quoted 13 lines
Review
Quoted 11 lines
(quoted diff) +11
-0+int s390_ipl_prepare_pv_header(void) +{ + IplParameterBlock *ipib = s390_ipl_get_iplb_pv(); + IPLBlockPV *ipib_pv = &ipib->pv; + void *hdr = g_malloc(ipib_pv->pv_header_len); + int rc; + + cpu_physical_memory_read(ipib_pv->pv_header_addr, hdr, + ipib_pv->pv_header_len); + rc = s390_pv_set_sec_parms((uint64_t)hdr, + ipib_pv->pv_header_len);This causes a compiler issue when building for 32 bit x86 as follows:
Quoted 7 lines
/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c: In function 's390_ipl_prepare_pv_header':/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c:659:32: error:
cast from pointer to integer of different size [-Werror=pointer-to-int- cast]
659 | rc = s390_pv_set_sec_parms((uint64_t)hdr,
| ^Interesting. It seems that there is no travis-ci coverage for this case.
I guess we need something like this.
hw/s390x/ipl.c +0
-0
hw/s390x/ipl.c int s390_ipl_prepare_pv_header(void) · line 660
Quoted 6 lines
hw/s390x/ipl.c +1
-1@@ -656,7 +656,7 @@ int s390_ipl_prepare_pv_header(void)cpu_physical_memory_read (ipib_pv->pv_header_addr, hdr, ipib_pv->pv_header_len); - rc =s390_pv_set_sec_parms ((uint64_t )hdr, + rc =s390_pv_set_sec_parms ((uint64_t )(unsigned long ) hdr, ipib_pv->pv_header_len);
uint_ptr instead of long is probably even better (for Windows).
Re: [PATCH v11 03/16] s390x: protvirt: Support unpack facility
Quoted 37 lines · Christian Borntraeger
Quoted 34 lines · Christian Borntraeger
[...]
Quoted 13 lines
Review
Quoted 11 lines
(quoted diff) +11
-0+int s390_ipl_prepare_pv_header(void) +{ + IplParameterBlock *ipib = s390_ipl_get_iplb_pv(); + IPLBlockPV *ipib_pv = &ipib->pv; + void *hdr = g_malloc(ipib_pv->pv_header_len); + int rc; + + cpu_physical_memory_read(ipib_pv->pv_header_addr, hdr, + ipib_pv->pv_header_len); + rc = s390_pv_set_sec_parms((uint64_t)hdr, + ipib_pv->pv_header_len);This causes a compiler issue when building for 32 bit x86 as follows:
Quoted 7 lines
/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c: In function 's390_ipl_prepare_pv_header':/home/abuild/rpmbuild/BUILD/qemu-4.2.0/hw/s390x/ipl.c:659:32: error:
cast from pointer to integer of different size [-Werror=pointer-to-int- cast]
659 | rc = s390_pv_set_sec_parms((uint64_t)hdr,
| ^Interesting. It seems that there is no travis-ci coverage for this case.
I guess we need something like this.
hw/s390x/ipl.c +0
-0@@ -656,7 +656,7 @@ int s390_ipl_prepare_pv_header(void)
Quoted 8 lines
hw/s390x/ipl.c int s390_ipl_prepare_pv_header(void) · line 660
Quoted 5 lines
hw/s390x/ipl.c +1
-1cpu_physical_memory_read (ipib_pv->pv_header_addr, hdr, ipib_pv->pv_header_len); - rc =s390_pv_set_sec_parms ((uint64_t )hdr, + rc =s390_pv_set_sec_parms ((uint64_t )(unsigned long ) hdr, ipib_pv->pv_header_len);
uint_ptrinstead of long is probably even better (for Windows).
Yeah, I was wondering why you did a double cast instead of uintptr_t. ;-)
I'll send out a revised version soon.
PATCH v12 1/1 s390x: protvirt: Support unpack facility
In reply to Janosch FrankThe unpack facility provides the means to setup a protected guest. A protected guest cannot be introspected by the hypervisor or any user/administrator of the machine it is running on.
Protected guests are encrypted at rest and need a special boot mechanism via diag308 subcode 8 and 10.
Code 8 sets the PV specific IPLB which is retained separately from those set via code 5.
Code 10 is used to unpack the VM into protected memory, verify its integrity and start it.
to machine]
--- MAINTAINERS | 2 + hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 59 +++++++++++++- hw/s390x/ipl.h | 91 ++++++++++++++++++++- hw/s390x/pv.c | 98 +++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 119 +++++++++++++++++++++++++++- include/hw/s390x/pv.h | 55 +++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 1 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 39 ++++++++- target/s390x/kvm-stub.c | 5 ++ target/s390x/kvm.c | 5 ++ target/s390x/kvm_s390x.h | 1 + 14 files changed, 468 insertions(+), 10 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 include/hw/s390x/pv.h
MAINTAINERS +2 -0
@@ -391,6 +391,8 @@ F: target/s390x/machine.c F: target/s390x/sigp.c F: target/s390x/cpu_features*.[ch] F: target/s390x/cpu_models.[ch] +F: hw/s390x/pv.c +F: include/hw/s390x/pv.h F: hw/intc/s390_flic.c F: hw/intc/s390_flic_kvm.c F: include/hw/s390x/s390_flic.h
hw/s390x/Makefile.objs +1 -0
@@ -31,6 +31,7 @@ obj-y += tod-qemu.o obj-$(CONFIG_KVM) += tod-kvm.o obj-$(CONFIG_KVM) += s390-skeys-kvm.o obj-$(CONFIG_KVM) += s390-stattrib-kvm.o +obj-$(CONFIG_KVM) += pv.o obj-y += s390-ccw.o obj-y += ap-device.o obj-y += ap-bridge.o
hw/s390x/ipl.c +56 -3
90 lines not on this page · raw message
hw/s390x/ipl.h +90 -1
160 lines not on this page · raw message
hw/s390x/pv.c new file +98 -0
98 lines not on this page · raw message
hw/s390x/s390-virtio-ccw.c +115 -4
171 lines not on this page · raw message
include/hw/s390x/pv.h new file +55 -0
55 lines not on this page · raw message
include/hw/s390x/s390-virtio-ccw.h +1 -0
@@ -28,6 +28,7 @@ typedef struct S390CcwMachineState {/*< public >*/ bool aes_key_wrap;bool dea_key_wrap; +bool pv;uint8_t loadparm[8 ]; } S390CcwMachineState;
target/s390x/cpu.c +1 -0
@@ -37,6 +37,7 @@#include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY +#include "hw/s390x/pv.h" #include "hw/boards.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h"
target/s390x/cpu_features_def.inc.h +1 -0
@@ -107,6 +107,7 @@ DEF_FEAT(DEFLATE_BASE, "deflate-base", STFL, 151, "Deflate-conversion facility ( DEF_FEAT(VECTOR_PACKED_DECIMAL_ENH, "vxpdeh", STFL, 152, "Vector-Packed-Decimal-Enhancement Facility") DEF_FEAT(MSA_EXT_9, "msa9-base", STFL, 155, "Message-security-assist-extension-9 facility (excluding subfunctions)") DEF_FEAT(ETOKEN, "etoken", STFL, 156, "Etoken facility") +DEF_FEAT (UNPACK ,"unpack" ,STFL ,161 ,"Unpack facility" ) /* Features exposed via SCLP SCCB Byte 80 - 98 (bit numbers relative to byte-80) */DEF_FEAT (SIE_GSLS ,"gsls" ,SCLP_CONF_CHAR ,40 ,"SIE: Guest-storage-limit-suppression facility" )
target/s390x/diag.c +37 -2
@@ -20,6 +20,8 @@#include "sysemu/cpus.h" #include "hw/s390x/ipl.h" #include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/pv.h" +#include "kvm_s390x.h" int handle_diag_288 (CPUS390XState *env,uint64_t r1,uint64_t r3) {
@@ -52,6 +54,10 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)static int diag308_parm_check (CPUS390XState *env,uint64_t r1,uint64_t addr,uintptr_t ra,bool write) { +/* Handled by the Ultravisor */ +if (s390_is_pv ()) { +return 0 ; + }if ((r1 &1 ) || (addr & ~TARGET_PAGE_MASK )) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return -1 ;
@@ -67,6 +73,7 @@ static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64_t addr,void handle_diag_308 (CPUS390XState *env,uint64_t r1,uint64_t r3,uintptr_t ra) { +bool valid;CPUState *cs =env_cpu (env);uint64_t addr = env->regs[r1];uint64_t subcode = env->regs[r3];
@@ -82,6 +89,11 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)return ; } +if (subcode >=DIAG308_PV_SET && !s390_has_feat (S390_FEAT_UNPACK )) { +s390_program_interrupt (env,PGM_SPECIFICATION , ra); +return ; + } +switch (subcode) {case DIAG308_RESET_MOD_CLR :s390_ipl_reset_request (cs,S390_RESET_MODIFIED_CLEAR );
@@ -94,6 +106,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)s390_ipl_reset_request (cs,S390_RESET_REIPL );break ;case DIAG308_SET : +case DIAG308_PV_SET :if (diag308_parm_check (env, r1, addr, ra, false)) {return ; }
@@ -106,7 +119,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)cpu_physical_memory_read (addr, iplb,be32_to_cpu (iplb->len)); -if (!iplb_valid (iplb)) { + valid = subcode ==DIAG308_PV_SET ?iplb_valid_pv (iplb) :iplb_valid (iplb); +if (!valid) { env->regs[r1 +1 ] =DIAG_308_RC_INVALID ; goto out; }
@@ -117,10 +131,15 @@ out:g_free (iplb);return ;case DIAG308_STORE : +case DIAG308_PV_STORE :if (diag308_parm_check (env, r1, addr, ra, true)) {return ; } - iplb =s390_ipl_get_iplb (); +if (subcode ==DIAG308_PV_STORE ) { + iplb =s390_ipl_get_iplb_pv (); + }else { + iplb =s390_ipl_get_iplb (); + }if (iplb) {cpu_physical_memory_write (addr, iplb,be32_to_cpu (iplb->len)); env->regs[r1 +1 ] =DIAG_308_RC_OK ;
@@ -128,6 +147,22 @@ out: env->regs[r1 +1 ] =DIAG_308_RC_NO_CONF ; }return ; +case DIAG308_PV_START : + iplb =s390_ipl_get_iplb_pv (); +if (!iplb) { + env->regs[r1 +1 ] =DIAG_308_RC_NO_PV_CONF ; +return ; + } + +if (kvm_s390_get_hpage_1m ()) { +error_report ("Protected VMs can currently not be backed with " +"huge pages" ); + env->regs[r1 +1 ] =DIAG_308_RC_INVAL_FOR_PV ; +return ; + } + +s390_ipl_reset_request (cs,S390_RESET_PV ); +break ;default :s390_program_interrupt (env,PGM_SPECIFICATION , ra);break ;
target/s390x/kvm-stub.c +5 -0
@@ -39,6 +39,11 @@ int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu)return 0 ; } +int kvm_s390_get_hpage_1m (void ) +{ +return 0 ; +} +int kvm_s390_get_ri (void ) {return 0 ;
target/s390x/kvm.c +5 -0
@@ -321,6 +321,11 @@ void kvm_s390_set_max_pagesize(uint64_t pagesize, Error **errp) cap_hpage_1m =1 ; } +int kvm_s390_get_hpage_1m (void ) +{ +return cap_hpage_1m; +} +static void ccw_machine_class_foreach (ObjectClass *oc,void *opaque) {MachineClass *mc =MACHINE_CLASS (oc);
target/s390x/kvm_s390x.h +1 -0
@@ -23,6 +23,7 @@ void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code);int kvm_s390_set_cpu_state (S390CPU *cpu,uint8_t cpu_state);void kvm_s390_vcpu_interrupt_pre_save (S390CPU *cpu);int kvm_s390_vcpu_interrupt_post_load (S390CPU *cpu); +int kvm_s390_get_hpage_1m (void );int kvm_s390_get_ri (void );int kvm_s390_get_gs (void );int kvm_s390_get_clock (uint8_t *tod_high,uint64_t *tod_clock);
Signature · 1 line
2.25.1
Re: [PATCH v12] s390x: protvirt: Support unpack facility
Quoted 37 lines · On Mon, 23 Mar 2020 04:36:06 -0400 Janosch Frank <[email protected]> wrote:
The unpack facility provides the means to setup a protected guest. A protected guest cannot be introspected by the hypervisor or any user/administrator of the machine it is running on.
Protected guests are encrypted at rest and need a special boot mechanism via diag308 subcode 8 and 10.
Code 8 sets the PV specific IPLB which is retained separately from those set via code 5.
Code 10 is used to unpack the VM into protected memory, verify its integrity and start it.
Signed-off-by Janosch Frank <[email protected]>Co-developed-by Christian Borntraeger <[email protected]> [Changesto machine]
Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Cornelia Huck <[email protected]>--- MAINTAINERS | 2 + hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 59 +++++++++++++- hw/s390x/ipl.h | 91 ++++++++++++++++++++- hw/s390x/pv.c | 98 +++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 119 +++++++++++++++++++++++++++- include/hw/s390x/pv.h | 55 +++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 1 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 39 ++++++++- target/s390x/kvm-stub.c | 5 ++ target/s390x/kvm.c | 5 ++ target/s390x/kvm_s390x.h | 1 + 14 files changed, 468 insertions(+), 10 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 include/hw/s390x/pv.h
(...)
Quoted 5 lines
hw/s390x/pv.c new file +0
-0
(...)
Quoted 28 lines
hw/s390x/pv.c new file +28
-0+int s390_pv_set_sec_parms (uint64_t origin,uint64_t length) +{ +struct kvm_s390_pv_sec_parm args = { + .origin = origin, + .length = length, + }; + +return s390_pv_cmd (KVM_PV_VM_SET_SEC_PARMS , &args); +} + +/* +* Called for each component in the SE type IPL parameter block 0. +*/ +int s390_pv_unpack (uint64_t addr,uint64_t size,uint64_t tweak) +{ +struct kvm_s390_pv_unp args = { + .addr = addr, + .size = size, + .tweak = tweak, + }; + +return s390_pv_cmd (KVM_PV_VM_UNPACK , &args); +} + +void s390_pv_perf_clear_reset (void ) +{ +s390_pv_cmd_exit (KVM_PV_VM_PREP_RESET ,NULL ); +}
hw/s390x/pv.c line 98
Quoted 10 lines
hw/s390x/pv.c new file +10
-0+ +int s390_pv_verify (void ) +{ +return s390_pv_cmd (KVM_PV_VM_VERIFY ,NULL ); +} + +void s390_pv_unshare (void ) +{ +s390_pv_cmd_exit (KVM_PV_VM_UNSHARE_ALL ,NULL ); +}
Note that the dummy headers update in this series still had the KVM_PV_VM_ defines, while the real headers update pulled in the KVM_PV_ defines that went upstream. I fixed this up in s390-next.
(...)
PATCH v11 4/16 s390x: protvirt: Add migration blocker
In reply to Janosch FrankMigration is not yet supported.
--- hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
hw/s390x/s390-virtio-ccw.c +18 -0
@@ -44,6 +44,9 @@#include "sysemu/sysemu.h" #include "hw/s390x/pv.h" #include <linux/kvm.h> +#include "migration/blocker.h" + +static Error *pv_mig_blocker;S390CPU *s390_cpu_addr2state (uint16_t cpu_addr) {
@@ -323,15 +326,30 @@ static void s390_machine_unprotect(S390CcwMachineState *ms) {s390_pv_vm_disable (); ms->pv = false; +migrate_del_blocker (pv_mig_blocker); +error_free_or_abort (&pv_mig_blocker); }static int s390_machine_protect (S390CcwMachineState *ms) { +Error *local_err =NULL ;int rc; +error_setg (&pv_mig_blocker, +"protected VMs are currently not migrateable." ); + rc =migrate_add_blocker (pv_mig_blocker, &local_err); +if (rc) { +error_report_err (local_err); +error_free_or_abort (&pv_mig_blocker); +return rc; + } +/* Create SE VM */ rc =s390_pv_vm_enable ();if (rc) { +error_report_err (local_err); +migrate_del_blocker (pv_mig_blocker); +error_free_or_abort (&pv_mig_blocker);return rc; }
Signature · 1 line
2.25.1
PATCH v11 5/16 s390x: protvirt: Inhibit balloon when switching to protected mode
In reply to Janosch FrankBallooning in protected VMs can only be done when the guest shares the pages it gives to the host. If pages are not shared, the integrity checks will fail once those pages have been altered and are given back to the guest.
As we currently do not yet have a solution for this we will continue like this:
1. We block ballooning now in QEMU (with this patch).
2. Later we will provide a change to virtio that removes the blocker and adds VIRTIO_F_IOMMU_PLATFORM automatically by QEMU when doing the protvirt switch. This is OK, as the balloon driver in Linux (the only supported guest) will refuse to work with the IOMMU_PLATFORM feature bit set.
3. Later, we can fix the guest balloon driver to accept the IOMMU feature bit and correctly exercise sharing and unsharing of balloon pages.
--- hw/s390x/s390-virtio-ccw.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
hw/s390x/s390-virtio-ccw.c +11 -0
@@ -42,6 +42,7 @@#include "hw/qdev-properties.h" #include "hw/s390x/tod.h" #include "sysemu/sysemu.h" +#include "sysemu/balloon.h" #include "hw/s390x/pv.h" #include <linux/kvm.h> #include "migration/blocker.h"
@@ -328,6 +329,7 @@ static void s390_machine_unprotect(S390CcwMachineState *ms) ms->pv = false;migrate_del_blocker (pv_mig_blocker);error_free_or_abort (&pv_mig_blocker); +qemu_balloon_inhibit (false); }static int s390_machine_protect (S390CcwMachineState *ms)
@@ -335,10 +337,18 @@ static int s390_machine_protect(S390CcwMachineState *ms)Error *local_err =NULL ;int rc; +/* +* Ballooning on protected VMs needs support in the guest for +* sharing and unsharing balloon pages. Block ballooning for +* now, until we have a solution to make at least Linux guests +* either support it or fail gracefully. +*/ +qemu_balloon_inhibit (true);error_setg (&pv_mig_blocker,"protected VMs are currently not migrateable." ); rc =migrate_add_blocker (pv_mig_blocker, &local_err);if (rc) { +qemu_balloon_inhibit (false);error_report_err (local_err);error_free_or_abort (&pv_mig_blocker);return rc;
@@ -347,6 +357,7 @@ static int s390_machine_protect(S390CcwMachineState *ms)/* Create SE VM */ rc =s390_pv_vm_enable ();if (rc) { +qemu_balloon_inhibit (false);error_report_err (local_err);migrate_del_blocker (pv_mig_blocker);error_free_or_abort (&pv_mig_blocker);
Signature · 1 line
2.25.1
PATCH v11 6/16 s390x: protvirt: KVM intercept changes
In reply to Janosch FrankProtected VMs no longer intercept with code 4 for an instruction interception. Instead they have codes 104 and 108 for protected instruction interception and protected instruction notification respectively.
The 104 mirrors the 4 interception.
The 108 is a notification interception to let KVM and QEMU know that something changed and we need to update tracking information or perform specific tasks. It's currently taken for the following instructions:
* spx (To inform about the changed prefix location)
* sclp (On incorrect SCCB values, so we can inject a IRQ)
* sigp (All but "stop and store status")
* diag308 (Subcodes 0/1)
Of these exits only sclp errors, state changing sigps and diag308 will reach QEMU. QEMU will do its parts of the job, while the ultravisor has done the instruction part of the job.
--- target/s390x/kvm.c | 4 ++++ 1 file changed, 4 insertions(+)
target/s390x/kvm.c +4 -0
@@ -115,6 +115,8 @@#define ICPT_CPU_STOP 0x28#define ICPT_OPEREXC 0x2c#define ICPT_IO 0x40 +#define ICPT_PV_INSTR 0x68 +#define ICPT_PV_INSTR_NOTIFICATION 0x6c#define NR_LOCAL_IRQS 32/*
@@ -1698,6 +1700,8 @@ static int handle_intercept(S390CPU *cpu) (long)cs->kvm_run->psw_addr);switch (icpt_code) {case ICPT_INSTRUCTION : +case ICPT_PV_INSTR : +case ICPT_PV_INSTR_NOTIFICATION : r =handle_instruction (cpu, run);break ;case ICPT_PROGRAM :
Signature · 1 line
2.25.1
PATCH v11 7/16 s390x: Add SIDA memory ops
In reply to Janosch FrankProtected guests save the instruction control blocks in the SIDA instead of QEMU/KVM directly accessing the guest's memory.
Let's introduce new functions to access the SIDA.
The memops for doing so are available with KVM_CAP_S390_PROTECTED, so let's check for that.
--- target/s390x/cpu.h | 7 ++++++- target/s390x/kvm.c | 26 ++++++++++++++++++++++++++ target/s390x/kvm_s390x.h | 2 ++ target/s390x/mmu_helper.c | 14 ++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-)
target/s390x/cpu.h +6 -1
@@ -823,7 +823,12 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,#define s390_cpu_virt_mem_check_write (cpu, laddr, ar, len) \ s390_cpu_virt_mem_rw(cpu, laddr, ar, NULL, len, true)void s390_cpu_virt_mem_handle_exc (S390CPU *cpu,uintptr_t ra); - +int s390_cpu_pv_mem_rw (S390CPU *cpu,unsigned int offset,void *hostbuf, +int len,bool is_write); +#define s390_cpu_pv_mem_read (cpu, offset, dest, len) \ + s390_cpu_pv_mem_rw(cpu, offset, dest, len, false) +#define s390_cpu_pv_mem_write (cpu, offset, dest, len) \ + s390_cpu_pv_mem_rw(cpu, offset, dest, len, true)/* sigp.c */ int s390_cpu_restart (S390CPU *cpu);
target/s390x/kvm.c +26 -0
@@ -154,6 +154,7 @@ static int cap_ri;static int cap_gs;static int cap_hpage_1m;static int cap_vcpu_resets; +static int cap_protected;static int active_cmma;
@@ -351,6 +352,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_mem_op =kvm_check_extension (s,KVM_CAP_S390_MEM_OP ); cap_s390_irq =kvm_check_extension (s,KVM_CAP_S390_INJECT_IRQ ); cap_vcpu_resets =kvm_check_extension (s,KVM_CAP_S390_VCPU_RESETS ); + cap_protected =kvm_check_extension (s,KVM_CAP_S390_PROTECTED );if (!kvm_check_extension (s,KVM_CAP_S390_GMAP ) || !kvm_check_extension (s,KVM_CAP_S390_COW )) {
@@ -851,6 +853,30 @@ int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf,return ret; } +int kvm_s390_mem_op_pv (S390CPU *cpu,uint64_t offset,void *hostbuf, +int len,bool is_write) +{ +struct kvm_s390_mem_op mem_op = { + .sida_offset = offset, + .size = len, + .op = is_write ?KVM_S390_MEMOP_SIDA_WRITE + :KVM_S390_MEMOP_SIDA_READ , + .buf = (uint64_t )hostbuf, + }; +int ret; + +if (!cap_mem_op || !cap_protected) { +return -ENOSYS ; + } + + ret =kvm_vcpu_ioctl (CPU (cpu),KVM_S390_MEM_OP , &mem_op); +if (ret <0 ) { +error_report ("KVM_S390_MEM_OP failed: %s" ,strerror (-ret)); +abort (); + } +return ret; +} +/* * Legacy layout for s390: * Older S390 KVM requires the topmost vma of the RAM to be
target/s390x/kvm_s390x.h +2 -0
@@ -19,6 +19,8 @@ void kvm_s390_vcpu_interrupt(S390CPU *cpu, struct kvm_s390_irq *irq);void kvm_s390_access_exception (S390CPU *cpu,uint16_t code,uint64_t te_code);int kvm_s390_mem_op (S390CPU *cpu,vaddr addr,uint8_t ar,void *hostbuf,int len,bool is_write); +int kvm_s390_mem_op_pv (S390CPU *cpu,vaddr addr,void *hostbuf,int len, +bool is_write);void kvm_s390_program_interrupt (S390CPU *cpu,uint16_t code);int kvm_s390_set_cpu_state (S390CPU *cpu,uint8_t cpu_state);void kvm_s390_vcpu_interrupt_pre_save (S390CPU *cpu);
target/s390x/mmu_helper.c +14 -0
@@ -474,6 +474,20 @@ static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages,return 0 ; } +int s390_cpu_pv_mem_rw (S390CPU *cpu,unsigned int offset,void *hostbuf, +int len,bool is_write) +{ +int ret; + +if (kvm_enabled ()) { + ret =kvm_s390_mem_op_pv (cpu, offset, hostbuf, len, is_write); + }else { +/* Protected Virtualization is a KVM/Hardware only feature */ +g_assert_not_reached (); + } +return ret; +} +/** * s390_cpu_virt_mem_rw: * @laddr: the logical start address
Signature · 1 line
2.25.1
PATCH v11 8/16 s390x: protvirt: Move STSI data over SIDAD
In reply to Janosch FrankFor protected guests, we need to put the STSI emulation results into the SIDA, so SIE will write them into the guest at the next entry.
--- target/s390x/kvm.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
target/s390x/kvm.c +9 -2
@@ -50,6 +50,7 @@#include "exec/memattrs.h" #include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/s390-virtio-hcall.h" +#include "hw/s390x/pv.h" #ifndef DEBUG_KVM #define DEBUG_KVM 0
@@ -1806,7 +1807,9 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar)SysIB_322 sysib;int del; -if (s390_cpu_virt_mem_read (cpu, addr, ar, &sysib,sizeof (sysib))) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_read (cpu,0 , &sysib,sizeof (sysib)); + }else if (s390_cpu_virt_mem_read (cpu, addr, ar, &sysib,sizeof (sysib))) {return ; }/* Shift the stack of Extended Names to prepare for our own data */
@@ -1846,7 +1849,11 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar)/* Insert UUID */ memcpy (sysib.vm[0 ].uuid, &qemu_uuid,sizeof (sysib.vm[0 ].uuid)); -s390_cpu_virt_mem_write (cpu, addr, ar, &sysib,sizeof (sysib)); +if (s390_is_pv ()) { +s390_cpu_pv_mem_write (cpu,0 , &sysib,sizeof (sysib)); + }else { +s390_cpu_virt_mem_write (cpu, addr, ar, &sysib,sizeof (sysib)); + } }static int handle_stsi (S390CPU *cpu)
Signature · 1 line
2.25.1
PATCH v11 9/16 s390x: protvirt: SCLP interpretation
In reply to Janosch FrankSCLP for a protected guest is done over the SIDAD, so we need to use the s390_cpu_pv_mem_* functions to access the SIDAD instead of guest memory when reading/writing SCBs.
To not confuse the sclp emulation, we set 0x4000 as the SCCB address, since the function that injects the sclp external interrupt would reject a zero sccb address.
--- hw/s390x/sclp.c | 56 +++++++++++++++++++++++++++++++++-------- include/hw/s390x/sclp.h | 2 ++ target/s390x/kvm.c | 25 ++++++++++++++---- 3 files changed, 67 insertions(+), 16 deletions(-)
hw/s390x/sclp.c +45 -11
@@ -33,6 +33,22 @@ static inline SCLPDevice *get_sclp_device(void)return sclp; } +static inline bool sclp_command_code_valid (uint32_t code) +{ +switch (code &SCLP_CMD_CODE_MASK ) { +case SCLP_CMDW_READ_SCP_INFO : +case SCLP_CMDW_READ_SCP_INFO_FORCED : +case SCLP_CMDW_READ_CPU_INFO : +case SCLP_CMDW_CONFIGURE_IOA : +case SCLP_CMDW_DECONFIGURE_IOA : +case SCLP_CMD_READ_EVENT_DATA : +case SCLP_CMD_WRITE_EVENT_DATA : +case SCLP_CMD_WRITE_EVENT_MASK : +return true; + } +return false; +} +static void prepare_cpu_entries (SCLPDevice *sclp,CPUEntry *entry,int *count) {MachineState *ms =MACHINE (qdev_get_machine ());
@@ -193,6 +209,34 @@ static void sclp_execute(SCLPDevice *sclp, SCCB *sccb, uint32_t code) } } +/* +* We only need the address to have something valid for the +* service_interrupt call. +*/ +#define SCLP_PV_DUMMY_ADDR 0x4000 +int sclp_service_call_protected (CPUS390XState *env,uint64_t sccb, +uint32_t code) +{ +SCLPDevice *sclp =get_sclp_device (); +SCLPDeviceClass *sclp_c =SCLP_GET_CLASS (sclp); +SCCB work_sccb; +hwaddr sccb_len =sizeof (SCCB ); + +s390_cpu_pv_mem_read (env_archcpu (env),0 , &work_sccb, sccb_len); + +if (!sclp_command_code_valid (code)) { + work_sccb.h.response_code =cpu_to_be16 (SCLP_RC_INVALID_SCLP_COMMAND ); + goto out_write; + } + + sclp_c->execute (sclp, &work_sccb, code); +out_write: +s390_cpu_pv_mem_write (env_archcpu (env),0 , &work_sccb, +be16_to_cpu (work_sccb.h.length)); + sclp_c->service_interrupt (sclp,SCLP_PV_DUMMY_ADDR ); +return 0 ; +} +int sclp_service_call (CPUS390XState *env,uint64_t sccb,uint32_t code) {SCLPDevice *sclp =get_sclp_device ();
@@ -225,17 +269,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code)return -PGM_SPECIFICATION ; } -switch (code &SCLP_CMD_CODE_MASK ) { -case SCLP_CMDW_READ_SCP_INFO : -case SCLP_CMDW_READ_SCP_INFO_FORCED : -case SCLP_CMDW_READ_CPU_INFO : -case SCLP_CMDW_CONFIGURE_IOA : -case SCLP_CMDW_DECONFIGURE_IOA : -case SCLP_CMD_READ_EVENT_DATA : -case SCLP_CMD_WRITE_EVENT_DATA : -case SCLP_CMD_WRITE_EVENT_MASK : -break ; -default : +if (!sclp_command_code_valid (code)) { work_sccb.h.response_code =cpu_to_be16 (SCLP_RC_INVALID_SCLP_COMMAND ); goto out_write; }
include/hw/s390x/sclp.h +2 -0
@@ -217,5 +217,7 @@ void s390_sclp_init(void);void sclp_service_interrupt (uint32_t sccb);void raise_irq_cpu_hotplug (void );int sclp_service_call (CPUS390XState *env,uint64_t sccb,uint32_t code); +int sclp_service_call_protected (CPUS390XState *env,uint64_t sccb, +uint32_t code);#endif
target/s390x/kvm.c +20 -5
@@ -1233,12 +1233,27 @@ static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, sccb = env->regs[ipbh0 &0xf ]; code = env->regs[(ipbh0 &0xf0 ) >>4 ]; - r =sclp_service_call (env, sccb, code); -if (r <0 ) { -kvm_s390_program_interrupt (cpu, -r); -return ; +switch (run->s390_sieic.icptcode) { +case ICPT_PV_INSTR_NOTIFICATION : +g_assert (s390_is_pv ()); +/* The notification intercepts are currently handled by KVM */ +error_report ("unexpected SCLP PV notification" ); +exit (1 ); +break ; +case ICPT_PV_INSTR : +g_assert (s390_is_pv ()); +sclp_service_call_protected (env, sccb, code); +/* Setting the CC is done by the Ultravisor. */ +break ; +case ICPT_INSTRUCTION : +g_assert (!s390_is_pv ()); + r =sclp_service_call (env, sccb, code); +if (r <0 ) { +kvm_s390_program_interrupt (cpu, -r); +return ; + } +setcc (cpu, r); } -setcc (cpu, r); }static int handle_b2 (S390CPU *cpu,struct kvm_run *run,uint8_t ipa1)
Signature · 1 line
2.25.1
Re: [PATCH v11 09/16] s390x: protvirt: SCLP interpretation
Quoted 4 lines · Janosch Frank
SCLP for a protected guest is done over the SIDAD, so we need to use the s390_cpu_pv_mem_* functions to access the SIDAD instead of guest memory when reading/writing SCBs.
Quoted 8 lines
To not confuse the sclp emulation, we set
0x4000as the SCCB address, since the function that injects the sclp external interrupt would reject a zero sccb address.Signed-off-by Janosch Frank <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Cornelia Huck <[email protected]>
series looks good to me.
Quoted 137 lines
--- hw/s390x/sclp.c | 56 +++++++++++++++++++++++++++++++++-------- include/hw/s390x/sclp.h | 2 ++ target/s390x/kvm.c | 25 ++++++++++++++---- 3 files changed, 67 insertions(+), 16 deletions(-)hw/s390x/sclp.c +45
-11@@ -33,6 +33,22 @@ static inline SCLPDevice *get_sclp_device(void)return sclp; } +static inline bool sclp_command_code_valid (uint32_t code) +{ +switch (code &SCLP_CMD_CODE_MASK ) { +case SCLP_CMDW_READ_SCP_INFO : +case SCLP_CMDW_READ_SCP_INFO_FORCED : +case SCLP_CMDW_READ_CPU_INFO : +case SCLP_CMDW_CONFIGURE_IOA : +case SCLP_CMDW_DECONFIGURE_IOA : +case SCLP_CMD_READ_EVENT_DATA : +case SCLP_CMD_WRITE_EVENT_DATA : +case SCLP_CMD_WRITE_EVENT_MASK : +return true; + } +return false; +} +static void prepare_cpu_entries (SCLPDevice *sclp,CPUEntry *entry,int *count) {MachineState *ms =MACHINE (qdev_get_machine ());@@ -193,6 +209,34 @@ static void sclp_execute(SCLPDevice *sclp, SCCB *sccb, uint32_t code) } } +/* +* We only need the address to have something valid for the +* service_interrupt call. +*/ +#define SCLP_PV_DUMMY_ADDR 0x4000 +int sclp_service_call_protected (CPUS390XState *env,uint64_t sccb, +uint32_t code) +{ +SCLPDevice *sclp =get_sclp_device (); +SCLPDeviceClass *sclp_c =SCLP_GET_CLASS (sclp); +SCCB work_sccb; +hwaddr sccb_len =sizeof (SCCB ); + +s390_cpu_pv_mem_read (env_archcpu (env),0 , &work_sccb, sccb_len); + +if (!sclp_command_code_valid (code)) { + work_sccb.h.response_code =cpu_to_be16 (SCLP_RC_INVALID_SCLP_COMMAND ); + goto out_write; + } + + sclp_c->execute (sclp, &work_sccb, code); +out_write: +s390_cpu_pv_mem_write (env_archcpu (env),0 , &work_sccb, +be16_to_cpu (work_sccb.h.length)); + sclp_c->service_interrupt (sclp,SCLP_PV_DUMMY_ADDR ); +return 0 ; +} +int sclp_service_call (CPUS390XState *env,uint64_t sccb,uint32_t code) {SCLPDevice *sclp =get_sclp_device ();@@ -225,17 +269,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code)return -PGM_SPECIFICATION ; } -switch (code &SCLP_CMD_CODE_MASK ) { -case SCLP_CMDW_READ_SCP_INFO : -case SCLP_CMDW_READ_SCP_INFO_FORCED : -case SCLP_CMDW_READ_CPU_INFO : -case SCLP_CMDW_CONFIGURE_IOA : -case SCLP_CMDW_DECONFIGURE_IOA : -case SCLP_CMD_READ_EVENT_DATA : -case SCLP_CMD_WRITE_EVENT_DATA : -case SCLP_CMD_WRITE_EVENT_MASK : -break ; -default : +if (!sclp_command_code_valid (code)) { work_sccb.h.response_code =cpu_to_be16 (SCLP_RC_INVALID_SCLP_COMMAND ); goto out_write; }include/hw/s390x/sclp.h +2
-0@@ -217,5 +217,7 @@ void s390_sclp_init(void);void sclp_service_interrupt (uint32_t sccb);void raise_irq_cpu_hotplug (void );int sclp_service_call (CPUS390XState *env,uint64_t sccb,uint32_t code); +int sclp_service_call_protected (CPUS390XState *env,uint64_t sccb, +uint32_t code);#endif target/s390x/kvm.c +20
-5@@ -1233,12 +1233,27 @@ static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, sccb = env->regs[ipbh0 &0xf ]; code = env->regs[(ipbh0 &0xf0 ) >>4 ]; - r =sclp_service_call (env, sccb, code); -if (r <0 ) { -kvm_s390_program_interrupt (cpu, -r); -return ; +switch (run->s390_sieic.icptcode) { +case ICPT_PV_INSTR_NOTIFICATION : +g_assert (s390_is_pv ()); +/* The notification intercepts are currently handled by KVM */ +error_report ("unexpected SCLP PV notification" ); +exit (1 ); +break ; +case ICPT_PV_INSTR : +g_assert (s390_is_pv ()); +sclp_service_call_protected (env, sccb, code); +/* Setting the CC is done by the Ultravisor. */ +break ; +case ICPT_INSTRUCTION : +g_assert (!s390_is_pv ()); + r =sclp_service_call (env, sccb, code); +if (r <0 ) { +kvm_s390_program_interrupt (cpu, -r); +return ; + } +setcc (cpu, r); } -setcc (cpu, r); }static int handle_b2 (S390CPU *cpu,struct kvm_run *run,uint8_t ipa1)
PATCH v11 10/16 s390x: protvirt: Set guest IPL PSW
In reply to Janosch FrankHandling of CPU reset and setting of the IPL psw from guest storage at offset 0 is done by a Ultravisor call. Let's only fetch it if necessary.
--- target/s390x/cpu.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
target/s390x/cpu.c +17 -9
@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs)static void s390_cpu_load_normal (CPUState *s) {S390CPU *cpu =S390_CPU (s); -uint64_t spsw =ldq_phys (s->as,0 ); - - cpu->env.psw.mask = spsw &PSW_MASK_SHORT_CTRL ; -/* -* Invert short psw indication, so SIE will report a specification -* exception if it was not set. -*/ - cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; - cpu->env.psw.addr = spsw &PSW_MASK_SHORT_ADDR ; +uint64_t spsw; +if (!s390_is_pv ()) { + spsw =ldq_phys (s->as,0 ); + cpu->env.psw.mask = spsw &PSW_MASK_SHORT_CTRL ; +/* +* Invert short psw indication, so SIE will report a specification +* exception if it was not set. +*/ + cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; + cpu->env.psw.addr = spsw &PSW_MASK_SHORT_ADDR ; + }else { +/* +* Firmware requires us to set the load state before we set +* the cpu to operating on protected guests. +*/ +s390_cpu_set_state (S390_CPU_STATE_LOAD , cpu); + }s390_cpu_set_state (S390_CPU_STATE_OPERATING , cpu); }#endif
Signature · 1 line
2.25.1
Re: [PATCH v11 10/16] s390x: protvirt: Set guest IPL PSW
Hi,
(old patch committed as 59181010a2ff82c3a97e9b5768ee87c38e4815f1)
Quoted 38 lines · Janosch Frank
Handling of CPU reset and setting of the IPL psw from guest storage at offset 0 is done by a Ultravisor call. Let's only fetch it if necessary.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Cornelia Huck <[email protected]>--- target/s390x/cpu.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)target/s390x/cpu.c +6
-9@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs)static void s390_cpu_load_normal (CPUState *s) {S390CPU *cpu =S390_CPU (s); -uint64_t spsw =ldq_phys (s->as,0 ); - - cpu->env.psw.mask = spsw &PSW_MASK_SHORT_CTRL ; -/* -* Invert short psw indication, so SIE will report a specification -* exception if it was not set. -*/ - cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; - cpu->env.psw.addr = spsw &PSW_MASK_SHORT_ADDR ; +uint64_t spsw; +if (!s390_is_pv ()) { + spsw =ldq_phys (s->as,0 ); + cpu->env.psw.mask = spsw &PSW_MASK_SHORT_CTRL ; +/* +* Invert short psw indication, so SIE will report a specification
target/s390x/cpu.c static bool s390_cpu_has_work(CPUState *cs) · line 96
Quoted 10 lines
target/s390x/cpu.c +10
-0+* exception if it was not set. +*/ + cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; + cpu->env.psw.addr = spsw &PSW_MASK_SHORT_ADDR ; + }else { +/* +* Firmware requires us to set the load state before we set +* the cpu to operating on protected guests. +*/ +s390_cpu_set_state (S390_CPU_STATE_LOAD , cpu);
S390_CPU_STATE_LOAD is overwritten the line above, is that deliberate?
Quoted 4 lines
target/s390x/cpu.c +1
-0+ }s390_cpu_set_state (S390_CPU_STATE_OPERATING , cpu); }#endif
Re: [PATCH v11 10/16] s390x: protvirt: Set guest IPL PSW
Quoted 47 lines · Philippe Mathieu-Daudé
Hi,
(old patch committed as
59181010a2ff82c3a97e9b5768ee87c38e4815f1)Quoted 42 lines · Janosch Frank
Handling of CPU reset and setting of the IPL psw from guest storage at offset 0 is done by a Ultravisor call. Let's only fetch it if necessary.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Cornelia Huck <[email protected]>--- target/s390x/cpu.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)target/s390x/cpu.c +10
-9@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs)static void s390_cpu_load_normal (CPUState *s) {S390CPU *cpu =S390_CPU (s); -uint64_t spsw =ldq_phys (s->as,0 ); - - cpu->env.psw.mask = spsw &PSW_MASK_SHORT_CTRL ; -/* -* Invert short psw indication, so SIE will report a specification -* exception if it was not set. -*/ - cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; - cpu->env.psw.addr = spsw &PSW_MASK_SHORT_ADDR ; +uint64_t spsw; +if (!s390_is_pv ()) { + spsw =ldq_phys (s->as,0 ); + cpu->env.psw.mask = spsw &PSW_MASK_SHORT_CTRL ; +/* +* Invert short psw indication, so SIE will report a specification +* exception if it was not set. +*/ + cpu->env.psw.mask ^=PSW_MASK_SHORTPSW ; + cpu->env.psw.addr = spsw &PSW_MASK_SHORT_ADDR ;
Quoted 8 lines
target/s390x/cpu.c static bool s390_cpu_has_work(CPUState *cs) · line 96
Quoted 6 lines
target/s390x/cpu.c +6
-0+ }else { +/* +* Firmware requires us to set the load state before we set +* the cpu to operating on protected guests. +*/ +s390_cpu_set_state (S390_CPU_STATE_LOAD , cpu);
S390_CPU_STATE_LOADis overwritten the line above, is that deliberate?
Yes.
LOAD is a superset of OPERATING and doing a second OPERATING is therefore a NOP.
The load isn't a real state in KVM, we only use it for the UV call.
So we have to do a second change into OPERATING for KVM to track the state if we were in stopped state.
Re: [PATCH v11 10/16] s390x: protvirt: Set guest IPL PSW
Quoted 56 lines · Janosch Frank
Quoted 47 lines · Philippe Mathieu-Daudé
Hi,
(old patch committed as
59181010a2ff82c3a97e9b5768ee87c38e4815f1)Quoted 42 lines · Janosch Frank
Handling of CPU reset and setting of the IPL psw from guest storage at offset 0 is done by a Ultravisor call. Let's only fetch it if necessary.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Cornelia Huck <[email protected]>---
target/s390x/cpu.c| 26 +++++++++++++++++---------1 file changed, 17 insertions(+), 9 deletions(-)target/s390x/cpu.c +6
-9@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs) static void s390_cpu_load_normal(CPUState *s) { S390CPU *cpu = S390_CPU(s); - uint64_t spsw = ldq_phys(s->as, 0); - - cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL; - /* - * Invert short psw indication, so SIE will report a specification - * exception if it was not set. - */ - cpu->env.psw.mask ^= PSW_MASK_SHORTPSW; - cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR; + uint64_t spsw; + if (!s390_is_pv()) { + spsw = ldq_phys(s->as, 0); + cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL; + /* +* Invert short psw indication, so SIE will report a specification
+ * exception if it was not set.
+ */
+cpu->env.psw.mask^=PSW_MASK_SHORTPSW; +cpu->env.psw.addr= spsw &PSW_MASK_SHORT_ADDR;Quoted 8 lines
Quoted 6 lines
+ } else {
+ /*
+ * Firmware requires us to set the load state before we set + * the cpu to operating on protected guests.
+ */
+s390_cpu_set_state(S390_CPU_STATE_LOAD, cpu);
S390_CPU_STATE_LOADis overwritten the line above, is that deliberate?
Quoted 5 lines
Yes.
LOAD is a superset of OPERATING and doing a second OPERATING is therefore a NOP.The load isn't a real state in KVM, we only use it for the UV call.
So we have to do a second change into OPERATING for KVM to track the state if we were in stopped state.
Oh OK now I see the KVM_SET_MP_STATE calls. Since it was not obvious to me, could the comment be updated to clarify that? (no obligation, feel free to disregard if you find it clear enough for you). Thanks for the quick head-up!
Phil.
Re: [PATCH v11 10/16] s390x: protvirt: Set guest IPL PSW
Quoted 61 lines · Philippe Mathieu-Daudé
Quoted 60 lines · Janosch Frank
Quoted 47 lines · Philippe Mathieu-Daudé
Hi,
(old patch committed as
59181010a2ff82c3a97e9b5768ee87c38e4815f1)Quoted 42 lines · Janosch Frank
Handling of CPU reset and setting of the IPL psw from guest storage at offset 0 is done by a Ultravisor call. Let's only fetch it if necessary.
Signed-off-by Janosch Frank <[email protected]>Reviewed-by Thomas Huth <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Christian Borntraeger <[email protected]>Reviewed-by Claudio Imbrenda <[email protected]>Reviewed-by Cornelia Huck <[email protected]>--- target/s390x/cpu.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)target/s390x/cpu.c +6
-9@@ -77,16 +77,24 @@ static bool s390_cpu_has_work(CPUState *cs) static void s390_cpu_load_normal(CPUState *s) { S390CPU *cpu = S390_CPU(s); - uint64_t spsw = ldq_phys(s->as, 0); - - cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL; - /* - * Invert short psw indication, so SIE will report a specification - * exception if it was not set. - */ - cpu->env.psw.mask ^= PSW_MASK_SHORTPSW; - cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR; + uint64_t spsw; + if (!s390_is_pv()) { + spsw = ldq_phys(s->as, 0); + cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL; + /* +* Invert short psw indication, so SIE will report a specification
+ * exception if it was not set.
+ */
+cpu->env.psw.mask^=PSW_MASK_SHORTPSW; +cpu->env.psw.addr= spsw &PSW_MASK_SHORT_ADDR;Quoted 8 lines
Quoted 6 lines
+ } else {
+ /*
+ * Firmware requires us to set the load state before we set + * the cpu to operating on protected guests.
+ */
+s390_cpu_set_state(S390_CPU_STATE_LOAD, cpu);
S390_CPU_STATE_LOADis overwritten the line above, is that deliberate?Yes.
LOAD is a superset of OPERATING and doing a second OPERATING is therefore a NOP.
Quoted 8 lines
Quoted 3 lines
The load isn't a real state in KVM, we only use it for the UV call. So we have to do a second change into OPERATING for KVM to track the state if we were in stopped state.
Oh OK now I see the
KVM_SET_MP_STATEcalls. Since it was not obvious to me, could the comment be updated to clarify that? (no obligation, feel free to disregard if you find it clear enough for you). Thanks for the quick head-up!
Sure, I'll extend the comment.
PATCH v11 11/16 s390x: protvirt: Move diag 308 data over SIDA
In reply to Janosch FrankFor protected guests the IPIB is written/read to/from the SIDA, so we need those accesses to go through s390_cpu_pv_mem_read/write().
--- target/s390x/diag.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
target/s390x/diag.c +21 -6
@@ -75,6 +75,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) {bool valid;CPUState *cs =env_cpu (env); +S390CPU *cpu =S390_CPU (cs);uint64_t addr = env->regs[r1];uint64_t subcode = env->regs[r3];IplParameterBlock *iplb;
@@ -111,13 +112,22 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)return ; } iplb =g_new0 (IplParameterBlock,1 ); -cpu_physical_memory_read (addr, iplb,sizeof (iplb->len)); +if (!s390_is_pv ()) { +cpu_physical_memory_read (addr, iplb,sizeof (iplb->len)); + }else { +s390_cpu_pv_mem_read (cpu,0 , iplb,sizeof (iplb->len)); + } +if (!iplb_valid_len (iplb)) { env->regs[r1 +1 ] =DIAG_308_RC_INVALID ; goto out; } -cpu_physical_memory_read (addr, iplb,be32_to_cpu (iplb->len)); +if (!s390_is_pv ()) { +cpu_physical_memory_read (addr, iplb,be32_to_cpu (iplb->len)); + }else { +s390_cpu_pv_mem_read (cpu,0 , iplb,be32_to_cpu (iplb->len)); + } valid = subcode ==DIAG308_PV_SET ?iplb_valid_pv (iplb) :iplb_valid (iplb);if (!valid) {
@@ -140,12 +150,17 @@ out: }else { iplb =s390_ipl_get_iplb (); } -if (iplb) { -cpu_physical_memory_write (addr, iplb,be32_to_cpu (iplb->len)); - env->regs[r1 +1 ] =DIAG_308_RC_OK ; - }else { +if (!iplb) { env->regs[r1 +1 ] =DIAG_308_RC_NO_CONF ; +return ; } + +if (!s390_is_pv ()) { +cpu_physical_memory_write (addr, iplb,be32_to_cpu (iplb->len)); + }else { +s390_cpu_pv_mem_write (cpu,0 , iplb,be32_to_cpu (iplb->len)); + } + env->regs[r1 +1 ] =DIAG_308_RC_OK ;return ;case DIAG308_PV_START : iplb =s390_ipl_get_iplb_pv ();
Signature · 1 line
2.25.1
PATCH v11 12/16 s390x: protvirt: Disable address checks for PV guest IO emulation
In reply to Janosch FrankIO instruction data is routed through SIDAD for protected guests, so adresses do not need to be checked, as this is kernel memory which is always available.
Also the instruction data always starts at offset 0 of the SIDAD.
--- target/s390x/ioinst.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-)
target/s390x/ioinst.c +28 -7
@@ -16,6 +16,25 @@#include "hw/s390x/ioinst.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" +#include "hw/s390x/pv.h" + +/* All I/O instructions but chsc use the s format */ +static uint64_t get_address_from_regs (CPUS390XState *env,uint32_t ipb, +uint8_t *ar) +{ +/* +* Addresses for protected guests are all offsets into the +* satellite block which holds the IO control structures. Those +* control structures are always starting at offset 0 and are +* always aligned and accessible. So we can return 0 here which +* will pass the following address checks. +*/ +if (s390_is_pv ()) { + *ar =0 ; +return 0 ; + } +return decode_basedisp_s (env, ipb, ar); +}int ioinst_disassemble_sch_ident (uint32_t value,int *m,int *cssid,int *ssid,int *schid)
@@ -114,7 +133,7 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)CPUS390XState *env = &cpu->env;uint8_t ar; - addr =decode_basedisp_s (env, ipb, &ar); + addr =get_address_from_regs (env, ipb, &ar);if (addr &3 ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ;
@@ -171,7 +190,7 @@ void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)CPUS390XState *env = &cpu->env;uint8_t ar; - addr =decode_basedisp_s (env, ipb, &ar); + addr =get_address_from_regs (env, ipb, &ar);if (addr &3 ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ;
@@ -203,7 +222,7 @@ void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb, uintptr_t ra)CPUS390XState *env = &cpu->env;uint8_t ar; - addr =decode_basedisp_s (env, ipb, &ar); + addr =get_address_from_regs (env, ipb, &ar);if (addr &3 ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ;
@@ -234,7 +253,7 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb,CPUS390XState *env = &cpu->env;uint8_t ar; - addr =decode_basedisp_s (env, ipb, &ar); + addr =get_address_from_regs (env, ipb, &ar);if (addr &3 ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ;
@@ -303,7 +322,7 @@ int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)return -EIO ; }trace_ioinst_sch_id ("tsch" , cssid, ssid, schid); - addr =decode_basedisp_s (env, ipb, &ar); + addr =get_address_from_regs (env, ipb, &ar);if (addr &3 ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return -EIO ;
@@ -601,7 +620,7 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb, uintptr_t ra) {ChscReq *req;ChscResp *res; -uint64_t addr; +uint64_t addr =0 ;int reg;uint16_t len;uint16_t command;
@@ -610,7 +629,9 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb, uintptr_t ra)trace_ioinst ("chsc" ); reg = (ipb >>20 ) &0x00f ; - addr = env->regs[reg]; +if (!s390_is_pv ()) { + addr = env->regs[reg]; + }/* Page boundary? */ if (addr &0xfff ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);
Signature · 1 line
2.25.1
PATCH v11 13/16 s390x: protvirt: Move IO control structures over SIDA
In reply to Janosch FrankFor protected guests, we need to put the IO emulation results into the SIDA, so SIE will write them into the guest at the next entry.
--- target/s390x/ioinst.c | 61 +++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 16 deletions(-)
target/s390x/ioinst.c +45 -16
@@ -138,7 +138,9 @@ void ioinst_handle_msch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ; } -if (s390_cpu_virt_mem_read (cpu, addr, ar, &schib,sizeof (schib))) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_read (cpu, addr, &schib,sizeof (schib)); + }else if (s390_cpu_virt_mem_read (cpu, addr, ar, &schib,sizeof (schib))) {s390_cpu_virt_mem_handle_exc (cpu, ra);return ; }
@@ -195,7 +197,9 @@ void ioinst_handle_ssch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra)s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ; } -if (s390_cpu_virt_mem_read (cpu, addr, ar, &orig_orb,sizeof (orb))) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_read (cpu, addr, &orig_orb,sizeof (orb)); + }else if (s390_cpu_virt_mem_read (cpu, addr, ar, &orig_orb,sizeof (orb))) {s390_cpu_virt_mem_handle_exc (cpu, ra);return ; }
@@ -231,14 +235,19 @@ void ioinst_handle_stcrw(S390CPU *cpu, uint32_t ipb, uintptr_t ra) cc =css_do_stcrw (&crw);/* 0 - crw stored, 1 - zeroes stored */ -if (s390_cpu_virt_mem_write (cpu, addr, ar, &crw,sizeof (crw)) ==0 ) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_write (cpu, addr, &crw,sizeof (crw));setcc (cpu, cc); }else { -if (cc ==0 ) { -/* Write failed: requeue CRW since STCRW is suppressing */ -css_undo_stcrw (&crw); +if (s390_cpu_virt_mem_write (cpu, addr, ar, &crw,sizeof (crw)) ==0 ) { +setcc (cpu, cc); + }else { +if (cc ==0 ) { +/* Write failed: requeue CRW since STCRW is suppressing */ +css_undo_stcrw (&crw); + } +s390_cpu_virt_mem_handle_exc (cpu, ra); } -s390_cpu_virt_mem_handle_exc (cpu, ra); } }
@@ -260,6 +269,13 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, }if (ioinst_disassemble_sch_ident (reg1, &m, &cssid, &ssid, &schid)) { +/* +* The Ultravisor checks schid bit 16 to be one and bits 0-12 +* to be 0 and injects a operand exception itself. +* +* Hence we should never end up here. +*/ +g_assert (!s390_is_pv ());/* * As operand exceptions have a lower priority than access exceptions, * we check whether the memory area is writeable (injecting the
@@ -292,14 +308,17 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, } }if (cc !=3 ) { -if (s390_cpu_virt_mem_write (cpu, addr, ar, &schib, -sizeof (schib)) !=0 ) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_write (cpu, addr, &schib,sizeof (schib)); + }else if (s390_cpu_virt_mem_write (cpu, addr, ar, &schib, +sizeof (schib)) !=0 ) {s390_cpu_virt_mem_handle_exc (cpu, ra);return ; } }else {/* Access exceptions have a higher priority than cc3 */ -if (s390_cpu_virt_mem_check_write (cpu, addr, ar,sizeof (schib)) !=0 ) { +if (!s390_is_pv () && +s390_cpu_virt_mem_check_write (cpu, addr, ar,sizeof (schib)) !=0 ) {s390_cpu_virt_mem_handle_exc (cpu, ra);return ; }
@@ -336,7 +355,9 @@ int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra) }/* 0 - status pending, 1 - not status pending, 3 - not operational */ if (cc !=3 ) { -if (s390_cpu_virt_mem_write (cpu, addr, ar, &irb, irb_len) !=0 ) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_write (cpu, addr, &irb, irb_len); + }else if (s390_cpu_virt_mem_write (cpu, addr, ar, &irb, irb_len) !=0 ) {s390_cpu_virt_mem_handle_exc (cpu, ra);return -EFAULT ; }
@@ -344,7 +365,8 @@ int ioinst_handle_tsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, uintptr_t ra) }else { irb_len =sizeof (irb) -sizeof (irb.emw);/* Access exceptions have a higher priority than cc3 */ -if (s390_cpu_virt_mem_check_write (cpu, addr, ar, irb_len) !=0 ) { +if (!s390_is_pv () && +s390_cpu_virt_mem_check_write (cpu, addr, ar, irb_len) !=0 ) {s390_cpu_virt_mem_handle_exc (cpu, ra);return -EFAULT ; }
@@ -642,7 +664,9 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb, uintptr_t ra)* present CHSC sub-handlers ... if we ever need more, we should take * care of req->len here first. */ -if (s390_cpu_virt_mem_read (cpu, addr, reg, buf,sizeof (ChscReq))) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_read (cpu, addr, buf,sizeof (ChscReq)); + }else if (s390_cpu_virt_mem_read (cpu, addr, reg, buf,sizeof (ChscReq))) {s390_cpu_virt_mem_handle_exc (cpu, ra);return ; }
@@ -675,11 +699,16 @@ void ioinst_handle_chsc(S390CPU *cpu, uint32_t ipb, uintptr_t ra)break ; } -if (!s390_cpu_virt_mem_write (cpu, addr + len, reg, res, -be16_to_cpu (res->len))) { +if (s390_is_pv ()) { +s390_cpu_pv_mem_write (cpu, addr + len, res,be16_to_cpu (res->len));setcc (cpu,0 );/* Command execution complete */ }else { -s390_cpu_virt_mem_handle_exc (cpu, ra); +if (!s390_cpu_virt_mem_write (cpu, addr + len, reg, res, +be16_to_cpu (res->len))) { +setcc (cpu,0 );/* Command execution complete */ + }else { +s390_cpu_virt_mem_handle_exc (cpu, ra); + } } }
Signature · 1 line
2.25.1
PATCH v11 14/16 s390x: protvirt: Handle SIGP store status correctly
In reply to Janosch FrankFor protected VMs status storing is not done by QEMU anymore.
--- target/s390x/helper.c | 6 ++++++ 1 file changed, 6 insertions(+)
target/s390x/helper.c +6 -0
@@ -25,6 +25,7 @@#include "qemu/timer.h" #include "qemu/qemu-print.h" #include "hw/s390x/ioinst.h" +#include "hw/s390x/pv.h" #include "sysemu/hw_accel.h" #include "sysemu/runstate.h" #ifndef CONFIG_USER_ONLY
@@ -246,6 +247,11 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)hwaddr len =sizeof (*sa);int i; +/* For PVMs storing will occur when this cpu enters SIE again */ +if (s390_is_pv ()) { +return 0 ; + } + sa =cpu_physical_memory_map (addr, &len, true);if (!sa) {return -EFAULT ;
Signature · 1 line
2.25.1
PATCH v11 15/16 docs: system: Add protvirt docs
In reply to Janosch FrankLet's add some documentation for the Protected VM functionality.
--- docs/system/s390x/protvirt.rst | 60 ++++++++++++++++++++++++++++++++++ docs/system/target-s390x.rst | 5 +++ 2 files changed, 65 insertions(+) create mode 100644 docs/system/s390x/protvirt.rst
docs/system/s390x/protvirt.rst new file +60 -0
@@ -0,0 +1,60 @@ +Protected Virtualization on s390x +================================= + +The memory and most of the registers of Protected Virtual Machines +(PVMs) are encrypted or inaccessible to the hypervisor, effectively +prohibiting VM introspection when the VM is running. At rest, PVMs are +encrypted and can only be decrypted by the firmware, represented by an +entity called Ultravisor, of specific IBM Z machines. + + +Prerequisites +------------- + +To run PVMs, a machine with the Protected Virtualization feature, as +indicated by the Ultravisor Call facility (stfle bit 158), is +required. The Ultravisor needs to be initialized at boot by setting +`prot_virt=1` on the host's kernel command line. + +Running PVMs requires using the KVM hypervisor. + +If those requirements are met, the capability `KVM_CAP_S390_PROTECTED` +will indicate that KVM can support PVMs on that LPAR. + + +QEMU Settings +------------- + +To indicate to the VM that it can transition into protected mode, the +`Unpack facility` (stfle bit 161 represented by the feature +`unpack`/`S390_FEAT_UNPACK`) needs to be part of the cpu model of +the VM. + +All I/O devices need to use the IOMMU. +Passthrough (vfio) devices are currently not supported. + +Host huge page backings are not supported. However guests can use huge +pages as indicated by its facilities. + + +Boot Process +------------ + +A secure guest image can either be loaded from disk or supplied on the +QEMU command line. Booting from disk is done by the unmodified +s390-ccw BIOS. I.e., the bootmap is interpreted, multiple components +are read into memory and control is transferred to one of the +components (zipl stage3). Stage3 does some fixups and then transfers +control to some program residing in guest memory, which is normally +the OS kernel. The secure image has another component prepended +(stage3a) that uses the new diag308 subcodes 8 and 10 to trigger the +transition into secure mode. + +Booting from the image supplied on the QEMU command line requires that +the file passed via -kernel has the same memory layout as would result +from the disk boot. This memory layout includes the encrypted +components (kernel, initrd, cmdline), the stage3a loader and +metadata. In case this boot method is used, the command line +options -initrd and -cmdline are ineffective. The preparation of a PVM +image is done via the `genprotimg` tool from the s390-tools +collection.
docs/system/target-s390x.rst +5 -0
@@ -24,3 +24,8 @@ or vfio-ap is also available. .. toctree:: s390x/vfio-ap +Architectural features +====================== + +.. toctree:: + s390x/protvirt
Signature · 1 line
2.25.1
PATCH v11 16/16 s390x: Add unpack facility feature to GA1
In reply to Janosch FrankFrom: Christian Borntraeger <[email protected]>
The unpack facility is an indication that diagnose 308 subcodes 8-10 are available to the guest. That means, that the guest can put itself into protected mode.
Once it is in protected mode, the hardware stops any attempt of VM introspection by the hypervisor.
Some features are currently not supported in protected mode:
* vfio devices
* Migration
* Huge page backings
--- target/s390x/gen-features.c | 1 + target/s390x/kvm.c | 8 ++++++++ 2 files changed, 9 insertions(+)
target/s390x/gen-features.c +1 -0
@@ -562,6 +562,7 @@ static uint16_t full_GEN15_GA1[] = {S390_FEAT_GROUP_MSA_EXT_9 ,S390_FEAT_GROUP_MSA_EXT_9_PCKMO ,S390_FEAT_ETOKEN , + S390_FEAT_UNPACK, };/* Default features (in order of release)
target/s390x/kvm.c +8 -0
@@ -2410,6 +2410,14 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp)clear_bit (S390_FEAT_BPB , model->features); } +/* +* If we have support for protected virtualization, indicate +* the protected virtualization IPL unpack facility. +*/ +if (cap_protected) { +set_bit (S390_FEAT_UNPACK , model->features); + } +/* We emulate a zPCI bus and AEN, therefore we don't need HW support */ set_bit (S390_FEAT_ZPCI , model->features);set_bit (S390_FEAT_ADAPTER_EVENT_NOTIFICATION , model->features);
Signature · 1 line
2.25.1
Quoted 100 lines · On Thu, 19 Mar 2020 09:19:05 -0400 Janosch Frank <[email protected]> wrote:
Most of the QEMU changes for PV are related to the new IPL type with subcodes 8 - 10 and the execution of the necessary Ultravisor calls to IPL secure guests. Note that we can only boot into secure mode from normal mode, i.e. stfle 161 is not active in secure mode.
The other changes related to data gathering for emulation and disabling addressing checks in secure mode, as well as CPU resets.
v11:
* Review fixesv10:
* Moved documentation into subfolder
* Added huge page fencing
* Cleared up IO questions that were remaining
* Added exits/abbort/assert for conditions where we can't recoverv9:
* Movedpv.hintoinclude/hw/s390x/
* Replaced cmd strings with macro
* Moveds390_is_pv()topv.h
* Added new copyright dates and authors
v8:
* Removed theiplb_validchanges as they are picked
* Checkpatch fixes
* Review fixes
* Replaced env/ms->pv withs390_is_pv()
v7:
* Merged the diag 308 subcode patches and the unpack
* Moved the SIDA memops into the sync patch
* Bailout for the none machien and fencing ofCONFIG_USER_ONLY
* Changes due to reviewv6:
* diag308 rc numbers were changed by architecture
* IPL pv block received one more reserved field by architecture
* Officially added the bios patch to the series
* Dropped picked constant rename patchv5:
* Moved docs into docs/system
* Some more enable/disable changes
* Moved enablement/disablement of pv in separate functions
* Some review fixesv4:
* Sync with KVM changes
* Review changesV3:
* Use dedicated functions to access SIDA
* Smaller cleanups and segfault fixes
* Error reporting for Ultravisor calls
* Inject of RC of diag308 subcode 10 failsV2:
* Split out cleanups
* Internal PV state tracking
* Review feedbackChristian Borntraeger (1):
s390x: Add unpack facility feature to GA1Janosch Frank (15):
s390x: Move diagnose 308 subcodes and rcs intoipl.hSync pv
s390x: protvirt: Support unpack facility
s390x: protvirt: Add migration blocker
s390x: protvirt: Inhibit balloon when switching to protected mode
s390x: protvirt: KVM intercept changes
s390x: Add SIDA memory ops
s390x: protvirt: Move STSI data over SIDAD
s390x: protvirt: SCLP interpretation
s390x: protvirt: Set guest IPL PSW
s390x: protvirt: Move diag 308 data over SIDA
s390x: protvirt: Disable address checks for PV guest IO emulation
s390x: protvirt: Move IO control structures over SIDA
s390x: protvirt: Handle SIGP store status correctly
docs: system: Add protvirt docsMAINTAINERS | 2 + docs/system/s390x/protvirt.rst | 60 +++++++++++ docs/system/target-s390x.rst | 5 + hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 59 ++++++++++- hw/s390x/ipl.h | 102 ++++++++++++++++++- hw/s390x/pv.c | 98 ++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 148 +++++++++++++++++++++++++++- hw/s390x/sclp.c | 56 ++++++++--- include/hw/s390x/pv.h | 55 +++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + include/hw/s390x/sclp.h | 2 + linux-headers/linux/kvm.h | 45 ++++++++- target/s390x/cpu.c | 27 +++-- target/s390x/cpu.h | 7 +- target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 77 +++++++++++---- target/s390x/gen-features.c | 1 + target/s390x/helper.c | 6 ++ target/s390x/ioinst.c | 96 +++++++++++++-----
Quoted 9 lines
target/s390x/kvm-stub.c | 5 + target/s390x/kvm.c | 79 +++++++++++++-- target/s390x/kvm_s390x.h | 3 + target/s390x/mmu_helper.c | 14 +++ 24 files changed, 870 insertions(+), 80 deletions(-) create mode 100644 docs/system/s390x/protvirt.rst create mode 100644 hw/s390x/pv.c create mode 100644 include/hw/s390x/pv.h
Thanks, queued to s390-next for 5.1 (with v12 of patch 3).
Patch 2 will obviously need to be replaced by a proper headers update; I'll do that when 5.1 development opens up (I assume the kernel patches will have reached Linux master before that.)
(Any further s390x patches for 5.0 will go via s390-fixes, as usual.)
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH v11 00/16] s390x: Protected Virtualization support
Message-id: [email protected]
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
3496cd0 s390x: Add unpack facility feature to GA1
03d40c1 docs: system: Add protvirt docs
4f74e2a s390x: protvirt: Handle SIGP store status correctly 243e681 s390x: protvirt: Move IO control structures over SIDA 05aa2a2 s390x: protvirt: Disable address checks for PV guest IO emulation 9430059 s390x: protvirt: Move diag 308 data over SIDA
ca7e150 s390x: protvirt: Set guest IPL PSW
7214ecd s390x: protvirt: SCLP interpretation
6084fa0 s390x: protvirt: Move STSI data over SIDAD
12a2848 s390x: Add SIDA memory ops
f051c5a s390x: protvirt: KVM intercept changes
4a13191 s390x: protvirt: Inhibit balloon when switching to protected mode d1afa39 s390x: protvirt: Add migration blocker
2b79f0e s390x: protvirt: Support unpack facility
cddc155 Sync pv
481c64f s390x: Move diagnose 308 subcodes and rcs into ipl.h
=== OUTPUT BEGIN ===
1/16 Checking commit 481c64f251a0 (s390x: Move diagnose 308 subcodes and rcs into ipl.h) 2/16 Checking commit cddc15575b09 (Sync pv)
3/16 Checking commit 2b79f0e44dc7 (s390x: protvirt: Support unpack facility)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #326:
new file mode 100644
WARNING: line over 80 characters
#664: FILE: include/hw/s390x/pv.h:48:
+static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length) { return 0; }
ERROR: line over 90 characters
#665: FILE: include/hw/s390x/pv.h:49:
+static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) { return 0; }
WARNING: line over 80 characters
#765: FILE: target/s390x/diag.c:122:
+ valid = subcode == DIAG308_PV_SET ? iplb_valid_pv(iplb) : iplb_valid(iplb);
total: 1 errors, 3 warnings, 731 lines checked
Patch 3/16 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
4/16 Checking commit d1afa39ebf53 (s390x: protvirt: Add migration blocker)
5/16 Checking commit 4a13191b1551 (s390x: protvirt: Inhibit balloon when switching to protected mode) 6/16 Checking commit f051c5a6118f (s390x: protvirt: KVM intercept changes)
ERROR: switch and case should be at the same indent
#50: FILE: target/s390x/kvm.c:1701:
switch (icpt_code) {[...]
+ case ICPT_PV_INSTR:
+ case ICPT_PV_INSTR_NOTIFICATION:
total: 1 errors, 0 warnings, 16 lines checked
Patch 6/16 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
7/16 Checking commit 12a284827066 (s390x: Add SIDA memory ops)
8/16 Checking commit 6084fa081454 (s390x: protvirt: Move STSI data over SIDAD)
9/16 Checking commit 7214ecde2623 (s390x: protvirt: SCLP interpretation)
10/16 Checking commit ca7e150313c9 (s390x: protvirt: Set guest IPL PSW)
11/16 Checking commit 94300597bcf9 (s390x: protvirt: Move diag 308 data over SIDA) 12/16 Checking commit 05aa2a2c74ca (s390x: protvirt: Disable address checks for PV guest IO emulation) 13/16 Checking commit 243e681cda71 (s390x: protvirt: Move IO control structures over SIDA) 14/16 Checking commit 4f74e2afdb60 (s390x: protvirt: Handle SIGP store status correctly) 15/16 Checking commit 03d40c1885fc (docs: system: Add protvirt docs)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#17:
new file mode 100644
total: 0 errors, 1 warnings, 68 lines checked
Patch 15/16 has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
16/16 Checking commit 3496cd05ab8a (s390x: Add unpack facility feature to GA1) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]