s390x: Protected Virtualization support
v8 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.
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 (14):
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: Add protvirt docs
docs/system/index.rst | 1 + docs/system/protvirt.rst | 56 +++++++++++ hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 56 ++++++++++- hw/s390x/ipl.h | 79 ++++++++++++++++ hw/s390x/pv.c | 104 +++++++++++++++++++++ hw/s390x/pv.h | 33 +++++++ hw/s390x/s390-virtio-ccw.c | 140 +++++++++++++++++++++++++++- hw/s390x/sclp.c | 30 ++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + include/hw/s390x/sclp.h | 2 + linux-headers/linux/kvm.h | 45 ++++++++- target/s390x/cpu.c | 45 +++++++-- target/s390x/cpu.h | 8 +- target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 57 +++++++++-- target/s390x/gen-features.c | 1 + target/s390x/helper.c | 5 + target/s390x/ioinst.c | 119 ++++++++++++++++------- target/s390x/kvm.c | 68 ++++++++++++-- target/s390x/kvm_s390x.h | 2 + target/s390x/mmu_helper.c | 14 +++ 22 files changed, 804 insertions(+), 64 deletions(-) create mode 100644 docs/system/protvirt.rst create mode 100644 hw/s390x/pv.c create mode 100644 hw/s390x/pv.h
Signature · 1 line
2.20.1
PATCH v8 1/15 Sync pv
--- 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.20.1
PATCH v8 2/15 s390x: protvirt: Support unpack facility
In reply to Janosch FrankThe unpack facility provides the means to setup a protected guest. A protected guest can not 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 seperately 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]
--- hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 56 ++++++++++++- hw/s390x/ipl.h | 79 +++++++++++++++++++ hw/s390x/pv.c | 104 ++++++++++++++++++++++++ hw/s390x/pv.h | 33 ++++++++ hw/s390x/s390-virtio-ccw.c | 118 +++++++++++++++++++++++++++- include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 23 ++++++ target/s390x/cpu.h | 1 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 30 ++++++- 11 files changed, 441 insertions(+), 6 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 hw/s390x/pv.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 +54 -2
78 lines not on this page · raw message
hw/s390x/ipl.h +79 -0
138 lines not on this page · raw message
hw/s390x/pv.c new file +104 -0
104 lines not on this page · raw message
hw/s390x/pv.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Protected Virtualization header +* +* Copyright IBM Corp. 2020 +* Author(s): +* 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. +*/ +#ifndef HW_S390_PV_H +#define HW_S390_PV_H + +#ifdef CONFIG_KVM +int s390_pv_vm_enable (void ); +void s390_pv_vm_disable (void ); +int s390_pv_set_sec_parms (uint64_t origin,uint64_t length); +int s390_pv_unpack (uint64_t addr,uint64_t size,uint64_t tweak); +void s390_pv_perf_clear_reset (void ); +int s390_pv_verify (void ); +void s390_pv_unshare (void ); +#else +static inline int s390_pv_vm_enable (void ) {return 0 ; } +static inline void s390_pv_vm_disable (void ) {} +static inline int s390_pv_set_sec_parms (uint64_t origin,uint64_t length) {return 0 ; } +static inline int s390_pv_unpack (uint64_t addr,uint64_t size,uint64_t tweak) {return 0 ; } +static inline void s390_pv_perf_clear_reset (void ) {} +static inline int s390_pv_verify (void ) {return 0 ; } +static inline void s390_pv_unshare (void ) {} +#endif + +#endif /* HW_S390_PV_H */
hw/s390x/s390-virtio-ccw.c +115 -3
162 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 +23 -0
@@ -37,6 +37,8 @@#include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY +#include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/pv.h" #include "hw/boards.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h"
@@ -174,6 +176,27 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_s390; } +#if !defined(CONFIG_USER_ONLY ) +bool s390_is_pv (void ) +{ +static S390CcwMachineState *ccw; +Object *obj; + +if (ccw) { +return ccw->pv; + } + +/* we have to bail out for the "none" machine */ + obj =object_dynamic_cast (qdev_get_machine (), +TYPE_S390_CCW_MACHINE ); +if (!obj) { +return false; + } + ccw =S390_CCW_MACHINE (obj); +return ccw->pv; +} +#endif +static void s390_cpu_realizefn (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev);
target/s390x/cpu.h +1 -0
@@ -762,6 +762,7 @@ static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)/* cpu.c */ +bool s390_is_pv (void );void s390_crypto_reset (void );int s390_set_memory_limit (uint64_t new_limit,uint64_t *hw_limit);void s390_set_max_pagesize (uint64_t pagesize,Error **errp);
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 +29 -1
@@ -52,6 +52,7 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)#define DIAG_308_RC_OK 0x0001#define DIAG_308_RC_NO_CONF 0x0102#define DIAG_308_RC_INVALID 0x0402 +#define DIAG_308_RC_NO_PV_CONF 0x0902#define DIAG308_RESET_MOD_CLR 0#define DIAG308_RESET_LOAD_NORM 1
@@ -59,10 +60,17 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)#define DIAG308_LOAD_NORMAL_DUMP 4#define DIAG308_SET 5#define DIAG308_STORE 6 +#define DIAG308_PV_SET 8 +#define DIAG308_PV_STORE 9 +#define DIAG308_PV_START 10static 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 ;
@@ -93,6 +101,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 );
@@ -105,6 +118,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 ; }
@@ -128,10 +142,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 ;
@@ -139,6 +158,15 @@ 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 ; + } + +s390_ipl_reset_request (cs,S390_RESET_PV ); +break ;default :s390_program_interrupt (env,PGM_SPECIFICATION , ra);break ;
Signature · 1 line
2.20.1
Re: [PATCH v8 02/15] s390x: protvirt: Support unpack facility
Quoted 2 lines · Janosch Frank
The unpack facility provides the means to setup a protected guest. A protected guest can not be introspected by the hypervisor or any
"cannot"
Quoted 6 lines
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 seperately from
"separately"
Quoted 8 lines
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]
[...]
hw/s390x/ipl.h static inline bool iplb_valid_len(IplParameterBlock *iplb) · line 214
Quoted 12 lines
hw/s390x/ipl.h +12
-0+static inline bool ipl_valid_pv_components (IplParameterBlock *iplb) +{ +IPLBlockPV *ipib_pv = &iplb->pv; +int i; + +if (ipib_pv->num_comp ==0 ) { +return false; + } + +for (i =0 ; i < ipib_pv->num_comp; i++) { +/* Addr must be 4k aligned */ +if (ipib_pv->components[i].addr & ~TARGET_PAGE_MASK ) {
I usually find
QEMU_IS_ALIGNED(ipib_pv->components[i].addr, TARGET_PAGE_MASK)
nicer
[...]
Quoted 28 lines
hw/s390x/pv.c new file +22
-0@@ -0,0 +1,104 @@ +/* +* Protected Virtualization functions +* +* Copyright IBM Corp. 2020 +* Author(s): +* 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. +*/ +#include "qemu/osdep.h" + +#include <linux/kvm.h> + +#include "qemu/error-report.h" +#include "sysemu/kvm.h" +#include "pv.h" + +const char *cmd_names[] = { +"VM_ENABLE" , +"VM_DISABLE" ,
hw/s390x/pv.c line 32
Quoted 10 lines
hw/s390x/pv.c new file +10
-0+"VM_SET_SEC_PARAMS" , +"VM_UNPACK" , +"VM_VERIFY" , +"VM_PREP_RESET" , + "VM_UNSHARE_ALL", +}; + +static int s390_pv_cmd (uint32_t cmd,void *data) +{ +int rc;
reverse x... :)
hw/s390x/pv.c line 37
Quoted 5 lines
hw/s390x/pv.c new file +5
-0+struct kvm_pv_cmd pv_cmd = { + .cmd = cmd, + .data = (uint64_t )data, + }; +
and then maybe
int rc = ...
Quoted 4 lines
hw/s390x/pv.c new file +4
-0+ rc =kvm_vm_ioctl (kvm_state,KVM_S390_PV_COMMAND , &pv_cmd); +if (rc) { + error_report("KVM PV command %d (%s) failed: header rc %x rrc %x " + "IOCTL rc: %d", cmd, cmd_names[cmd], pv_cmd.rc, pv_cmd.rrc,
hw/s390x/pv.c line 51
Quoted 10 lines
hw/s390x/pv.c new file +10
-0+ rc); + } +return rc; +} + +static void s390_pv_cmd_exit (uint32_t cmd,void *data) +{ +int rc; + + rc =s390_pv_cmd (cmd, data);
int rc = ...
Quoted 5 lines
hw/s390x/pv.c new file +5
-0+if (rc) { +exit (1 ); + } +} +
[...]
Quoted 14 lines
hw/s390x/s390-virtio-ccw.c +2
-0@@ -41,6 +41,8 @@#include "hw/qdev-properties.h" #include "hw/s390x/tod.h" #include "sysemu/sysemu.h" +#include "hw/s390x/pv.h" +#include <linux/kvm.h> S390CPU *s390_cpu_addr2state (uint16_t cpu_addr) {
hw/s390x/s390-virtio-ccw.c static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg) · line 323
Quoted 6 lines
hw/s390x/s390-virtio-ccw.c +3
-0@@ -316,10 +318,80 @@ static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg)s390_cpu_set_state (S390_CPU_STATE_OPERATING , cpu); } +static void s390_machine_unprotect (S390CcwMachineState *ms) +{ +
superfluous empty line
Quoted 4 lines
hw/s390x/s390-virtio-ccw.c +4
-0+s390_pv_vm_disable (); + ms->pv = false; +} +
[...]
target/s390x/cpu.c line 41
Quoted 10 lines
target/s390x/cpu.c +2
-0@@ -37,6 +37,8 @@#include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY +#include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/pv.h"
Do you need that include here? I don't think so.
Quoted 18 lines
target/s390x/cpu.c +11
-0#include "hw/boards.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" @@ -174,6 +176,27 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_s390; } +#if !defined(CONFIG_USER_ONLY ) +bool s390_is_pv (void ) +{ +static S390CcwMachineState *ccw; +Object *obj; + +if (ccw) { +return ccw->pv; + } + +/* we have to bail out for the "none" machine */
target/s390x/cpu.c static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) · line 199
Quoted 10 lines
target/s390x/cpu.c +10
-0+ obj =object_dynamic_cast (qdev_get_machine (), +TYPE_S390_CCW_MACHINE ); +if (!obj) { +return false; + } + ccw =S390_CCW_MACHINE (obj); + return ccw->pv; +} +#endif +
Nit: I *think* this would be better placed in hw/s390x/pv.h
target/s390x/cpu.h static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg) · line 765
Quoted 12 lines
target/s390x/cpu.c +0
-0static void s390_cpu_realizefn (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev);target/s390x/cpu.h +1
-0@@ -762,6 +762,7 @@ static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)/* cpu.c */ +bool s390_is_pv (void );
Wonder if this will compile with CONFIG_USER_ONLY (maybe we need a "return false" dummy). I assume you test-compiled that with all variants (CONFIG_TCG, CONFIG_USER_ONLY, ...)
.. we're almost there ... :)
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v8 02/15] s390x: protvirt: Support unpack facility
Quoted 6 lines · David Hildenbrand
Quoted 2 lines · Janosch Frank
The unpack facility provides the means to setup a protected guest. A protected guest can not be introspected by the hypervisor or any
"cannot"
Quoted 8 lines
Quoted 6 lines
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 seperately from
"separately"
Time to find out why my flyspel hooks are failing...
Quoted 27 lines
Quoted 9 lines
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]
[...]
hw/s390x/ipl.h static inline bool iplb_valid_len(IplParameterBlock *iplb) · line 214
Quoted 12 lines
hw/s390x/ipl.h +12
-0+static inline bool ipl_valid_pv_components (IplParameterBlock *iplb) +{ +IPLBlockPV *ipib_pv = &iplb->pv; +int i; + +if (ipib_pv->num_comp ==0 ) { +return false; + } + +for (i =0 ; i < ipib_pv->num_comp; i++) { +/* Addr must be 4k aligned */ +if (ipib_pv->components[i].addr & ~TARGET_PAGE_MASK ) {I usually find
Quoted 5 lines
QEMU_IS_ALIGNED(ipib_pv->components[i].addr, TARGET_PAGE_MASK)nicer
[...]
huh, didn't know it existed.
I'll have a try with it.
Quoted 33 lines
Quoted 33 lines
hw/s390x/pv.c new file +26
-0@@ -0,0 +1,104 @@ +/* +* Protected Virtualization functions +* +* Copyright IBM Corp. 2020 +* Author(s): +* 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. +*/ +#include "qemu/osdep.h" + +#include <linux/kvm.h> + +#include "qemu/error-report.h" +#include "sysemu/kvm.h" +#include "pv.h" + +const char *cmd_names[] = { +"VM_ENABLE" , +"VM_DISABLE" , +"VM_SET_SEC_PARAMS" , +"VM_UNPACK" , +"VM_VERIFY" , +"VM_PREP_RESET" ,
Quoted 8 lines
hw/s390x/pv.c line 32
Quoted 6 lines
hw/s390x/pv.c new file +6
-0+ "VM_UNSHARE_ALL", +}; + +static int s390_pv_cmd (uint32_t cmd,void *data) +{ +int rc;reverse x... :)
ack
Just FYI, I like christmas trees the right side up
Quoted 10 lines
hw/s390x/pv.c line 37
Quoted 6 lines
hw/s390x/pv.c new file +5
-0+struct kvm_pv_cmd pv_cmd = { + .cmd = cmd, + .data = (uint64_t )data, + }; +and then maybe
int rc = ...
Ack
Quoted 17 lines
Quoted 5 lines
hw/s390x/pv.c new file +4
-0+ rc =kvm_vm_ioctl (kvm_state,KVM_S390_PV_COMMAND , &pv_cmd); +if (rc) { + error_report("KVM PV command %d (%s) failed: header rc %x rrc %x " + "IOCTL rc: %d", cmd, cmd_names[cmd], pv_cmd.rc, pv_cmd.rrc,hw/s390x/pv.c line 51
Quoted 10 lines
hw/s390x/pv.c new file +10
-0+ rc); + } +return rc; +} + +static void s390_pv_cmd_exit (uint32_t cmd,void *data) +{ +int rc; + + rc =s390_pv_cmd (cmd, data);int rc = ...
Ack
Quoted 32 lines
Quoted 6 lines
hw/s390x/pv.c new file +5
-0+if (rc) { +exit (1 ); + } +} +[...]
Quoted 14 lines
hw/s390x/s390-virtio-ccw.c +2
-0@@ -41,6 +41,8 @@#include "hw/qdev-properties.h" #include "hw/s390x/tod.h" #include "sysemu/sysemu.h" +#include "hw/s390x/pv.h" +#include <linux/kvm.h> S390CPU *s390_cpu_addr2state (uint16_t cpu_addr) {hw/s390x/s390-virtio-ccw.c static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg) · line 323
Quoted 6 lines
hw/s390x/s390-virtio-ccw.c +3
-0@@ -316,10 +318,80 @@ static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg)s390_cpu_set_state (S390_CPU_STATE_OPERATING , cpu); } +static void s390_machine_unprotect (S390CcwMachineState *ms) +{ +superfluous empty line
Quoted 6 lines
Quoted 4 lines
hw/s390x/s390-virtio-ccw.c +4
-0+s390_pv_vm_disable (); + ms->pv = false; +} +[...]
Ack
Quoted 36 lines
target/s390x/cpu.c line 41
Quoted 11 lines
target/s390x/cpu.c +2
-0@@ -37,6 +37,8 @@#include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY +#include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/pv.h" Do you need that include here? I don't think so.
Quoted 22 lines
target/s390x/cpu.c +15
-0#include "hw/boards.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" @@ -174,6 +176,27 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_s390; } +#if !defined(CONFIG_USER_ONLY ) +bool s390_is_pv (void ) +{ +static S390CcwMachineState *ccw; +Object *obj; + +if (ccw) { +return ccw->pv; + } + +/* we have to bail out for the "none" machine */ + obj =object_dynamic_cast (qdev_get_machine (), +TYPE_S390_CCW_MACHINE ); +if (!obj) { +return false;
Quoted 8 lines
target/s390x/cpu.c static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) · line 199
Quoted 6 lines
target/s390x/cpu.c +6
-0+ } + ccw =S390_CCW_MACHINE (obj); +return ccw->pv; +} +#endif +Nit: I *think* this would be better placed in
hw/s390x/pv.h
I'll think about it
Quoted 11 lines
Quoted 11 lines
target/s390x/cpu.c +0
-0static void s390_cpu_realizefn (DeviceState *dev,Error **errp) {CPUState *cs =CPU (dev);target/s390x/cpu.h +0
-0@@ -762,6 +762,7 @@ static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)
Quoted 6 lines
target/s390x/cpu.h static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg) · line 765
Quoted 2 lines
target/s390x/cpu.h +1
-0/* cpu.c */ +bool s390_is_pv (void );Wonder if this will compile with
CONFIG_USER_ONLY(maybe we need a "return false" dummy). I assume you test-compiled that with all variants (CONFIG_TCG,CONFIG_USER_ONLY, ...)
Oh, right...
Quoted 4 lines
.. we're almost there ... :)
Re: [PATCH v8 02/15] s390x: protvirt: Support unpack facility
In reply to Janosch FrankQuoted 304 lines · Janosch Frank
The unpack facility provides the means to setup a protected guest. A protected guest can not 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 seperately 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]
--- hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 56 ++++++++++++- hw/s390x/ipl.h | 79 +++++++++++++++++++ hw/s390x/pv.c | 104 ++++++++++++++++++++++++ hw/s390x/pv.h | 33 ++++++++ hw/s390x/s390-virtio-ccw.c | 118 +++++++++++++++++++++++++++- include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 23 ++++++ target/s390x/cpu.h | 1 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 30 ++++++- 11 files changed, 441 insertions(+), 6 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 hw/s390x/pv.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 +54
-2@@ -33,6 +33,7 @@#include "qemu/cutils.h" #include "qemu/option.h" #include "exec/exec-all.h" +#include "pv.h" #define KERN_IMAGE_START 0x010000UL#define LINUX_MAGIC_ADDR 0x010008UL@@ -566,12 +567,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 ();@@ -660,6 +680,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu)cpu_physical_memory_unmap (addr, len,1 , len); } +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); +g_free (hdr); +return rc; +} + +int s390_ipl_pv_unpack (void ) +{ +IplParameterBlock *ipib =s390_ipl_get_iplb_pv (); +IPLBlockPV *ipib_pv = &ipib->pv; +int i, rc =0 ; + +for (i =0 ; i < ipib_pv->num_comp; i++) { + rc =s390_pv_unpack (ipib_pv->components[i].addr, +TARGET_PAGE_ALIGN (ipib_pv->components[i].size), + ipib_pv->components[i].tweak_pref); +if (rc) { +break ; + } + } +return rc; +} +void s390_ipl_prepare_cpu (S390CPU *cpu) {S390IPLState *ipl =get_ipl_device ();hw/s390x/ipl.h +79
-0@@ -15,6 +15,24 @@#include "cpu.h" #include "hw/qdev-core.h" +struct IPLBlockPVComp { +uint64_t tweak_pref; +uint64_t addr; +uint64_t size; +}QEMU_PACKED ; +typedef struct IPLBlockPVComp IPLBlockPVComp ; + +struct IPLBlockPV { +uint8_t reserved18[87 ];/* 0x18 */ +uint8_t version;/* 0x6f */ +uint32_t reserved70;/* 0x70 */ +uint32_t num_comp;/* 0x74 */ +uint64_t pv_header_addr;/* 0x78 */ +uint64_t pv_header_len;/* 0x80 */ +struct IPLBlockPVComp components[]; +}QEMU_PACKED ; +typedef struct IPLBlockPV IPLBlockPV ; +struct IplBlockCcw {uint8_t reserved0[85 ];uint8_t ssid;@@ -71,6 +89,7 @@ union IplParameterBlock {union {IplBlockCcw ccw;IplBlockFcp fcp; +IPLBlockPV pv;IplBlockQemuScsi scsi; }; }QEMU_PACKED ;@@ -85,8 +104,11 @@ typedef union IplParameterBlock IplParameterBlock;int s390_ipl_set_loadparm (uint8_t *loadparm);void s390_ipl_update_diag308 (IplParameterBlock *iplb); +int s390_ipl_prepare_pv_header (void ); +int s390_ipl_pv_unpack (void );void s390_ipl_prepare_cpu (S390CPU *cpu);IplParameterBlock *s390_ipl_get_iplb (void ); +IplParameterBlock *s390_ipl_get_iplb_pv (void );enum s390_reset {/* default is a reset not triggered by a CPU e.g. issued by QMP */ @@ -94,6 +116,7 @@ enum s390_reset {S390_RESET_REIPL ,S390_RESET_MODIFIED_CLEAR ,S390_RESET_LOAD_NORMAL , + S390_RESET_PV, };void s390_ipl_reset_request (CPUState *cs,enum s390_reset reset_type);void s390_ipl_get_reset_request (CPUState **cs,enum s390_reset *reset_type);@@ -133,6 +156,7 @@ struct S390IPLState {/*< private >*/ DeviceState parent_obj;IplParameterBlock iplb; +IplParameterBlock iplb_pv;QemuIplParameters qipl;uint64_t start_addr;uint64_t compat_start_addr;@@ -140,6 +164,7 @@ struct S390IPLState {uint64_t compat_bios_start_addr;bool enforce_bios;bool iplb_valid; +bool iplb_valid_pv;bool netboot;/* reset related properties don't have to be migrated or reset */ enum s390_reset reset_type;@@ -161,9 +186,11 @@ QEMU_BUILD_BUG_MSG(offsetof(S390IPLState, iplb) & 3, "alignment of iplb wrong");#define S390_IPL_TYPE_FCP 0x00#define S390_IPL_TYPE_CCW 0x02 +#define S390_IPL_TYPE_PV 0x05#define S390_IPL_TYPE_QEMU_SCSI 0xff#define S390_IPLB_HEADER_LEN 8 +#define S390_IPLB_MIN_PV_LEN 148#define S390_IPLB_MIN_CCW_LEN 200#define S390_IPLB_MIN_FCP_LEN 384#define S390_IPLB_MIN_QEMU_SCSI_LEN 200@@ -173,6 +200,50 @@ static inline bool iplb_valid_len(IplParameterBlock *iplb)return be32_to_cpu (iplb->len) <=sizeof (IplParameterBlock); } +static inline bool ipl_valid_pv_components (IplParameterBlock *iplb) +{ +IPLBlockPV *ipib_pv = &iplb->pv; +int i; + +if (ipib_pv->num_comp ==0 ) { +return false; + } + +for (i =0 ; i < ipib_pv->num_comp; i++) { +/* Addr must be 4k aligned */ +if (ipib_pv->components[i].addr & ~TARGET_PAGE_MASK ) { +return false; + } + +/* Tweak prefix is monotonically increasing with each component */ +if (i < ipib_pv->num_comp -1 && + ipib_pv->components[i].tweak_pref >= + ipib_pv->components[i +1 ].tweak_pref) { +return false; + } + } +return true; +} + +static inline bool ipl_valid_pv_header (IplParameterBlock *iplb) +{ +IPLBlockPV *ipib_pv = &iplb->pv; + +if (ipib_pv->pv_header_len >2 *TARGET_PAGE_SIZE ) { +return false; + } + +if (!address_space_access_valid (&address_space_memory, + ipib_pv->pv_header_addr, + ipib_pv->pv_header_len, + false, +MEMTXATTRS_UNSPECIFIED )) { +return false; + } + +return true; +} +static inline bool iplb_valid (IplParameterBlock *iplb) {switch (iplb->pbt) {@@ -180,6 +251,14 @@ static inline bool iplb_valid(IplParameterBlock *iplb)return be32_to_cpu (iplb->len) >=S390_IPLB_MIN_FCP_LEN ;case S390_IPL_TYPE_CCW :return be32_to_cpu (iplb->len) >=S390_IPLB_MIN_CCW_LEN ; +case S390_IPL_TYPE_PV : +if (be32_to_cpu (iplb->len) <S390_IPLB_MIN_PV_LEN ) { +return false; + } +if (!ipl_valid_pv_header (iplb)) { +return false; + } +return ipl_valid_pv_components (iplb);default :return false; }hw/s390x/pv.c new file +18
-0@@ -0,0 +1,104 @@ +/* +* Protected Virtualization functions +* +* Copyright IBM Corp. 2020 +* Author(s): +* 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. +*/ +#include "qemu/osdep.h" + +#include <linux/kvm.h> + +#include "qemu/error-report.h" +#include "sysemu/kvm.h" +#include "pv.h"
hw/s390x/pv.c line 28
Quoted 10 lines
hw/s390x/pv.c new file +10
-0+ +const char *cmd_names[] = { +"VM_ENABLE" , +"VM_DISABLE" , +"VM_SET_SEC_PARAMS" , +"VM_UNPACK" , +"VM_VERIFY" , +"VM_PREP_RESET" , +"VM_UNSHARE_ALL" , +};
This is really error-prone (even though this will not change) What about something like this? (and no is an acceptable answer)
hw/s390x/pv.c +10 -19
@@ -17,17 +17,7 @@#include "sysemu/kvm.h" #include "pv.h" -const char *cmd_names[] = { -"VM_ENABLE" , -"VM_DISABLE" , -"VM_SET_SEC_PARAMS" , -"VM_UNPACK" , -"VM_VERIFY" , -"VM_PREP_RESET" , -"VM_UNSHARE_ALL" , -}; - -static int s390_pv_cmd (uint32_t cmd,void *data) +static int __s390_pv_cmd (uint32_t cmd,const char *cmdname,void *data) {int rc;struct kvm_pv_cmd pv_cmd = {
@@ -38,20 +28,21 @@ static int s390_pv_cmd(uint32_t cmd, void *data) rc =kvm_vm_ioctl (kvm_state,KVM_S390_PV_COMMAND , &pv_cmd);if (rc) {error_report ("KVM PV command %d (%s) failed: header rc %x rrc %x " -"IOCTL rc: %d" , cmd, cmd_names[cmd], pv_cmd.rc, pv_cmd.rrc, +"IOCTL rc: %d" , cmd, cmdname, pv_cmd.rc, pv_cmd.rrc, rc); }return rc; } -static void s390_pv_cmd_exit (uint32_t cmd,void *data) -{ -int rc; +#define s390_pv_cmd (cmd, data) __s390_pv_cmd(cmd, #cmd, data); - rc =s390_pv_cmd (cmd, data); -if (rc) { -exit (1 ); - } +#define s390_pv_cmd_exit (cmd, data) \ +{ \ + int rc; \ + rc = __s390_pv_cmd(cmd, #cmd, data);\ + if (rc) { \ + exit(1); \ + } \ }int s390_pv_vm_enable (void )
Re: [PATCH v8 02/15] s390x: protvirt: Support unpack facility
Quoted 312 lines · Christian Borntraeger
Quoted 309 lines · Janosch Frank
The unpack facility provides the means to setup a protected guest. A protected guest can not 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 seperately 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]
--- hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 56 ++++++++++++- hw/s390x/ipl.h | 79 +++++++++++++++++++ hw/s390x/pv.c | 104 ++++++++++++++++++++++++ hw/s390x/pv.h | 33 ++++++++ hw/s390x/s390-virtio-ccw.c | 118 +++++++++++++++++++++++++++- include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 23 ++++++ target/s390x/cpu.h | 1 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 30 ++++++- 11 files changed, 441 insertions(+), 6 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 hw/s390x/pv.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 +54
-2@@ -33,6 +33,7 @@#include "qemu/cutils.h" #include "qemu/option.h" #include "exec/exec-all.h" +#include "pv.h" #define KERN_IMAGE_START 0x010000UL#define LINUX_MAGIC_ADDR 0x010008UL@@ -566,12 +567,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 ();@@ -660,6 +680,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu)cpu_physical_memory_unmap (addr, len,1 , len); } +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); +g_free (hdr); +return rc; +} + +int s390_ipl_pv_unpack (void ) +{ +IplParameterBlock *ipib =s390_ipl_get_iplb_pv (); +IPLBlockPV *ipib_pv = &ipib->pv; +int i, rc =0 ; + +for (i =0 ; i < ipib_pv->num_comp; i++) { + rc =s390_pv_unpack (ipib_pv->components[i].addr, +TARGET_PAGE_ALIGN (ipib_pv->components[i].size), + ipib_pv->components[i].tweak_pref); +if (rc) { +break ; + } + } +return rc; +} +void s390_ipl_prepare_cpu (S390CPU *cpu) {S390IPLState *ipl =get_ipl_device ();hw/s390x/ipl.h +79
-0@@ -15,6 +15,24 @@#include "cpu.h" #include "hw/qdev-core.h" +struct IPLBlockPVComp { +uint64_t tweak_pref; +uint64_t addr; +uint64_t size; +}QEMU_PACKED ; +typedef struct IPLBlockPVComp IPLBlockPVComp ; + +struct IPLBlockPV { +uint8_t reserved18[87 ];/* 0x18 */ +uint8_t version;/* 0x6f */ +uint32_t reserved70;/* 0x70 */ +uint32_t num_comp;/* 0x74 */ +uint64_t pv_header_addr;/* 0x78 */ +uint64_t pv_header_len;/* 0x80 */ +struct IPLBlockPVComp components[]; +}QEMU_PACKED ; +typedef struct IPLBlockPV IPLBlockPV ; +struct IplBlockCcw {uint8_t reserved0[85 ];uint8_t ssid;@@ -71,6 +89,7 @@ union IplParameterBlock {union {IplBlockCcw ccw;IplBlockFcp fcp; +IPLBlockPV pv;IplBlockQemuScsi scsi; }; }QEMU_PACKED ;@@ -85,8 +104,11 @@ typedef union IplParameterBlock IplParameterBlock;int s390_ipl_set_loadparm (uint8_t *loadparm);void s390_ipl_update_diag308 (IplParameterBlock *iplb); +int s390_ipl_prepare_pv_header (void ); +int s390_ipl_pv_unpack (void );void s390_ipl_prepare_cpu (S390CPU *cpu);IplParameterBlock *s390_ipl_get_iplb (void ); +IplParameterBlock *s390_ipl_get_iplb_pv (void );enum s390_reset {/* default is a reset not triggered by a CPU e.g. issued by QMP */ @@ -94,6 +116,7 @@ enum s390_reset {S390_RESET_REIPL ,S390_RESET_MODIFIED_CLEAR ,S390_RESET_LOAD_NORMAL , + S390_RESET_PV, };void s390_ipl_reset_request (CPUState *cs,enum s390_reset reset_type);void s390_ipl_get_reset_request (CPUState **cs,enum s390_reset *reset_type);@@ -133,6 +156,7 @@ struct S390IPLState {/*< private >*/ DeviceState parent_obj;IplParameterBlock iplb; +IplParameterBlock iplb_pv;QemuIplParameters qipl;uint64_t start_addr;uint64_t compat_start_addr;@@ -140,6 +164,7 @@ struct S390IPLState {uint64_t compat_bios_start_addr;bool enforce_bios;bool iplb_valid; +bool iplb_valid_pv;bool netboot;/* reset related properties don't have to be migrated or reset */ enum s390_reset reset_type;@@ -161,9 +186,11 @@ QEMU_BUILD_BUG_MSG(offsetof(S390IPLState, iplb) & 3, "alignment of iplb wrong");#define S390_IPL_TYPE_FCP 0x00#define S390_IPL_TYPE_CCW 0x02 +#define S390_IPL_TYPE_PV 0x05#define S390_IPL_TYPE_QEMU_SCSI 0xff#define S390_IPLB_HEADER_LEN 8 +#define S390_IPLB_MIN_PV_LEN 148#define S390_IPLB_MIN_CCW_LEN 200#define S390_IPLB_MIN_FCP_LEN 384#define S390_IPLB_MIN_QEMU_SCSI_LEN 200@@ -173,6 +200,50 @@ static inline bool iplb_valid_len(IplParameterBlock *iplb)return be32_to_cpu (iplb->len) <=sizeof (IplParameterBlock); } +static inline bool ipl_valid_pv_components (IplParameterBlock *iplb) +{ +IPLBlockPV *ipib_pv = &iplb->pv; +int i; + +if (ipib_pv->num_comp ==0 ) { +return false; + } + +for (i =0 ; i < ipib_pv->num_comp; i++) { +/* Addr must be 4k aligned */ +if (ipib_pv->components[i].addr & ~TARGET_PAGE_MASK ) { +return false; + } + +/* Tweak prefix is monotonically increasing with each component */ +if (i < ipib_pv->num_comp -1 && + ipib_pv->components[i].tweak_pref >= + ipib_pv->components[i +1 ].tweak_pref) { +return false; + } + } +return true; +} + +static inline bool ipl_valid_pv_header (IplParameterBlock *iplb) +{ +IPLBlockPV *ipib_pv = &iplb->pv; + +if (ipib_pv->pv_header_len >2 *TARGET_PAGE_SIZE ) { +return false; + } + +if (!address_space_access_valid (&address_space_memory, + ipib_pv->pv_header_addr, + ipib_pv->pv_header_len, + false, +MEMTXATTRS_UNSPECIFIED )) { +return false; + } + +return true; +} +static inline bool iplb_valid (IplParameterBlock *iplb) {switch (iplb->pbt) {@@ -180,6 +251,14 @@ static inline bool iplb_valid(IplParameterBlock *iplb)return be32_to_cpu (iplb->len) >=S390_IPLB_MIN_FCP_LEN ;case S390_IPL_TYPE_CCW :return be32_to_cpu (iplb->len) >=S390_IPLB_MIN_CCW_LEN ; +case S390_IPL_TYPE_PV : +if (be32_to_cpu (iplb->len) <S390_IPLB_MIN_PV_LEN ) { +return false; + } +if (!ipl_valid_pv_header (iplb)) { +return false; + } +return ipl_valid_pv_components (iplb);default :return false; }hw/s390x/pv.c new file +23
-0@@ -0,0 +1,104 @@ +/* +* Protected Virtualization functions +* +* Copyright IBM Corp. 2020 +* Author(s): +* 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. +*/ +#include "qemu/osdep.h" + +#include <linux/kvm.h> + +#include "qemu/error-report.h" +#include "sysemu/kvm.h" +#include "pv.h" + +const char *cmd_names[] = { +"VM_ENABLE" , +"VM_DISABLE" , +"VM_SET_SEC_PARAMS" ,
Quoted 8 lines
hw/s390x/pv.c line 28
Quoted 5 lines
hw/s390x/pv.c new file +5
-0+"VM_UNPACK" , +"VM_VERIFY" , +"VM_PREP_RESET" , + "VM_UNSHARE_ALL", +};This is really error-prone (even though this will not change) What about something like this? (and no is an acceptable answer)
I'd be ok with that as long as I can add a comment to the macro explaining what we're doing. And if I can add a newline between rc and the if in the macro.
Quoted 62 lines
hw/s390x/pv.c +10
-19@@ -17,17 +17,7 @@#include "sysemu/kvm.h" #include "pv.h" -const char *cmd_names[] = { -"VM_ENABLE" , -"VM_DISABLE" , -"VM_SET_SEC_PARAMS" , -"VM_UNPACK" , -"VM_VERIFY" , -"VM_PREP_RESET" , -"VM_UNSHARE_ALL" , -}; - -static int s390_pv_cmd (uint32_t cmd,void *data) +static int __s390_pv_cmd (uint32_t cmd,const char *cmdname,void *data) {int rc;struct kvm_pv_cmd pv_cmd = {@@ -38,20 +28,21 @@ static int s390_pv_cmd(uint32_t cmd, void *data) rc =kvm_vm_ioctl (kvm_state,KVM_S390_PV_COMMAND , &pv_cmd);if (rc) {error_report ("KVM PV command %d (%s) failed: header rc %x rrc %x " -"IOCTL rc: %d" , cmd, cmd_names[cmd], pv_cmd.rc, pv_cmd.rrc, +"IOCTL rc: %d" , cmd, cmdname, pv_cmd.rc, pv_cmd.rrc, rc); }return rc; } -static void s390_pv_cmd_exit (uint32_t cmd,void *data) -{ -int rc; +#define s390_pv_cmd (cmd, data) __s390_pv_cmd(cmd, #cmd, data); - rc =s390_pv_cmd (cmd, data); -if (rc) { -exit (1 ); - } +#define s390_pv_cmd_exit (cmd, data) \ +{ \ + int rc; \ + rc = __s390_pv_cmd(cmd, #cmd, data);\ + if (rc) { \ + exit(1); \ + } \ }int s390_pv_vm_enable (void )
PATCH v9 1/1 s390x: protvirt: Support unpack facility
In reply to Christian BorntraegerThe 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]
---
Preview to make sure I didn't miss anything before I send out a full series.
--- hw/s390x/Makefile.objs | 1 + hw/s390x/ipl.c | 56 ++++++++++++- hw/s390x/ipl.h | 79 +++++++++++++++++++ hw/s390x/pv.c | 98 +++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 117 +++++++++++++++++++++++++++- include/hw/s390x/pv.h | 57 ++++++++++++++ include/hw/s390x/s390-virtio-ccw.h | 1 + target/s390x/cpu.c | 2 + target/s390x/cpu_features_def.inc.h | 1 + target/s390x/diag.c | 31 +++++++- 10 files changed, 437 insertions(+), 6 deletions(-) create mode 100644 hw/s390x/pv.c create mode 100644 include/hw/s390x/pv.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 +54 -2
78 lines not on this page · raw message
hw/s390x/ipl.h +79 -0
138 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 +114 -3
161 lines not on this page · raw message
include/hw/s390x/pv.h new file +57 -0
57 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 +2 -0
@@ -37,6 +37,8 @@#include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY +#include "hw/s390x/s390-virtio-ccw.h" +#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 +30 -1
@@ -20,6 +20,7 @@#include "sysemu/cpus.h" #include "hw/s390x/ipl.h" #include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/pv.h" int handle_diag_288 (CPUS390XState *env,uint64_t r1,uint64_t r3) {
@@ -52,6 +53,7 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)#define DIAG_308_RC_OK 0x0001#define DIAG_308_RC_NO_CONF 0x0102#define DIAG_308_RC_INVALID 0x0402 +#define DIAG_308_RC_NO_PV_CONF 0x0902#define DIAG308_RESET_MOD_CLR 0#define DIAG308_RESET_LOAD_NORM 1
@@ -59,10 +61,17 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)#define DIAG308_LOAD_NORMAL_DUMP 4#define DIAG308_SET 5#define DIAG308_STORE 6 +#define DIAG308_PV_SET 8 +#define DIAG308_PV_STORE 9 +#define DIAG308_PV_START 10static 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 ;
@@ -93,6 +102,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 );
@@ -105,6 +119,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 ; }
@@ -128,10 +143,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 ;
@@ -139,6 +159,15 @@ 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 ; + } + +s390_ipl_reset_request (cs,S390_RESET_PV ); +break ;default :s390_program_interrupt (env,PGM_SPECIFICATION , ra);break ;
Signature · 1 line
2.25.1
PATCH v8 3/15 s390x: protvirt: Add migration blocker
In reply to Janosch FrankMigration is not yet supported.
--- hw/s390x/s390-virtio-ccw.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
hw/s390x/s390-virtio-ccw.c +17 -0
@@ -43,6 +43,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,29 @@ 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) { +static Error *local_err;int rc; +error_setg (&pv_mig_blocker, +"protected VMs are currently not migrateable." ); + rc =migrate_add_blocker (pv_mig_blocker, &local_err); +if (local_err) { +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); +error_free_or_abort (&pv_mig_blocker);return rc; }
Signature · 1 line
2.20.1
Re: [PATCH v8 03/15] s390x: protvirt: Add migration blocker
Quoted 22 lines · Janosch Frank
Migration is not yet supported.
Signed-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)hw/s390x/s390-virtio-ccw.c +3
-0@@ -43,6 +43,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) {
hw/s390x/s390-virtio-ccw.c static void s390_machine_unprotect(S390CcwMachineState *ms) · line 335
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +3
-0@@ -323,15 +326,29 @@ 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) { +static Error *local_err;
You have to initialize it to NULL.
Quoted 6 lines
hw/s390x/s390-virtio-ccw.c +4
-0int rc; +error_setg (&pv_mig_blocker, +"protected VMs are currently not migrateable." ); + rc =migrate_add_blocker (pv_mig_blocker, &local_err); +if (local_err) {
hw/s390x/s390-virtio-ccw.c static void s390_machine_unprotect(S390CcwMachineState *ms) · line 351
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +7
-0+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); +error_free_or_abort (&pv_mig_blocker);
Actually, migrate_del_blocker(pv_mig_blocker) as well, no?
Quoted 4 lines
hw/s390x/s390-virtio-ccw.c +0
-0return rc; }
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v8 03/15] s390x: protvirt: Add migration blocker
Quoted 30 lines · David Hildenbrand
Quoted 29 lines · Janosch Frank
Migration is not yet supported.
Signed-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)hw/s390x/s390-virtio-ccw.c +5
-0@@ -43,6 +43,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,29 @@ 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); }
Quoted 5 lines
hw/s390x/s390-virtio-ccw.c static void s390_machine_unprotect(S390CcwMachineState *ms) · line 335
Quoted 3 lines
hw/s390x/s390-virtio-ccw.c +1
-0static int s390_machine_protect (S390CcwMachineState *ms) { +static Error *local_err;You have to initialize it to NULL.
That's a static variable, am I missing something?
Quoted 18 lines
Quoted 7 lines
hw/s390x/s390-virtio-ccw.c +4
-0int rc; +error_setg (&pv_mig_blocker, +"protected VMs are currently not migrateable." ); + rc =migrate_add_blocker (pv_mig_blocker, &local_err); +if (local_err) {hw/s390x/s390-virtio-ccw.c static void s390_machine_unprotect(S390CcwMachineState *ms) · line 351
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +7
-0+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); +error_free_or_abort (&pv_mig_blocker);
Quoted 2 lines
Actually,
migrate_del_blocker(pv_mig_blocker)as well, no?
Ack
Quoted 6 lines
Quoted 4 lines
hw/s390x/s390-virtio-ccw.c +0
-0return rc; }
Re: [PATCH v8 03/15] s390x: protvirt: Add migration blocker
Quoted 31 lines · Janosch Frank
Quoted 30 lines · David Hildenbrand
Quoted 29 lines · Janosch Frank
Migration is not yet supported.
Signed-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)hw/s390x/s390-virtio-ccw.c +5
-0@@ -43,6 +43,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,29 @@ 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); }
Quoted 7 lines
Quoted 5 lines
hw/s390x/s390-virtio-ccw.c static void s390_machine_unprotect(S390CcwMachineState *ms) · line 335
Quoted 3 lines
hw/s390x/s390-virtio-ccw.c +1
-0static int s390_machine_protect (S390CcwMachineState *ms) { +static Error *local_err;You have to initialize it to NULL.
That's a static variable, am I missing something?
No, I was missing that :) Why is that a static variable?
git grep "static Error *" will tell you that this is not common.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v8 03/15] s390x: protvirt: Add migration blocker
Quoted 38 lines · David Hildenbrand
Quoted 37 lines · Janosch Frank
Quoted 35 lines · David Hildenbrand
Quoted 22 lines · Janosch Frank
Migration is not yet supported.
Signed-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)hw/s390x/s390-virtio-ccw.c +3
-0@@ -43,6 +43,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) {hw/s390x/s390-virtio-ccw.c static void s390_machine_unprotect(S390CcwMachineState *ms) · line 335
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +3
-0@@ -323,15 +326,29 @@ 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) { +static Error *local_err;You have to initialize it to NULL.
Quoted 6 lines
Quoted 1 line
That's a static variable, am I missing something?
No, I was missing that :) Why is that a static variable?
git grep "static Error *" will tell you that this is not common.
I'd guess I copied the other Error which is static...
So I now removed the static and set it to NULL.
PATCH v9 1/1 s390x: protvirt: Add migration blocker
In reply to David HildenbrandMigration is not yet supported.
--- hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
hw/s390x/s390-virtio-ccw.c +18 -0
@@ -43,6 +43,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 (local_err) { +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.0
Re: [PATCH v9] s390x: protvirt: Add migration blocker
Quoted 43 lines · Janosch Frank
Migration is not yet supported.
Signed-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)hw/s390x/s390-virtio-ccw.c +14
-0@@ -43,6 +43,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 (local_err) { +error_report_err (local_err); +error_free_or_abort (&pv_mig_blocker); +return rc; + }
hw/s390x/s390-virtio-ccw.c static void s390_machine_unprotect(S390CcwMachineState *ms) · line 355
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +4
-0+/* 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 · 3 lines
Thanks, David / dhildenb
PATCH v8 4/15 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 guest balloon driver will reject to work with the IOMMU change
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 | 5 +++++ 1 file changed, 5 insertions(+)
hw/s390x/s390-virtio-ccw.c +5 -0
@@ -41,6 +41,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,12 @@ static int s390_machine_protect(S390CcwMachineState *ms)static Error *local_err;int rc; +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 (local_err) { +qemu_balloon_inhibit (false);error_report_err (local_err);error_free_or_abort (&pv_mig_blocker);return rc;
@@ -347,6 +351,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);error_free_or_abort (&pv_mig_blocker);return rc;
Signature · 1 line
2.20.1
PATCH v8 5/15 s390x: protvirt: KVM intercept changes
In reply to Janosch FrankSecure guests no longer intercept with code 4 for an instruction interception. Instead they have codes 104 and 108 for secure instruction interception and secure 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:
* stpx (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)
--- 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/*
@@ -1693,6 +1695,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.20.1
Re: [PATCH v8 05/15] s390x: protvirt: KVM intercept changes
Quoted 5 lines · Janosch Frank
Secure guests no longer intercept with code 4 for an instruction interception. Instead they have codes 104 and 108 for secure instruction interception and secure instruction notification respectively.
Quoted 8 lines
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:
* stpx (To inform about the changed prefix location)
Set prefix (SPX), no?
Quoted 3 lines
* sclp (On incorrect SCCB values, so we can inject a IRQ)
* sigp (All but "stop and store status")
* diag308 (Subcodes 0/1)
Furthermore SPX is also not reaching QEMU, no? Maybe add something like
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.
With that
Quoted 30 lines
Signed-off-by Janosch Frank <[email protected]>Reviewed-by David Hildenbrand <[email protected]>--- 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/* @@ -1693,6 +1695,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 :
Re: [PATCH v8 05/15] s390x: protvirt: KVM intercept changes
Quoted 24 lines · Christian Borntraeger
Quoted 5 lines · Janosch Frank
Secure guests no longer intercept with code 4 for an instruction interception. Instead they have codes 104 and 108 for secure instruction interception and secure instruction notification respectively.
Quoted 8 lines
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:
* stpx (To inform about the changed prefix location)
Set prefix (SPX), no?
Quoted 3 lines
* sclp (On incorrect SCCB values, so we can inject a IRQ)
* sigp (All but "stop and store status")
* diag308 (Subcodes 0/1)Furthermore SPX is also not reaching QEMU, no? Maybe add something like
Quoted 7 lines
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.
With that
Reviewed-by Christian Borntraeger <[email protected]>
Sure, I'll also change secure execution to protected virtualization in the first sentence...
Quoted 32 lines
Quoted 32 lines
Signed-off-by Janosch Frank <[email protected]>Reviewed-by David Hildenbrand <[email protected]>--- 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/* @@ -1693,6 +1695,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 :
PATCH v8 6/15 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.
Also the new memops are available with KVM_CAP_S390_PROTECTED, so let's check for that.
--- target/s390x/cpu.h | 7 ++++++- target/s390x/kvm.c | 25 +++++++++++++++++++++++++ target/s390x/kvm_s390x.h | 2 ++ target/s390x/mmu_helper.c | 14 ++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-)
target/s390x/cpu.h +6 -1
@@ -824,7 +824,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 +25 -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;
@@ -346,6 +347,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 )) {
@@ -846,6 +848,29 @@ 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)); + } +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.20.1
PATCH v8 7/15 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
target/s390x/kvm.c +8 -2
@@ -1800,7 +1800,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 */
@@ -1840,7 +1842,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.20.1
PATCH v8 8/15 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 | 30 ++++++++++++++++++++++++++++++ include/hw/s390x/sclp.h | 2 ++ target/s390x/kvm.c | 24 +++++++++++++++++++----- 3 files changed, 51 insertions(+), 5 deletions(-)
hw/s390x/sclp.c +30 -0
@@ -193,6 +193,36 @@ 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 ); + +/* +* Only a very limited amount of calls is permitted by the +* Ultravisor and we support all of them, so we don't check for +* them. All other specification exceptions are also interpreted +* by the Ultravisor and hence never cause an exit we need to +* handle. +* +* Setting the CC is also done by the Ultravisor. +*/ +s390_cpu_pv_mem_read (env_archcpu (env),0 , &work_sccb, sccb_len); + sclp_c->execute (sclp, &work_sccb, code); +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 ();
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 +19 -5
@@ -1226,12 +1226,26 @@ 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); +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.20.1
PATCH v8 9/15 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 | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
target/s390x/cpu.c +13 -9
@@ -78,16 +78,20 @@ 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 { +s390_cpu_set_state (S390_CPU_STATE_LOAD , cpu); + }s390_cpu_set_state (S390_CPU_STATE_OPERATING , cpu); }#endif
Signature · 1 line
2.20.1
PATCH v8 10/15 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
@@ -87,6 +87,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) {CPUState *cs =env_cpu (env); +S390CPU *cpu =S390_CPU (cs);uint64_t addr = env->regs[r1];uint64_t subcode = env->regs[r3];IplParameterBlock *iplb;
@@ -123,13 +124,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)); + }if (!iplb_valid (iplb)) { env->regs[r1 +1 ] =DIAG_308_RC_INVALID ;
@@ -151,12 +161,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.20.1
Re: [PATCH v8 10/15] s390x: protvirt: Move diag 308 data over SIDA
Quoted 58 lines · Janosch Frank
For 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().
Signed-off-by Janosch Frank <[email protected]>--- target/s390x/diag.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)target/s390x/diag.c +14
-6@@ -87,6 +87,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) {CPUState *cs =env_cpu (env); +S390CPU *cpu =S390_CPU (cs);uint64_t addr = env->regs[r1];uint64_t subcode = env->regs[r3];IplParameterBlock *iplb;@@ -123,13 +124,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)); + }if (!iplb_valid (iplb)) { env->regs[r1 +1 ] =DIAG_308_RC_INVALID ;@@ -151,12 +161,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 ; }
target/s390x/diag.c out: · line 177
Quoted 10 lines
target/s390x/diag.c +7
-0+ +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 · 3 lines
Thanks, David / dhildenb
PATCH v8 11/15 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.
--- target/s390x/ioinst.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)
target/s390x/ioinst.c +25 -7
@@ -17,6 +17,22 @@#include "trace.h" #include "hw/s390x/s390-pci-bus.h" +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 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 +130,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 +187,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 +219,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 +250,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 +319,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 +617,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 +626,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.20.1
PATCH v8 12/15 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 | 87 ++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 26 deletions(-)
target/s390x/ioinst.c +61 -26
@@ -135,9 +135,13 @@ 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))) { -s390_cpu_virt_mem_handle_exc (cpu, ra); -return ; +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 ; + } }if (ioinst_disassemble_sch_ident (reg1, &m, &cssid, &ssid, &schid) || !ioinst_schib_valid (&schib)) {
@@ -192,9 +196,13 @@ 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))) { -s390_cpu_virt_mem_handle_exc (cpu, ra); -return ; +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 ; + } }copy_orb_from_guest (&orb, &orig_orb); if (ioinst_disassemble_sch_ident(reg1, &m, &cssid, &ssid, &schid) ||
@@ -228,14 +236,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); } }
@@ -257,6 +270,9 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, uint32_t ipb, }if (ioinst_disassemble_sch_ident (reg1, &m, &cssid, &ssid, &schid)) { +if (s390_is_pv ()) { +return ; + }/* * As operand exceptions have a lower priority than access exceptions, * we check whether the memory area is writeable (injecting the
@@ -289,14 +305,19 @@ 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 ) { -s390_cpu_virt_mem_handle_exc (cpu, ra); -return ; +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 ; }
@@ -333,15 +354,20 @@ 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 ) { -s390_cpu_virt_mem_handle_exc (cpu, ra); -return -EFAULT ; +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 ; + } }css_do_tsch_update_subch (sch); }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 ; }
@@ -639,9 +665,13 @@ 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))) { -s390_cpu_virt_mem_handle_exc (cpu, ra); -return ; +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 ; + } } req = (ChscReq *)buf; len =be16_to_cpu (req->len);
@@ -672,11 +702,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.20.1
PATCH v8 13/15 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 | 5 +++++ 1 file changed, 5 insertions(+)
target/s390x/helper.c +5 -0
@@ -246,6 +246,11 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)hwaddr len =sizeof (*sa);int i; +/* Storing will occur on next SIE entry for protected VMs */ +if (s390_is_pv ()) { +return 0 ; + } + sa =cpu_physical_memory_map (addr, &len, true);if (!sa) {return -EFAULT ;
Signature · 1 line
2.20.1
PATCH v8 14/15 docs: Add protvirt docs
In reply to Janosch FrankLets add some documentation for the Protected VM functionality.
--- docs/system/index.rst | 1 + docs/system/protvirt.rst | 56 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 docs/system/protvirt.rst
docs/system/index.rst +1 -0
@@ -34,3 +34,4 @@ Contents: deprecated build-platforms license + protvirt
docs/system/protvirt.rst new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v8 15/15 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:
* Passthrough devices
* Migration
* Huge page backings
--- target/s390x/gen-features.c | 1 + target/s390x/kvm.c | 5 +++++ 2 files changed, 6 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 +5 -0
@@ -2402,6 +2402,11 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp)clear_bit (S390_FEAT_BPB , model->features); } +/* we do have the IPL enhancements */ +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.20.1