Message ID | 20200214151636.8764-17-frankja@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | s390x: Protected Virtualization support | expand |
On Fri, 14 Feb 2020 10:16:35 -0500 Janosch Frank <frankja@linux.ibm.com> wrote: > Status storing is not done by QEMU anymore, but is handled by SIE. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > target/s390x/helper.c | 4 ++++ > target/s390x/sigp.c | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/target/s390x/helper.c b/target/s390x/helper.c > index a3a49164e4..3800c4b395 100644 > --- a/target/s390x/helper.c > +++ b/target/s390x/helper.c > @@ -246,6 +246,10 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) > hwaddr len = sizeof(*sa); > int i; > > + if (cpu->env.pv) { > + return 0; > + } > + > sa = cpu_physical_memory_map(addr, &len, 1); > if (!sa) { > return -EFAULT; > diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c > index c604f17710..da0cfb97de 100644 > --- a/target/s390x/sigp.c > +++ b/target/s390x/sigp.c > @@ -497,6 +497,7 @@ void do_stop_interrupt(CPUS390XState *env) > if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { > qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > } > + /* Storing will occur on next SIE entry for fmt 4 */ What's fmt 4? > if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { > s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); > }
On 2/20/20 12:02 PM, Cornelia Huck wrote: > On Fri, 14 Feb 2020 10:16:35 -0500 > Janosch Frank <frankja@linux.ibm.com> wrote: > >> Status storing is not done by QEMU anymore, but is handled by SIE. >> >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> >> Reviewed-by: Thomas Huth <thuth@redhat.com> >> --- >> target/s390x/helper.c | 4 ++++ >> target/s390x/sigp.c | 1 + >> 2 files changed, 5 insertions(+) >> >> diff --git a/target/s390x/helper.c b/target/s390x/helper.c >> index a3a49164e4..3800c4b395 100644 >> --- a/target/s390x/helper.c >> +++ b/target/s390x/helper.c >> @@ -246,6 +246,10 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) >> hwaddr len = sizeof(*sa); >> int i; >> >> + if (cpu->env.pv) { >> + return 0; >> + } >> + >> sa = cpu_physical_memory_map(addr, &len, 1); >> if (!sa) { >> return -EFAULT; >> diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c >> index c604f17710..da0cfb97de 100644 >> --- a/target/s390x/sigp.c >> +++ b/target/s390x/sigp.c >> @@ -497,6 +497,7 @@ void do_stop_interrupt(CPUS390XState *env) >> if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { >> qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); >> } >> + /* Storing will occur on next SIE entry for fmt 4 */ > > What's fmt 4? PVMs are using a FMT 4 SCB instead of the normal format 2 one. So I guess this should read: /* Storing will occur on next SIE entry for protected VMs */ > >> if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { >> s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); >> } > >
On Thu, 20 Feb 2020 12:30:28 +0100 Janosch Frank <frankja@linux.ibm.com> wrote: > On 2/20/20 12:02 PM, Cornelia Huck wrote: > > On Fri, 14 Feb 2020 10:16:35 -0500 > > Janosch Frank <frankja@linux.ibm.com> wrote: > > > >> Status storing is not done by QEMU anymore, but is handled by SIE. > >> > >> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > >> Reviewed-by: Thomas Huth <thuth@redhat.com> > >> --- > >> target/s390x/helper.c | 4 ++++ > >> target/s390x/sigp.c | 1 + > >> 2 files changed, 5 insertions(+) > >> > >> diff --git a/target/s390x/helper.c b/target/s390x/helper.c > >> index a3a49164e4..3800c4b395 100644 > >> --- a/target/s390x/helper.c > >> +++ b/target/s390x/helper.c > >> @@ -246,6 +246,10 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) > >> hwaddr len = sizeof(*sa); > >> int i; > >> > >> + if (cpu->env.pv) { > >> + return 0; > >> + } > >> + > >> sa = cpu_physical_memory_map(addr, &len, 1); > >> if (!sa) { > >> return -EFAULT; > >> diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c > >> index c604f17710..da0cfb97de 100644 > >> --- a/target/s390x/sigp.c > >> +++ b/target/s390x/sigp.c > >> @@ -497,6 +497,7 @@ void do_stop_interrupt(CPUS390XState *env) > >> if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { > >> qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > >> } > >> + /* Storing will occur on next SIE entry for fmt 4 */ > > > > What's fmt 4? > > PVMs are using a FMT 4 SCB instead of the normal format 2 one. > > So I guess this should read: > /* Storing will occur on next SIE entry for protected VMs */ Better :) > > > > >> if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { > >> s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); > >> } > > > > > >
diff --git a/target/s390x/helper.c b/target/s390x/helper.c index a3a49164e4..3800c4b395 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -246,6 +246,10 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) hwaddr len = sizeof(*sa); int i; + if (cpu->env.pv) { + return 0; + } + sa = cpu_physical_memory_map(addr, &len, 1); if (!sa) { return -EFAULT; diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index c604f17710..da0cfb97de 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -497,6 +497,7 @@ void do_stop_interrupt(CPUS390XState *env) if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) { qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } + /* Storing will occur on next SIE entry for fmt 4 */ if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) { s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); }