Re: [PATCH v9 07/15] s390x: protvirt: Move STSI data over SIDAD

[Cornelia Huck]

On Thu, 12 Mar 2020 12:20:25 +0100
Janosch Frank <address@hidden> wrote:

> On 3/12/20 11:42 AM, Christian Borntraeger wrote:
> > 
> > 
> > On 11.03.20 14:21, Janosch Frank wrote:  
> >> For 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.
> >>
> >> Signed-off-by: Janosch Frank <address@hidden>
> >> Reviewed-by: David Hildenbrand <address@hidden>
> >> ---
> >>  target/s390x/kvm.c | 11 +++++++++--
> >>  1 file changed, 9 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> >> index cdcd538b4f7fb318..8085d5030e7c6454 100644
> >> --- a/target/s390x/kvm.c
> >> +++ b/target/s390x/kvm.c
> >> @@ -50,6 +50,7 @@
> >>  #include "exec/memattrs.h"
> >>  #include "hw/s390x/s390-virtio-ccw.h"
> >>  #include "hw/s390x/s390-virtio-hcall.h"
> >> +#include "hw/s390x/pv.h"
> >>  
> >>  #ifndef DEBUG_KVM
> >>  #define DEBUG_KVM  0
> >> @@ -1800,7 +1801,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));  
> > 
> > Not strictly necessary, but do we also want to do an early exit if the pv 
> > case fails?
> >   
> 
> I'd rather do an early exit for the SIDA read/write ioctl itself

Early exit in what respect? Abort?

If not, checking the return code here and returning looks like
something we want.

pgpGEUhjKzqHO.pgp
Description: OpenPGP digital signature