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

s390x/tcg: fix disabling/enabling DAT 



Currently, all memory accesses go via the MMU of the address space
(primary, secondary, ...). This is bad, because we don't flush the TLB
when disabling/enabling DAT. So we could add a tlb flush. However it
is easier to simply select the MMU we already have in place for real
memory access.

All we have to do is point at the right MMU and allow to execute these
pages.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180213161240.19891-1-david@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
[CH: get rid of tabs]
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 571729a0

target/s390x/cpu.h

+6 −1
Original line number Diff line number Diff line
@@ -312,11 +312,12 @@ extern const struct VMStateDescription vmstate_s390_cpu; 


#define FLAG_MASK_PSW_SHIFT     31

#define FLAG_MASK_PER           (PSW_MASK_PER    >> FLAG_MASK_PSW_SHIFT)

#define FLAG_MASK_DAT           (PSW_MASK_DAT    >> FLAG_MASK_PSW_SHIFT)

#define FLAG_MASK_PSTATE        (PSW_MASK_PSTATE >> FLAG_MASK_PSW_SHIFT)

#define FLAG_MASK_ASC           (PSW_MASK_ASC    >> FLAG_MASK_PSW_SHIFT)

#define FLAG_MASK_64            (PSW_MASK_64     >> FLAG_MASK_PSW_SHIFT)

#define FLAG_MASK_32            (PSW_MASK_32     >> FLAG_MASK_PSW_SHIFT)

#define FLAG_MASK_PSW		(FLAG_MASK_PER | FLAG_MASK_PSTATE \

#define FLAG_MASK_PSW           (FLAG_MASK_PER | FLAG_MASK_DAT | FLAG_MASK_PSTATE \

                                | FLAG_MASK_ASC | FLAG_MASK_64 | FLAG_MASK_32)



/* Control register 0 bits */
@@ -340,6 +341,10 @@ extern const struct VMStateDescription vmstate_s390_cpu; 


static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)

{

    if (!(env->psw.mask & PSW_MASK_DAT)) {

        return MMU_REAL_IDX;

    }



    switch (env->psw.mask & PSW_MASK_ASC) {

    case PSW_ASC_PRIMARY:

        return MMU_PRIMARY_IDX;

target/s390x/mmu_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -544,7 +544,7 @@ int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw, 
{

    const bool lowprot_enabled = env->cregs[0] & CR0_LOWPROT;



    *flags = PAGE_READ | PAGE_WRITE;

    *flags = PAGE_READ | PAGE_WRITE | PAGE_EXEC;

    if (is_low_address(raddr & TARGET_PAGE_MASK) && lowprot_enabled) {

        /* see comment in mmu_translate() how this works */

        *flags |= PAGE_WRITE_INV;

target/s390x/translate.c

+7 −3
Original line number Diff line number Diff line
@@ -252,13 +252,17 @@ static inline uint64_t ld_code4(CPUS390XState *env, uint64_t pc) 


static int get_mem_index(DisasContext *s)

{

    if (!(s->tb->flags & FLAG_MASK_DAT)) {

        return MMU_REAL_IDX;

    }



    switch (s->tb->flags & FLAG_MASK_ASC) {

    case PSW_ASC_PRIMARY >> FLAG_MASK_PSW_SHIFT:

        return 0;

        return MMU_PRIMARY_IDX;

    case PSW_ASC_SECONDARY >> FLAG_MASK_PSW_SHIFT:

        return 1;

        return MMU_SECONDARY_IDX;

    case PSW_ASC_HOME >> FLAG_MASK_PSW_SHIFT:

        return 2;

        return MMU_HOME_IDX;

    default:

        tcg_abort();

        break;