| Message ID | 20200304114231.23493-4-frankja@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: Protected Virtualization support | expand |
On 04.03.20 12:42, Janosch Frank wrote: > When a guest has saved a ipib of type 5 and calls diagnose308 with s/a/an/ > subcode 10, we have to setup the protected processing environment via > Ultravisor calls. The calls are done by KVM and are exposed via an > API. > > The following steps are necessary: > 1. Enable protected mode for the VM (register it and its cpus with the Ultravisor) > 2. Forward the secure header to the Ultravisor (has all information on > how to decrypt the image and VM information) > 3. Protect image pages from the host and decrypt them > 4. Verify the image integrity > > Only after step 4 a protected VM is allowed to run. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [Changes > to machine] > --- > hw/s390x/Makefile.objs | 1 + > hw/s390x/ipl.c | 33 +++++++++ > hw/s390x/ipl.h | 2 + > hw/s390x/pv.c | 106 ++++++++++++++++++++++++++++ > hw/s390x/pv.h | 34 +++++++++ > hw/s390x/s390-virtio-ccw.c | 91 ++++++++++++++++++++++++ > include/hw/s390x/s390-virtio-ccw.h | 1 + > target/s390x/cpu.c | 4 ++ > target/s390x/cpu.h | 1 + > target/s390x/cpu_features_def.inc.h | 1 + > 10 files changed, 274 insertions(+) > create mode 100644 hw/s390x/pv.c > create mode 100644 hw/s390x/pv.h [...] > > #define KERN_IMAGE_START 0x010000UL > #define LINUX_MAGIC_ADDR 0x010008UL > @@ -676,6 +677,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) > cpu_physical_memory_unmap(addr, len, 1, len); > } > > +int s390_ipl_prepare_pv_header(void) > +{ > + S390IPLState *ipl = get_ipl_device(); > + IPLBlockPV *ipib_pv = &ipl->iplb_pv.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) > +{ > + int i, rc = 0; > + S390IPLState *ipl = get_ipl_device(); > + IPLBlockPV *ipib_pv = &ipl->iplb_pv.pv; > + > + 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; > + } You can check for " && !rc" in the loop condition > + } > + return rc; > +} > + > void s390_ipl_prepare_cpu(S390CPU *cpu) > { > S390IPLState *ipl = get_ipl_device(); > diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h > index 04be63cee1..ad8090a02c 100644 > --- a/hw/s390x/ipl.h > +++ b/hw/s390x/ipl.h > @@ -105,6 +105,8 @@ typedef union IplParameterBlock IplParameterBlock; > int s390_ipl_set_loadparm(uint8_t *loadparm); > int s390_ipl_pv_check_components(IplParameterBlock *iplb); > 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_secure(void); > diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c > new file mode 100644 > index 0000000000..50b68b6c34 > --- /dev/null > +++ b/hw/s390x/pv.c > @@ -0,0 +1,106 @@ > +/* > + * Secure execution functions > + * > + * Copyright IBM Corp. 2020 > + * Author(s): > + * Janosch Frank <frankja@linux.ibm.com> > + * > + * 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 <sys/ioctl.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", > + "VM_UNSHARE_ALL", > + NULL Is the NULL really needed? This will be somewhat error prone when we add new PV commands. Not sure if guarding this by an access function (chack against ARRAY_SIZE() makes sense). > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index a89cf4c129..dd39890f89 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -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) > { > @@ -238,9 +240,11 @@ static void s390_create_sclpconsole(const char *type, Chardev *chardev) > static void ccw_init(MachineState *machine) > { > int ret; > + S390CcwMachineState *ms = S390_CCW_MACHINE(machine); > VirtualCssBus *css_bus; > DeviceState *dev; > > + ms->pv = false; Should not be necessary, default is false. > s390_sclp_init(); > /* init memory + setup max page size. Required for the CPU model */ > s390_memory_init(machine->ram); > @@ -316,10 +320,75 @@ 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) > +{ > + CPUState *t; > + > + if (!ms->pv) > + return; How can this ever happen? g_assert(ms->pv) ? Also, i don't see this function getting called from anywhere else except when s390_machine_protect() fails. That looks wrong. This has to be called when going out of PV mode. > + s390_pv_vm_disable(); > + CPU_FOREACH(t) { > + S390_CPU(t)->env.pv = false; > + } > + ms->pv = false; > +} > + > +static int s390_machine_protect(S390CcwMachineState *ms) > +{ > + CPUState *t; > + int rc; > + g_assert(!ms->pv) ? > + /* Create SE VM */ > + rc = s390_pv_vm_enable(); > + if (rc) { > + return rc; > + } > + > + CPU_FOREACH(t) { > + S390_CPU(t)->env.pv = true; > + } > + ms->pv = true; > + > + /* Set SE header and unpack */ > + rc = s390_ipl_prepare_pv_header(); > + if (rc) { > + goto out_err; > + } > + > + /* Decrypt image */ > + rc = s390_ipl_pv_unpack(); > + if (rc) { > + goto out_err; > + } > + > + /* Verify integrity */ > + rc = s390_pv_verify(); > + if (rc) { > + goto out_err; > + } > + return rc; > + > +out_err: > + s390_machine_unprotect(ms); > + return rc; > +} > + > +#define DIAG_308_RC_INVAL_FOR_PV 0x0a02 > +static void s390_machine_inject_pv_error(CPUState *cs) > +{ > + int r1 = (cs->kvm_run->s390_sieic.ipa & 0x00f0) >> 4; > + CPUS390XState *env = &S390_CPU(cs)->env; > + > + /* Report that we are unable to enter protected mode */ > + env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV; > +} > + [...] > switch (reset_type) { > case S390_RESET_EXTERNAL: > case S390_RESET_REIPL: > @@ -353,6 +424,26 @@ static void s390_machine_reset(MachineState *machine) > } > subsystem_reset(); > run_on_cpu(cs, s390_do_cpu_initial_reset, RUN_ON_CPU_NULL); > + run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); This does look unrelated and wrong? > + break; > + case S390_RESET_PV: /* Subcode 10 */ > + subsystem_reset(); > + s390_crypto_reset(); > + > + CPU_FOREACH(t) { > + if (t == cs) { > + continue; > + } > + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); > + } > + run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); > + > + if (s390_machine_protect(ms)) { > + s390_machine_inject_pv_error(cs); Ah, so it's not an actual exception. BUT: All other guest cpus were reset, can the guest deal with that? (run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL) should go after the s390_machine_protect() I assume - the change you had in the other patch) > + s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); > + return; > + } > + > run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); > break; > default:
On 04.03.20 12:42, Janosch Frank wrote: > When a guest has saved a ipib of type 5 and calls diagnose308 with > subcode 10, we have to setup the protected processing environment via > Ultravisor calls. The calls are done by KVM and are exposed via an > API. > > The following steps are necessary: > 1. Enable protected mode for the VM (register it and its cpus with the Ultravisor) > 2. Forward the secure header to the Ultravisor (has all information on > how to decrypt the image and VM information) > 3. Protect image pages from the host and decrypt them > 4. Verify the image integrity > > Only after step 4 a protected VM is allowed to run. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [Changes > to machine] > --- > hw/s390x/Makefile.objs | 1 + > hw/s390x/ipl.c | 33 +++++++++ > hw/s390x/ipl.h | 2 + > hw/s390x/pv.c | 106 ++++++++++++++++++++++++++++ > hw/s390x/pv.h | 34 +++++++++ > hw/s390x/s390-virtio-ccw.c | 91 ++++++++++++++++++++++++ > include/hw/s390x/s390-virtio-ccw.h | 1 + > target/s390x/cpu.c | 4 ++ > target/s390x/cpu.h | 1 + > target/s390x/cpu_features_def.inc.h | 1 + > 10 files changed, 274 insertions(+) > create mode 100644 hw/s390x/pv.c > create mode 100644 hw/s390x/pv.h > > diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs > index e02ed80b68..a46a1c7894 100644 > --- a/hw/s390x/Makefile.objs > +++ b/hw/s390x/Makefile.objs > @@ -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 > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index 80c6ab233a..3b241ea549 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -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 > @@ -676,6 +677,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) > cpu_physical_memory_unmap(addr, len, 1, len); > } > > +int s390_ipl_prepare_pv_header(void) > +{ > + S390IPLState *ipl = get_ipl_device(); > + IPLBlockPV *ipib_pv = &ipl->iplb_pv.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) > +{ > + int i, rc = 0; > + S390IPLState *ipl = get_ipl_device(); > + IPLBlockPV *ipib_pv = &ipl->iplb_pv.pv; > + > + 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(); > diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h > index 04be63cee1..ad8090a02c 100644 > --- a/hw/s390x/ipl.h > +++ b/hw/s390x/ipl.h > @@ -105,6 +105,8 @@ typedef union IplParameterBlock IplParameterBlock; > int s390_ipl_set_loadparm(uint8_t *loadparm); > int s390_ipl_pv_check_components(IplParameterBlock *iplb); > 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_secure(void); > diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c > new file mode 100644 > index 0000000000..50b68b6c34 > --- /dev/null > +++ b/hw/s390x/pv.c > @@ -0,0 +1,106 @@ > +/* > + * Secure execution functions > + * > + * Copyright IBM Corp. 2020 > + * Author(s): > + * Janosch Frank <frankja@linux.ibm.com> > + * > + * 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 <sys/ioctl.h> Do you really need that include? You're using kvm_vm_ioctl().
On 3/5/20 2:51 PM, David Hildenbrand wrote: > On 04.03.20 12:42, Janosch Frank wrote: >> When a guest has saved a ipib of type 5 and calls diagnose308 with > > s/a/an/ > >> subcode 10, we have to setup the protected processing environment via >> Ultravisor calls. The calls are done by KVM and are exposed via an >> API. >> >> The following steps are necessary: >> 1. Enable protected mode for the VM (register it and its cpus with the Ultravisor) >> 2. Forward the secure header to the Ultravisor (has all information on >> how to decrypt the image and VM information) >> 3. Protect image pages from the host and decrypt them >> 4. Verify the image integrity >> >> Only after step 4 a protected VM is allowed to run. >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [Changes >> to machine] >> --- >> hw/s390x/Makefile.objs | 1 + >> hw/s390x/ipl.c | 33 +++++++++ >> hw/s390x/ipl.h | 2 + >> hw/s390x/pv.c | 106 ++++++++++++++++++++++++++++ >> hw/s390x/pv.h | 34 +++++++++ >> hw/s390x/s390-virtio-ccw.c | 91 ++++++++++++++++++++++++ >> include/hw/s390x/s390-virtio-ccw.h | 1 + >> target/s390x/cpu.c | 4 ++ >> target/s390x/cpu.h | 1 + >> target/s390x/cpu_features_def.inc.h | 1 + >> 10 files changed, 274 insertions(+) >> create mode 100644 hw/s390x/pv.c >> create mode 100644 hw/s390x/pv.h > > [...] > >> >> #define KERN_IMAGE_START 0x010000UL >> #define LINUX_MAGIC_ADDR 0x010008UL >> @@ -676,6 +677,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) >> cpu_physical_memory_unmap(addr, len, 1, len); >> } >> >> +int s390_ipl_prepare_pv_header(void) >> +{ >> + S390IPLState *ipl = get_ipl_device(); >> + IPLBlockPV *ipib_pv = &ipl->iplb_pv.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) >> +{ >> + int i, rc = 0; >> + S390IPLState *ipl = get_ipl_device(); >> + IPLBlockPV *ipib_pv = &ipl->iplb_pv.pv; >> + >> + 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; >> + } > > You can check for " && !rc" in the loop condition Not sure if that would make it more readable... > >> + } >> + return rc; >> +} >> + >> void s390_ipl_prepare_cpu(S390CPU *cpu) >> { >> S390IPLState *ipl = get_ipl_device(); >> diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h >> index 04be63cee1..ad8090a02c 100644 >> --- a/hw/s390x/ipl.h >> +++ b/hw/s390x/ipl.h >> @@ -105,6 +105,8 @@ typedef union IplParameterBlock IplParameterBlock; >> int s390_ipl_set_loadparm(uint8_t *loadparm); >> int s390_ipl_pv_check_components(IplParameterBlock *iplb); >> 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_secure(void); >> diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c >> new file mode 100644 >> index 0000000000..50b68b6c34 >> --- /dev/null >> +++ b/hw/s390x/pv.c >> @@ -0,0 +1,106 @@ >> +/* >> + * Secure execution functions >> + * >> + * Copyright IBM Corp. 2020 >> + * Author(s): >> + * Janosch Frank <frankja@linux.ibm.com> >> + * >> + * 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 <sys/ioctl.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", >> + "VM_UNSHARE_ALL", >> + NULL > > Is the NULL really needed? This will be somewhat error prone when we add > new PV commands. Not sure if guarding this by an access function (chack > against ARRAY_SIZE() makes sense). > >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >> index a89cf4c129..dd39890f89 100644 >> --- a/hw/s390x/s390-virtio-ccw.c >> +++ b/hw/s390x/s390-virtio-ccw.c >> @@ -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) >> { >> @@ -238,9 +240,11 @@ static void s390_create_sclpconsole(const char *type, Chardev *chardev) >> static void ccw_init(MachineState *machine) >> { >> int ret; >> + S390CcwMachineState *ms = S390_CCW_MACHINE(machine); >> VirtualCssBus *css_bus; >> DeviceState *dev; >> >> + ms->pv = false; > > Should not be necessary, default is false. ok > >> s390_sclp_init(); >> /* init memory + setup max page size. Required for the CPU model */ >> s390_memory_init(machine->ram); >> @@ -316,10 +320,75 @@ 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) >> +{ >> + CPUState *t; >> + >> + if (!ms->pv) >> + return; > > How can this ever happen? g_assert(ms->pv) ? Currently not, that's only used in the follow up patches with the ballon and migration blocker > > Also, i don't see this function getting called from anywhere else except > when s390_machine_protect() fails. That looks wrong. This has to be > called when going out of PV mode. Yes, but that's in the diag308 1-4 patch. > > >> + s390_pv_vm_disable(); >> + CPU_FOREACH(t) { >> + S390_CPU(t)->env.pv = false; >> + } >> + ms->pv = false; >> +} >> + >> +static int s390_machine_protect(S390CcwMachineState *ms) >> +{ >> + CPUState *t; >> + int rc; >> + > > g_assert(!ms->pv) ? Ok > >> + /* Create SE VM */ >> + rc = s390_pv_vm_enable(); >> + if (rc) { >> + return rc; >> + } >> + >> + CPU_FOREACH(t) { >> + S390_CPU(t)->env.pv = true; >> + } >> + ms->pv = true; >> + >> + /* Set SE header and unpack */ >> + rc = s390_ipl_prepare_pv_header(); >> + if (rc) { >> + goto out_err; >> + } >> + >> + /* Decrypt image */ >> + rc = s390_ipl_pv_unpack(); >> + if (rc) { >> + goto out_err; >> + } >> + >> + /* Verify integrity */ >> + rc = s390_pv_verify(); >> + if (rc) { >> + goto out_err; >> + } >> + return rc; >> + >> +out_err: >> + s390_machine_unprotect(ms); >> + return rc; >> +} >> + >> +#define DIAG_308_RC_INVAL_FOR_PV 0x0a02 >> +static void s390_machine_inject_pv_error(CPUState *cs) >> +{ >> + int r1 = (cs->kvm_run->s390_sieic.ipa & 0x00f0) >> 4; >> + CPUS390XState *env = &S390_CPU(cs)->env; >> + >> + /* Report that we are unable to enter protected mode */ >> + env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV; >> +} >> + > > [...] >> switch (reset_type) { >> case S390_RESET_EXTERNAL: >> case S390_RESET_REIPL: >> @@ -353,6 +424,26 @@ static void s390_machine_reset(MachineState *machine) >> } >> subsystem_reset(); >> run_on_cpu(cs, s390_do_cpu_initial_reset, RUN_ON_CPU_NULL); >> + run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); > > This does look unrelated and wrong? Indeed, that looks dodgy > >> + break; >> + case S390_RESET_PV: /* Subcode 10 */ >> + subsystem_reset(); >> + s390_crypto_reset(); >> + >> + CPU_FOREACH(t) { >> + if (t == cs) { >> + continue; >> + } >> + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); >> + } >> + run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); >> + >> + if (s390_machine_protect(ms)) { >> + s390_machine_inject_pv_error(cs); > > Ah, so it's not an actual exception. BUT: All other guest cpus were > reset, can the guest deal with that? Well, all other CPUs should be stopped for diag308, no? Also it's done by the bootloader and not a OS which just stops its cpus and goes into protected mode. > > (run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL) should go after the > s390_machine_protect() I assume - the change you had in the other patch) That's not a good idea, I want to reset before we automatically call the UV routines on a reset. > >> + s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); >> + return; >> + } >> + >> run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); >> break; >> default: > >
>>> >>> +static void s390_machine_unprotect(S390CcwMachineState *ms) >>> +{ >>> + CPUState *t; >>> + >>> + if (!ms->pv) >>> + return; >> >> How can this ever happen? g_assert(ms->pv) ? > > Currently not, that's only used in the follow up patches with the ballon > and migration blocker Even then, why should we unprotect when not protected. That looks wrong to me and has to be fixed in the other patches, > >> >> Also, i don't see this function getting called from anywhere else except >> when s390_machine_protect() fails. That looks wrong. This has to be >> called when going out of PV mode. > > Yes, but that's in the diag308 1-4 patch. The way patches were split up is somewhat sub-optimal for review. [...] >>> + break; >>> + case S390_RESET_PV: /* Subcode 10 */ >>> + subsystem_reset(); >>> + s390_crypto_reset(); >>> + >>> + CPU_FOREACH(t) { >>> + if (t == cs) { >>> + continue; >>> + } >>> + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); >>> + } >>> + run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); >>> + >>> + if (s390_machine_protect(ms)) { >>> + s390_machine_inject_pv_error(cs); >> >> Ah, so it's not an actual exception. BUT: All other guest cpus were >> reset, can the guest deal with that? > > Well, all other CPUs should be stopped for diag308, no? > Also it's done by the bootloader and not a OS which just stops its cpus > and goes into protected mode. > >> >> (run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL) should go after the >> s390_machine_protect() I assume - the change you had in the other patch) > > That's not a good idea, I want to reset before we automatically call the > UV routines on a reset. But how can s390_machine_inject_pv_error(cs) be any effective if you already reset the CPU?
On 3/5/20 2:52 PM, David Hildenbrand wrote: > On 04.03.20 12:42, Janosch Frank wrote: >> When a guest has saved a ipib of type 5 and calls diagnose308 with >> subcode 10, we have to setup the protected processing environment via >> Ultravisor calls. The calls are done by KVM and are exposed via an >> API. >> >> The following steps are necessary: >> 1. Enable protected mode for the VM (register it and its cpus with the Ultravisor) >> 2. Forward the secure header to the Ultravisor (has all information on >> how to decrypt the image and VM information) >> 3. Protect image pages from the host and decrypt them >> 4. Verify the image integrity >> >> Only after step 4 a protected VM is allowed to run. >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> [Changes >> to machine] >> --- >> hw/s390x/Makefile.objs | 1 + >> hw/s390x/ipl.c | 33 +++++++++ >> hw/s390x/ipl.h | 2 + >> hw/s390x/pv.c | 106 ++++++++++++++++++++++++++++ >> hw/s390x/pv.h | 34 +++++++++ >> hw/s390x/s390-virtio-ccw.c | 91 ++++++++++++++++++++++++ >> include/hw/s390x/s390-virtio-ccw.h | 1 + >> target/s390x/cpu.c | 4 ++ >> target/s390x/cpu.h | 1 + >> target/s390x/cpu_features_def.inc.h | 1 + >> 10 files changed, 274 insertions(+) >> create mode 100644 hw/s390x/pv.c >> create mode 100644 hw/s390x/pv.h >> >> diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs >> index e02ed80b68..a46a1c7894 100644 >> --- a/hw/s390x/Makefile.objs >> +++ b/hw/s390x/Makefile.objs >> @@ -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 >> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c >> index 80c6ab233a..3b241ea549 100644 >> --- a/hw/s390x/ipl.c >> +++ b/hw/s390x/ipl.c >> @@ -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 >> @@ -676,6 +677,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) >> cpu_physical_memory_unmap(addr, len, 1, len); >> } >> >> +int s390_ipl_prepare_pv_header(void) >> +{ >> + S390IPLState *ipl = get_ipl_device(); >> + IPLBlockPV *ipib_pv = &ipl->iplb_pv.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) >> +{ >> + int i, rc = 0; >> + S390IPLState *ipl = get_ipl_device(); >> + IPLBlockPV *ipib_pv = &ipl->iplb_pv.pv; >> + >> + 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(); >> diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h >> index 04be63cee1..ad8090a02c 100644 >> --- a/hw/s390x/ipl.h >> +++ b/hw/s390x/ipl.h >> @@ -105,6 +105,8 @@ typedef union IplParameterBlock IplParameterBlock; >> int s390_ipl_set_loadparm(uint8_t *loadparm); >> int s390_ipl_pv_check_components(IplParameterBlock *iplb); >> 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_secure(void); >> diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c >> new file mode 100644 >> index 0000000000..50b68b6c34 >> --- /dev/null >> +++ b/hw/s390x/pv.c >> @@ -0,0 +1,106 @@ >> +/* >> + * Secure execution functions >> + * >> + * Copyright IBM Corp. 2020 >> + * Author(s): >> + * Janosch Frank <frankja@linux.ibm.com> >> + * >> + * 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 <sys/ioctl.h> > > Do you really need that include? You're using kvm_vm_ioctl(). > Compiles without it, so I removed it :)
On 3/5/20 3:15 PM, David Hildenbrand wrote: >>>> >>>> +static void s390_machine_unprotect(S390CcwMachineState *ms) >>>> +{ >>>> + CPUState *t; >>>> + >>>> + if (!ms->pv) >>>> + return; >>> >>> How can this ever happen? g_assert(ms->pv) ? >> >> Currently not, that's only used in the follow up patches with the ballon >> and migration blocker > > Even then, why should we unprotect when not protected. That looks wrong > to me and has to be fixed in the other patches, I fixed it this morning :) > >> >>> >>> Also, i don't see this function getting called from anywhere else except >>> when s390_machine_protect() fails. That looks wrong. This has to be >>> called when going out of PV mode. >> >> Yes, but that's in the diag308 1-4 patch. > > The way patches were split up is somewhat sub-optimal for review. Thanks I'll try to find a better split up of the code > > [...] > >>>> + break; >>>> + case S390_RESET_PV: /* Subcode 10 */ >>>> + subsystem_reset(); >>>> + s390_crypto_reset(); >>>> + >>>> + CPU_FOREACH(t) { >>>> + if (t == cs) { >>>> + continue; >>>> + } >>>> + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); >>>> + } >>>> + run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); >>>> + >>>> + if (s390_machine_protect(ms)) { >>>> + s390_machine_inject_pv_error(cs); >>> >>> Ah, so it's not an actual exception. BUT: All other guest cpus were >>> reset, can the guest deal with that? >> >> Well, all other CPUs should be stopped for diag308, no? >> Also it's done by the bootloader and not a OS which just stops its cpus >> and goes into protected mode. >> >>> >>> (run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL) should go after the >>> s390_machine_protect() I assume - the change you had in the other patch) >> >> That's not a good idea, I want to reset before we automatically call the >> UV routines on a reset. > > But how can s390_machine_inject_pv_error(cs) be any effective if you > already reset the CPU? > Because a normal cpu reset does not clear out the registers.
On 05.03.20 15:20, Janosch Frank wrote: > On 3/5/20 3:15 PM, David Hildenbrand wrote: >>>>> >>>>> +static void s390_machine_unprotect(S390CcwMachineState *ms) >>>>> +{ >>>>> + CPUState *t; >>>>> + >>>>> + if (!ms->pv) >>>>> + return; >>>> >>>> How can this ever happen? g_assert(ms->pv) ? >>> >>> Currently not, that's only used in the follow up patches with the ballon >>> and migration blocker >> >> Even then, why should we unprotect when not protected. That looks wrong >> to me and has to be fixed in the other patches, > > I fixed it this morning :) > >> >>> >>>> >>>> Also, i don't see this function getting called from anywhere else except >>>> when s390_machine_protect() fails. That looks wrong. This has to be >>>> called when going out of PV mode. >>> >>> Yes, but that's in the diag308 1-4 patch. >> >> The way patches were split up is somewhat sub-optimal for review. > > Thanks > I'll try to find a better split up of the code > >> >> [...] >> >>>>> + break; >>>>> + case S390_RESET_PV: /* Subcode 10 */ >>>>> + subsystem_reset(); >>>>> + s390_crypto_reset(); >>>>> + >>>>> + CPU_FOREACH(t) { >>>>> + if (t == cs) { >>>>> + continue; >>>>> + } >>>>> + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); >>>>> + } >>>>> + run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); >>>>> + >>>>> + if (s390_machine_protect(ms)) { >>>>> + s390_machine_inject_pv_error(cs); >>>> >>>> Ah, so it's not an actual exception. BUT: All other guest cpus were >>>> reset, can the guest deal with that? >>> >>> Well, all other CPUs should be stopped for diag308, no? >>> Also it's done by the bootloader and not a OS which just stops its cpus >>> and goes into protected mode. >>> >>>> >>>> (run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL) should go after the >>>> s390_machine_protect() I assume - the change you had in the other patch) >>> >>> That's not a good idea, I want to reset before we automatically call the >>> UV routines on a reset. >> >> But how can s390_machine_inject_pv_error(cs) be any effective if you >> already reset the CPU? >> > > Because a normal cpu reset does not clear out the registers. Okay, so a guest (e.g., Linux) can deal with some other things getting reset I assume?
On 3/5/20 3:23 PM, David Hildenbrand wrote: > On 05.03.20 15:20, Janosch Frank wrote: >> On 3/5/20 3:15 PM, David Hildenbrand wrote: >>>>>> >>>>>> +static void s390_machine_unprotect(S390CcwMachineState *ms) >>>>>> +{ >>>>>> + CPUState *t; >>>>>> + >>>>>> + if (!ms->pv) >>>>>> + return; >>>>> >>>>> How can this ever happen? g_assert(ms->pv) ? >>>> >>>> Currently not, that's only used in the follow up patches with the ballon >>>> and migration blocker >>> >>> Even then, why should we unprotect when not protected. That looks wrong >>> to me and has to be fixed in the other patches, >> >> I fixed it this morning :) >> >>> >>>> >>>>> >>>>> Also, i don't see this function getting called from anywhere else except >>>>> when s390_machine_protect() fails. That looks wrong. This has to be >>>>> called when going out of PV mode. >>>> >>>> Yes, but that's in the diag308 1-4 patch. >>> >>> The way patches were split up is somewhat sub-optimal for review. >> >> Thanks >> I'll try to find a better split up of the code >> >>> >>> [...] >>> >>>>>> + break; >>>>>> + case S390_RESET_PV: /* Subcode 10 */ >>>>>> + subsystem_reset(); >>>>>> + s390_crypto_reset(); >>>>>> + >>>>>> + CPU_FOREACH(t) { >>>>>> + if (t == cs) { >>>>>> + continue; >>>>>> + } >>>>>> + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); >>>>>> + } >>>>>> + run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); >>>>>> + >>>>>> + if (s390_machine_protect(ms)) { >>>>>> + s390_machine_inject_pv_error(cs); >>>>> >>>>> Ah, so it's not an actual exception. BUT: All other guest cpus were >>>>> reset, can the guest deal with that? >>>> >>>> Well, all other CPUs should be stopped for diag308, no? >>>> Also it's done by the bootloader and not a OS which just stops its cpus >>>> and goes into protected mode. >>>> >>>>> >>>>> (run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL) should go after the >>>>> s390_machine_protect() I assume - the change you had in the other patch) >>>> >>>> That's not a good idea, I want to reset before we automatically call the >>>> UV routines on a reset. >>> >>> But how can s390_machine_inject_pv_error(cs) be any effective if you >>> already reset the CPU? >>> >> >> Because a normal cpu reset does not clear out the registers. > > Okay, so a guest (e.g., Linux) can deal with some other things getting > reset I assume? At this point in time only the bootloader runs, which survives a normal reset.
On 04.03.20 12:42, Janosch Frank wrote: [...] > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index 3dd396e870..69b1cc5dfc 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -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" > @@ -191,6 +193,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > > #if !defined(CONFIG_USER_ONLY) > MachineState *ms = MACHINE(qdev_get_machine()); > + S390CcwMachineState *ccw = S390_CCW_MACHINE(ms); > unsigned int max_cpus = ms->smp.max_cpus; > if (cpu->env.core_id >= max_cpus) { > error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 I messed this up and this can break for the none machine. Something like this on top: diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7840e784f1..1b42b0fa25 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -181,6 +181,18 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) info->print_insn = print_insn_s390; } +static bool machine_is_pv(MachineState *ms) +{ + Object *obj; + + /* we have to bail out for the "none" machine */ + obj = object_dynamic_cast(OBJECT(ms), TYPE_S390_CCW_MACHINE); + if (!obj) { + return false; + } + return S390_CCW_MACHINE(obj)->pv; +} + static void s390_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); @@ -198,7 +210,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) #if !defined(CONFIG_USER_ONLY) MachineState *ms = MACHINE(qdev_get_machine()); - S390CcwMachineState *ccw = S390_CCW_MACHINE(ms); unsigned int max_cpus = ms->smp.max_cpus; if (cpu->env.core_id >= max_cpus) { error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 @@ -213,7 +224,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) goto out; } - cpu->env.pv = ccw->pv; + cpu->env.pv = machine_is_pv(ms); /* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */ cs->cpu_index = cpu->env.core_id; #endif
On 3/6/20 12:48 PM, Christian Borntraeger wrote: > > > On 04.03.20 12:42, Janosch Frank wrote: > [...] >> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c >> index 3dd396e870..69b1cc5dfc 100644 >> --- a/target/s390x/cpu.c >> +++ b/target/s390x/cpu.c >> @@ -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" >> @@ -191,6 +193,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) >> >> #if !defined(CONFIG_USER_ONLY) >> MachineState *ms = MACHINE(qdev_get_machine()); >> + S390CcwMachineState *ccw = S390_CCW_MACHINE(ms); >> unsigned int max_cpus = ms->smp.max_cpus; >> if (cpu->env.core_id >= max_cpus) { >> error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 > > I messed this up and this can break for the none machine. > > Something like this on top: Christian and I found out that we also need to fence CONFIG_USER_ONLY, so machine_is_pv is now in an ifdef and I squashed the changes into the support unpack facility patch. CI is now happy again ;-) > > > > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index 7840e784f1..1b42b0fa25 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -181,6 +181,18 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) > info->print_insn = print_insn_s390; > } > > +static bool machine_is_pv(MachineState *ms) > +{ > + Object *obj; > + > + /* we have to bail out for the "none" machine */ > + obj = object_dynamic_cast(OBJECT(ms), TYPE_S390_CCW_MACHINE); > + if (!obj) { > + return false; > + } > + return S390_CCW_MACHINE(obj)->pv; > +} > + > static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > { > CPUState *cs = CPU(dev); > @@ -198,7 +210,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > > #if !defined(CONFIG_USER_ONLY) > MachineState *ms = MACHINE(qdev_get_machine()); > - S390CcwMachineState *ccw = S390_CCW_MACHINE(ms); > unsigned int max_cpus = ms->smp.max_cpus; > if (cpu->env.core_id >= max_cpus) { > error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 > @@ -213,7 +224,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > goto out; > } > > - cpu->env.pv = ccw->pv; > + cpu->env.pv = machine_is_pv(ms); > /* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */ > cs->cpu_index = cpu->env.core_id; > #endif > >
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index e02ed80b68..a46a1c7894 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -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 diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 80c6ab233a..3b241ea549 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -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 @@ -676,6 +677,38 @@ static void s390_ipl_prepare_qipl(S390CPU *cpu) cpu_physical_memory_unmap(addr, len, 1, len); } +int s390_ipl_prepare_pv_header(void) +{ + S390IPLState *ipl = get_ipl_device(); + IPLBlockPV *ipib_pv = &ipl->iplb_pv.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) +{ + int i, rc = 0; + S390IPLState *ipl = get_ipl_device(); + IPLBlockPV *ipib_pv = &ipl->iplb_pv.pv; + + 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(); diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index 04be63cee1..ad8090a02c 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -105,6 +105,8 @@ typedef union IplParameterBlock IplParameterBlock; int s390_ipl_set_loadparm(uint8_t *loadparm); int s390_ipl_pv_check_components(IplParameterBlock *iplb); 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_secure(void); diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c new file mode 100644 index 0000000000..50b68b6c34 --- /dev/null +++ b/hw/s390x/pv.c @@ -0,0 +1,106 @@ +/* + * Secure execution functions + * + * Copyright IBM Corp. 2020 + * Author(s): + * Janosch Frank <frankja@linux.ibm.com> + * + * 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 <sys/ioctl.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", + "VM_UNSHARE_ALL", + NULL +}; + +static int s390_pv_cmd(uint32_t cmd, void *data) +{ + int rc; + struct kvm_pv_cmd pv_cmd = { + .cmd = cmd, + .data = (uint64_t)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, + rc); + } + return rc; +} + +static void s390_pv_cmd_exit(uint32_t cmd, void *data) +{ + int rc; + + rc = s390_pv_cmd(cmd, data); + if (rc) { + exit(1); + } +} + +int s390_pv_vm_enable(void) +{ + return s390_pv_cmd(KVM_PV_ENABLE, NULL); +} + +void s390_pv_vm_disable(void) +{ + s390_pv_cmd_exit(KVM_PV_DISABLE, NULL); +} + +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); +} + +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); +} diff --git a/hw/s390x/pv.h b/hw/s390x/pv.h new file mode 100644 index 0000000000..e58fbca96a --- /dev/null +++ b/hw/s390x/pv.h @@ -0,0 +1,34 @@ +/* + * Protected Virtualization header + * + * Copyright IBM Corp. 2020 + * Author(s): + * Janosch Frank <frankja@linux.ibm.com> + * + * 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 */ diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a89cf4c129..dd39890f89 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -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) { @@ -238,9 +240,11 @@ static void s390_create_sclpconsole(const char *type, Chardev *chardev) static void ccw_init(MachineState *machine) { int ret; + S390CcwMachineState *ms = S390_CCW_MACHINE(machine); VirtualCssBus *css_bus; DeviceState *dev; + ms->pv = false; s390_sclp_init(); /* init memory + setup max page size. Required for the CPU model */ s390_memory_init(machine->ram); @@ -316,10 +320,75 @@ 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) +{ + CPUState *t; + + if (!ms->pv) + return; + s390_pv_vm_disable(); + CPU_FOREACH(t) { + S390_CPU(t)->env.pv = false; + } + ms->pv = false; +} + +static int s390_machine_protect(S390CcwMachineState *ms) +{ + CPUState *t; + int rc; + + /* Create SE VM */ + rc = s390_pv_vm_enable(); + if (rc) { + return rc; + } + + CPU_FOREACH(t) { + S390_CPU(t)->env.pv = true; + } + ms->pv = true; + + /* Set SE header and unpack */ + rc = s390_ipl_prepare_pv_header(); + if (rc) { + goto out_err; + } + + /* Decrypt image */ + rc = s390_ipl_pv_unpack(); + if (rc) { + goto out_err; + } + + /* Verify integrity */ + rc = s390_pv_verify(); + if (rc) { + goto out_err; + } + return rc; + +out_err: + s390_machine_unprotect(ms); + return rc; +} + +#define DIAG_308_RC_INVAL_FOR_PV 0x0a02 +static void s390_machine_inject_pv_error(CPUState *cs) +{ + int r1 = (cs->kvm_run->s390_sieic.ipa & 0x00f0) >> 4; + CPUS390XState *env = &S390_CPU(cs)->env; + + /* Report that we are unable to enter protected mode */ + env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV; +} + static void s390_machine_reset(MachineState *machine) { enum s390_reset reset_type; CPUState *cs, *t; + S390CPU *cpu; + S390CcwMachineState *ms = S390_CCW_MACHINE(machine); /* get the reset parameters, reset them once done */ s390_ipl_get_reset_request(&cs, &reset_type); @@ -327,6 +396,8 @@ static void s390_machine_reset(MachineState *machine) /* all CPUs are paused and synchronized at this point */ s390_cmma_reset(); + cpu = S390_CPU(cs); + switch (reset_type) { case S390_RESET_EXTERNAL: case S390_RESET_REIPL: @@ -353,6 +424,26 @@ static void s390_machine_reset(MachineState *machine) } subsystem_reset(); run_on_cpu(cs, s390_do_cpu_initial_reset, RUN_ON_CPU_NULL); + run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); + break; + case S390_RESET_PV: /* Subcode 10 */ + subsystem_reset(); + s390_crypto_reset(); + + CPU_FOREACH(t) { + if (t == cs) { + continue; + } + run_on_cpu(t, s390_do_cpu_full_reset, RUN_ON_CPU_NULL); + } + run_on_cpu(cs, s390_do_cpu_reset, RUN_ON_CPU_NULL); + + if (s390_machine_protect(ms)) { + s390_machine_inject_pv_error(cs); + s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); + return; + } + run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); break; default: diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h index 8aa27199c9..cd1dccc6e3 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -28,6 +28,7 @@ typedef struct S390CcwMachineState { /*< public >*/ bool aes_key_wrap; bool dea_key_wrap; + bool pv; uint8_t loadparm[8]; } S390CcwMachineState; diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 3dd396e870..69b1cc5dfc 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -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" @@ -191,6 +193,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) #if !defined(CONFIG_USER_ONLY) MachineState *ms = MACHINE(qdev_get_machine()); + S390CcwMachineState *ccw = S390_CCW_MACHINE(ms); unsigned int max_cpus = ms->smp.max_cpus; if (cpu->env.core_id >= max_cpus) { error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 @@ -205,6 +208,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) goto out; } + cpu->env.pv = ccw->pv; /* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */ cs->cpu_index = cpu->env.core_id; #endif diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 1d17709d6e..7e4d9d267c 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -114,6 +114,7 @@ struct CPUS390XState { /* Fields up to this point are cleared by a CPU reset */ struct {} end_reset_fields; + bool pv; /* protected virtualization */ #if !defined(CONFIG_USER_ONLY) uint32_t core_id; /* PoP "CPU address", same as cpu_index */ diff --git a/target/s390x/cpu_features_def.inc.h b/target/s390x/cpu_features_def.inc.h index 31dff0d84e..60db28351d 100644 --- a/target/s390x/cpu_features_def.inc.h +++ b/target/s390x/cpu_features_def.inc.h @@ -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")