Commit 0f73c5b3 authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: protvirt: SCLP interpretation 



SCLP for a protected guest is done over the SIDAD, so we need to use
the s390_cpu_pv_mem_* functions to access the SIDAD instead of guest
memory when reading/writing SCBs.

To not confuse the sclp emulation, we set 0x4000 as the SCCB address,
since the function that injects the sclp external interrupt would
reject a zero sccb address.

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

hw/s390x/sclp.c

+45 −11
Original line number Diff line number Diff line
@@ -33,6 +33,22 @@ static inline SCLPDevice *get_sclp_device(void) 
    return sclp;

}



static inline bool sclp_command_code_valid(uint32_t code)

{

    switch (code & SCLP_CMD_CODE_MASK) {

    case SCLP_CMDW_READ_SCP_INFO:

    case SCLP_CMDW_READ_SCP_INFO_FORCED:

    case SCLP_CMDW_READ_CPU_INFO:

    case SCLP_CMDW_CONFIGURE_IOA:

    case SCLP_CMDW_DECONFIGURE_IOA:

    case SCLP_CMD_READ_EVENT_DATA:

    case SCLP_CMD_WRITE_EVENT_DATA:

    case SCLP_CMD_WRITE_EVENT_MASK:

        return true;

    }

    return false;

}



static void prepare_cpu_entries(SCLPDevice *sclp, CPUEntry *entry, int *count)

{

    MachineState *ms = MACHINE(qdev_get_machine());
@@ -193,6 +209,34 @@ static void sclp_execute(SCLPDevice *sclp, SCCB *sccb, uint32_t code) 
    }

}



/*

 * We only need the address to have something valid for the

 * service_interrupt call.

 */

#define SCLP_PV_DUMMY_ADDR 0x4000

int sclp_service_call_protected(CPUS390XState *env, uint64_t sccb,

                                uint32_t code)

{

    SCLPDevice *sclp = get_sclp_device();

    SCLPDeviceClass *sclp_c = SCLP_GET_CLASS(sclp);

    SCCB work_sccb;

    hwaddr sccb_len = sizeof(SCCB);



    s390_cpu_pv_mem_read(env_archcpu(env), 0, &work_sccb, sccb_len);



    if (!sclp_command_code_valid(code)) {

        work_sccb.h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND);

        goto out_write;

    }



    sclp_c->execute(sclp, &work_sccb, code);

out_write:

    s390_cpu_pv_mem_write(env_archcpu(env), 0, &work_sccb,

                          be16_to_cpu(work_sccb.h.length));

    sclp_c->service_interrupt(sclp, SCLP_PV_DUMMY_ADDR);

    return 0;

}



int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code)

{

    SCLPDevice *sclp = get_sclp_device();
@@ -225,17 +269,7 @@ int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code) 
        return -PGM_SPECIFICATION;

    }



    switch (code & SCLP_CMD_CODE_MASK) {

    case SCLP_CMDW_READ_SCP_INFO:

    case SCLP_CMDW_READ_SCP_INFO_FORCED:

    case SCLP_CMDW_READ_CPU_INFO:

    case SCLP_CMDW_CONFIGURE_IOA:

    case SCLP_CMDW_DECONFIGURE_IOA:

    case SCLP_CMD_READ_EVENT_DATA:

    case SCLP_CMD_WRITE_EVENT_DATA:

    case SCLP_CMD_WRITE_EVENT_MASK:

        break;

    default:

    if (!sclp_command_code_valid(code)) {

        work_sccb.h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND);

        goto out_write;

    }

include/hw/s390x/sclp.h

+2 −0
Original line number Diff line number Diff line
@@ -217,5 +217,7 @@ void s390_sclp_init(void); 
void sclp_service_interrupt(uint32_t sccb);

void raise_irq_cpu_hotplug(void);

int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);

int sclp_service_call_protected(CPUS390XState *env, uint64_t sccb,

                                uint32_t code);



#endif

target/s390x/kvm.c

+20 −5
Original line number Diff line number Diff line
@@ -1233,6 +1233,20 @@ static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, 
    sccb = env->regs[ipbh0 & 0xf];

    code = env->regs[(ipbh0 & 0xf0) >> 4];



    switch (run->s390_sieic.icptcode) {

    case ICPT_PV_INSTR_NOTIFICATION:

        g_assert(s390_is_pv());

        /* The notification intercepts are currently handled by KVM */

        error_report("unexpected SCLP PV notification");

        exit(1);

        break;

    case ICPT_PV_INSTR:

        g_assert(s390_is_pv());

        sclp_service_call_protected(env, sccb, code);

        /* Setting the CC is done by the Ultravisor. */

        break;

    case ICPT_INSTRUCTION:

        g_assert(!s390_is_pv());

        r = sclp_service_call(env, sccb, code);

        if (r < 0) {

            kvm_s390_program_interrupt(cpu, -r);
@@ -1240,6 +1254,7 @@ static void kvm_sclp_service_call(S390CPU *cpu, struct kvm_run *run, 
        }

        setcc(cpu, r);

    }

}



static int handle_b2(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)

{