Commit f875cb0c authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/kvm: factor out storing of adtl CPU status 



Called from SIGP code to be factored out, so let's move it. Add a
FIXME for TCG code in the future.

Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170928203708.9376-15-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent cf729baa

target/s390x/helper.c

+29 −0
Original line number Diff line number Diff line
@@ -305,6 +305,35 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch) 


    return 0;

}



#define ADTL_GS_OFFSET   1024 /* offset of GS data in adtl save area */

#define ADTL_GS_MIN_SIZE 2048 /* minimal size of adtl save area for GS */

int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)

{

    hwaddr save = len;

    void *mem;



    mem = cpu_physical_memory_map(addr, &save, 1);

    if (!mem) {

        return -EFAULT;

    }

    if (save != len) {

        cpu_physical_memory_unmap(mem, len, 1, 0);

        return -EFAULT;

    }



    /* FIXME: as soon as TCG supports these features, convert cpu->be */

    if (s390_has_feat(S390_FEAT_VECTOR)) {

        memcpy(mem, &cpu->env.vregs, 512);

    }

    if (s390_has_feat(S390_FEAT_GUARDED_STORAGE) && len >= ADTL_GS_MIN_SIZE) {

        memcpy(mem + ADTL_GS_OFFSET, &cpu->env.gscb, 32);

    }



    cpu_physical_memory_unmap(mem, len, 1, len);



    return 0;

}

#endif /* CONFIG_USER_ONLY */



void s390_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,

target/s390x/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ void do_restart_interrupt(CPUS390XState *env); 
void s390_handle_wait(S390CPU *cpu);

#define S390_STORE_STATUS_DEF_ADDR offsetof(LowCore, floating_pt_save_area)

int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch);

int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len);

#ifndef CONFIG_USER_ONLY

LowCore *cpu_map_lowcore(CPUS390XState *env);

void cpu_unmap_lowcore(LowCore *lowcore);

target/s390x/kvm.c

+1 −29
Original line number Diff line number Diff line
@@ -1556,34 +1556,6 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data arg) 
    si->cc = SIGP_CC_ORDER_CODE_ACCEPTED;

}



#define ADTL_GS_OFFSET   1024 /* offset of GS data in adtl save area */

#define ADTL_GS_MIN_SIZE 2048 /* minimal size of adtl save area for GS */

static int do_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)

{

    hwaddr save = len;

    void *mem;



    mem = cpu_physical_memory_map(addr, &save, 1);

    if (!mem) {

        return -EFAULT;

    }

    if (save != len) {

        cpu_physical_memory_unmap(mem, len, 1, 0);

        return -EFAULT;

    }



    if (s390_has_feat(S390_FEAT_VECTOR)) {

        memcpy(mem, &cpu->env.vregs, 512);

    }

    if (s390_has_feat(S390_FEAT_GUARDED_STORAGE) && len >= ADTL_GS_MIN_SIZE) {

        memcpy(mem + ADTL_GS_OFFSET, &cpu->env.gscb, 32);

    }



    cpu_physical_memory_unmap(mem, len, 1, len);



    return 0;

}



static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)

{

    S390CPU *cpu = S390_CPU(cs);
@@ -1676,7 +1648,7 @@ static void sigp_store_adtl_status(CPUState *cs, run_on_cpu_data arg) 


    cpu_synchronize_state(cs);



    if (do_store_adtl_status(cpu, addr, len)) {

    if (s390_store_adtl_status(cpu, addr, len)) {

        set_sigp_status(si, SIGP_STAT_INVALID_PARAMETER);

        return;

    }