Commit 9c61e112 authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: protvirt: Move diag 308 data over SIDA 



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: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200319131921.2367-12-frankja@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 59181010

target/s390x/diag.c

+20 −5
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) 
{

    bool valid;

    CPUState *cs = env_cpu(env);

    S390CPU *cpu = S390_CPU(cs);

    uint64_t addr =  env->regs[r1];

    uint64_t subcode = env->regs[r3];

    IplParameterBlock *iplb;
@@ -111,13 +112,22 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) 
            return;

        }

        iplb = g_new0(IplParameterBlock, 1);

        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;

        }



        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));

        }



        valid = subcode == DIAG308_PV_SET ? iplb_valid_pv(iplb) : iplb_valid(iplb);

        if (!valid) {
@@ -140,12 +150,17 @@ out: 
        } else {

            iplb = s390_ipl_get_iplb();

        }

        if (iplb) {

        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));

            env->regs[r1 + 1] = DIAG_308_RC_OK;

        } else {

            env->regs[r1 + 1] = DIAG_308_RC_NO_CONF;

            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();