| Message ID | 20191120114334.2287-13-frankja@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: Protected Virtualization support | expand |
On 20/11/2019 12.43, Janosch Frank wrote: > Handling of CPU reset and setting of the IPL psw from guest storage at > offset 0 is done by a Ultravisor call. Let's only fetch it if > necessary. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > hw/s390x/pv.c | 5 +++++ > hw/s390x/pv.h | 1 + > hw/s390x/s390-virtio-ccw.c | 3 ++- > linux-headers/linux/kvm.h | 1 + > target/s390x/cpu.c | 9 ++++++++- > 5 files changed, 17 insertions(+), 2 deletions(-) [...] > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 6fd50b4c42..e020b92854 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -404,7 +404,8 @@ static void s390_machine_reset(MachineState *machine) > s390_ipl_pv_unpack(); > /* Verify integrity */ > s390_pv_verify(); > - s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); > + env->pv = true; Ah, here you set env->pv = true manually ... so maybe that's another good reason to get rid of patch 05/15 ("s390x: protvirt: Sync PV state") in the end? Reviewed-by: Thomas Huth <thuth@redhat.com>
On 11/28/19 3:30 PM, Thomas Huth wrote: > On 20/11/2019 12.43, Janosch Frank wrote: >> Handling of CPU reset and setting of the IPL psw from guest storage at >> offset 0 is done by a Ultravisor call. Let's only fetch it if >> necessary. >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> --- >> hw/s390x/pv.c | 5 +++++ >> hw/s390x/pv.h | 1 + >> hw/s390x/s390-virtio-ccw.c | 3 ++- >> linux-headers/linux/kvm.h | 1 + >> target/s390x/cpu.c | 9 ++++++++- >> 5 files changed, 17 insertions(+), 2 deletions(-) > [...] >> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >> index 6fd50b4c42..e020b92854 100644 >> --- a/hw/s390x/s390-virtio-ccw.c >> +++ b/hw/s390x/s390-virtio-ccw.c >> @@ -404,7 +404,8 @@ static void s390_machine_reset(MachineState *machine) >> s390_ipl_pv_unpack(); >> /* Verify integrity */ >> s390_pv_verify(); >> - s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); >> + env->pv = true; > > Ah, here you set env->pv = true manually ... so maybe that's another > good reason to get rid of patch 05/15 ("s390x: protvirt: Sync PV state") > in the end? Given that QEMU triggers the state changes that would make sense. > > Reviewed-by: Thomas Huth <thuth@redhat.com> Thanks! > >
diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c index 0218070322..106252833f 100644 --- a/hw/s390x/pv.c +++ b/hw/s390x/pv.c @@ -88,6 +88,11 @@ int s390_pv_set_sec_parms(uint64_t origin, uint64_t length) return s390_pv_cmd(KVM_PV_VM_SET_SEC_PARMS, &args); } +int s390_pv_set_ipl_psw(CPUState *cs) +{ + return s390_pv_cmd_vcpu(cs, KVM_PV_VCPU_SET_IPL_PSW, NULL); +} + /* * Called for each component in the SE type IPL parameter block 0. */ diff --git a/hw/s390x/pv.h b/hw/s390x/pv.h index eb074e4bc9..e670c67270 100644 --- a/hw/s390x/pv.h +++ b/hw/s390x/pv.h @@ -18,6 +18,7 @@ int s390_pv_vm_destroy(void); int s390_pv_vcpu_destroy(CPUState *cs); int s390_pv_vcpu_create(CPUState *cs); int s390_pv_set_sec_parms(uint64_t origin, uint64_t length); +int s390_pv_set_ipl_psw(CPUState *cs); int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak); int s390_pv_perf_clear_reset(void); int s390_pv_verify(void); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 6fd50b4c42..e020b92854 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -404,7 +404,8 @@ static void s390_machine_reset(MachineState *machine) s390_ipl_pv_unpack(); /* Verify integrity */ s390_pv_verify(); - s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); + env->pv = true; + run_on_cpu(cs, s390_do_cpu_load_normal, RUN_ON_CPU_NULL); break; default: g_assert_not_reached(); diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index d031051601..b5c7552016 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -1476,6 +1476,7 @@ enum pv_cmd_id { KVM_PV_VM_UNSHARE, KVM_PV_VCPU_CREATE, KVM_PV_VCPU_DESTROY, + KVM_PV_VCPU_SET_IPL_PSW, }; struct kvm_pv_cmd { diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index ac04fdbba9..c004987a87 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -37,6 +37,7 @@ #include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" #ifndef CONFIG_USER_ONLY +#include "hw/s390x/pv.h" #include "hw/boards.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" @@ -76,7 +77,13 @@ static bool s390_cpu_has_work(CPUState *cs) static void s390_cpu_load_normal(CPUState *s) { S390CPU *cpu = S390_CPU(s); - cpu->env.psw.addr = ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR; + CPUS390XState *env = &cpu->env; + + if (!env->pv) { + cpu->env.psw.addr = ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR; + } else { + s390_pv_set_ipl_psw(s); + } cpu->env.psw.mask = PSW_MASK_32 | PSW_MASK_64; s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); }
Handling of CPU reset and setting of the IPL psw from guest storage at offset 0 is done by a Ultravisor call. Let's only fetch it if necessary. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- hw/s390x/pv.c | 5 +++++ hw/s390x/pv.h | 1 + hw/s390x/s390-virtio-ccw.c | 3 ++- linux-headers/linux/kvm.h | 1 + target/s390x/cpu.c | 9 ++++++++- 5 files changed, 17 insertions(+), 2 deletions(-)