From patchwork Tue Oct 1 17:16:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174900 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp8843263ill; Tue, 1 Oct 2019 10:20:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqzEzUN1bE7jnySAzmhDzjJGH/d/a+JJ9HOM2hOscjeXWDiloQOU4NCh1GarFxRxq81QESeT X-Received: by 2002:a05:6214:12ca:: with SMTP id s10mr25623094qvv.91.1569950450582; Tue, 01 Oct 2019 10:20:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569950450; cv=none; d=google.com; s=arc-20160816; b=W6IFHmoRoTJPj4xHYdel6JguV5LhaAhrMZGEb7DgMvSCbrG3sWVaxZTynyJHRzYAHY d+upeFL/X5Kz5Wr1VsYvwk2sSISVaKIwByqaoDGJjLoHm5647/gGlNlWM9QCQTh23VFS k8Qc7owfWeSY0fxgpi74KGcoLn5p3YUj84rKTlDvgZ3gCI7gfJP9SMqVbU0x9Q2sMdD1 QwqHSTrlofcMAZv/EkhcTzEfPNR+vXZiQ0YJQnLit74b27KNG0E85tQEwBkL/SlfnuoL ReHm4wrSwDdMSJk2AhdnRd2adVex2nymGjqp3bAmkVmQI7Ic3KfyhmA5kjvq2x+TXt93 YCKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=X3LTmFzczfRxgo2AFbnOMhu+tfZBTFunSRj9qIKUaA8=; b=0k9Ymj4ekE9kOA0mkkhTGTOcItty6g2DienNqEydx11bgE1XSQffNSA7r+ZKROvNZo aJAf3CWuyuuevFuqqwkAWSxbMeoD7uOWnq214nfnkNdiH51uaX/5ZmOl5L3Ww5Xk/Qr2 cnefUp9pIfbpPuDt3RLLidHUns2J5Z2ymuzwQoPXcGGf7tJ8kvCffHdGrar+35NUVVnA QY+DFPy7O4humLkFb4YsDF5oLTHfbBwaH4hQPX2MJdS5uDiqPe0Th0DWQH7nWaDrzJ7h YTPzl9m5XO7ltoeNDxOkI4VFQzk40fXTJ0cn9JNuKH3St7JPdKq7WE3vZ9bCI8JSYMy2 cN1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y++m4a4L; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s144si13687777qke.182.2019.10.01.10.20.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Oct 2019 10:20:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y++m4a4L; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFLpR-0004Z7-7I for patch@linaro.org; Tue, 01 Oct 2019 13:20:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32860) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFLlH-0001bX-2m for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFLlF-0005Xa-GJ for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:30 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:39022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFLlF-0005Ww-8l for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:29 -0400 Received: by mail-pl1-x62f.google.com with SMTP id s17so5790433plp.6 for ; Tue, 01 Oct 2019 10:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=X3LTmFzczfRxgo2AFbnOMhu+tfZBTFunSRj9qIKUaA8=; b=y++m4a4LsN9HqKBbgoDaKR6bVsjnSYyEWUPNSHHDAZw/oIDeBtkTZM7gCDtIh9JOZP h32CQpDZg/ptsWgVBysFUyd+kp4yUshCXOY2YfKtze904sDficR/HwphFTXNQ142YLif ThkU7AvNzbJPxL+zEt1h9xbXk2IqV2cLT9muI84R8ZIncT1Og4BPeK9HYPgJ6ZgZWxPB CDsxsO3FQ0FmvyfTRrfrpzld2AjK7pOoyH3fWw6AnH/bS/HyEeh/BT1vGgNGxqSE/RLh zQr5VLdzOY6a27sxqD4IaG7T6olET4+JBkiazL7iCFHLlT2rUg0TGIh+yb49eX8OppCG sqtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=X3LTmFzczfRxgo2AFbnOMhu+tfZBTFunSRj9qIKUaA8=; b=J3v2stqs8XAODl2TPxg33BX+v4ISaLEVPyVwyVsBSC6lRLkYLjzaf2xoPIdwVWeW+W DuJ6VqhknoGbgd1e96ddcTgW93A1ipH4VQZCp2ZoqW7CvGMOPZT7gfRmUmNxZPIN8EHl nBhPLzaC6wVT2vb4pnwxcy2GN49mUxxHAKUxyuqI2+SeFVGFtOz6e8fgxqKMkWTOB7kQ njQP3LquqHDRHCHlLusrf4HjsbkOQk8AaqeJ6AsZk8xQK9JjZU6vg2wgV4HnHBoROEmN loEY/sr1UMd8dbcbHk9MZ+NpeEkbqygGCM/KzljY0pORP4dIY69EEB5DihlUsDbMbbYU iq4Q== X-Gm-Message-State: APjAAAVjQ5tAoph6qqv3Y8te67NNB2gYfl5r6Hp1lt3Fjcd4kHX7eEBn HBUMrhlQUanhBFImobMp+CPDZk9oLIY= X-Received: by 2002:a17:902:b48f:: with SMTP id y15mr19885433plr.168.1569950187598; Tue, 01 Oct 2019 10:16:27 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id w7sm2863568pjn.1.2019.10.01.10.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 10:16:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 09/18] target/s390x: Return exception from mmu_translate Date: Tue, 1 Oct 2019 10:16:05 -0700 Message-Id: <20191001171614.8405-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191001171614.8405-1-richard.henderson@linaro.org> References: <20191001171614.8405-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62f X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Do not raise the exception directly within mmu_translate, but pass it back so that caller may do so. Signed-off-by: Richard Henderson --- target/s390x/internal.h | 2 +- target/s390x/excp_helper.c | 4 +-- target/s390x/helper.c | 3 ++- target/s390x/mem_helper.c | 13 +++++++--- target/s390x/mmu_helper.c | 51 +++++++++++++++----------------------- 5 files changed, 35 insertions(+), 38 deletions(-) -- 2.17.1 diff --git a/target/s390x/internal.h b/target/s390x/internal.h index c4388aaf23..c993c3ef40 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -360,7 +360,7 @@ void probe_write_access(CPUS390XState *env, uint64_t addr, uint64_t len, /* mmu_helper.c */ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, - target_ulong *raddr, int *flags, bool exc); + target_ulong *raddr, int *flags, uint64_t *tec); int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw, target_ulong *addr, int *flags, uint64_t *tec); diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index 906b87c071..6a0728b65f 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -140,8 +140,8 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size, if (!(env->psw.mask & PSW_MASK_64)) { vaddr &= 0x7fffffff; } - fail = mmu_translate(env, vaddr, access_type, asc, &raddr, &prot, true); - excp = 0; /* exception already raised */ + excp = mmu_translate(env, vaddr, access_type, asc, &raddr, &prot, &tec); + fail = excp; } else if (mmu_idx == MMU_REAL_IDX) { /* 31-Bit mode */ if (!(env->psw.mask & PSW_MASK_64)) { diff --git a/target/s390x/helper.c b/target/s390x/helper.c index bf503b56ee..a3a49164e4 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -52,6 +52,7 @@ hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr) target_ulong raddr; int prot; uint64_t asc = env->psw.mask & PSW_MASK_ASC; + uint64_t tec; /* 31-Bit mode */ if (!(env->psw.mask & PSW_MASK_64)) { @@ -67,7 +68,7 @@ hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr) * We want to read code even if IEP is active. Use MMU_DATA_LOAD instead * of MMU_INST_FETCH. */ - if (mmu_translate(env, vaddr, MMU_DATA_LOAD, asc, &raddr, &prot, false)) { + if (mmu_translate(env, vaddr, MMU_DATA_LOAD, asc, &raddr, &prot, &tec)) { return -1; } return raddr; diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 7d2a652823..e15aa296dd 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -2364,8 +2364,8 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) CPUState *cs = env_cpu(env); uint32_t cc = 0; uint64_t asc = env->psw.mask & PSW_MASK_ASC; - uint64_t ret; - int old_exc, flags; + uint64_t ret, tec; + int old_exc, flags, exc; /* XXX incomplete - has more corner cases */ if (!(env->psw.mask & PSW_MASK_64) && (addr >> 32)) { @@ -2373,7 +2373,14 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) } old_exc = cs->exception_index; - if (mmu_translate(env, addr, 0, asc, &ret, &flags, true)) { + exc = mmu_translate(env, addr, 0, asc, &ret, &flags, &tec); + if (exc) { + /* + * We don't care about ILEN or TEC, as we're not going to + * deliver the exception -- thus resetting exception_index below. + * TODO: clean this up. + */ + trigger_pgm_exception(env, exc, ILEN_UNWIND); cc = 3; } if (cs->exception_index == EXCP_PGM) { diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index e57d762f45..001d0a9c8a 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -365,20 +365,18 @@ static void mmu_handle_skey(target_ulong addr, int rw, int *flags) * @param raddr the translated address is stored to this pointer * @param flags the PAGE_READ/WRITE/EXEC flags are stored to this pointer * @param exc true = inject a program check if a fault occurred - * @return 0 if the translation was successful, -1 if a fault occurred + * @return 0 = success, != 0, the exception to raise */ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, - target_ulong *raddr, int *flags, bool exc) + target_ulong *raddr, int *flags, uint64_t *tec) { - /* Code accesses have an undefined ilc, let's use 2 bytes. */ - const int ilen = (rw == MMU_INST_FETCH) ? 2 : ILEN_AUTO; - uint64_t tec = (vaddr & TARGET_PAGE_MASK) | (asc >> 46) | - (rw == MMU_DATA_STORE ? FS_WRITE : FS_READ); uint64_t asce; int r; - + *tec = (vaddr & TARGET_PAGE_MASK) | (asc >> 46) | + (rw == MMU_DATA_STORE ? FS_WRITE : FS_READ); *flags = PAGE_READ | PAGE_WRITE | PAGE_EXEC; + if (is_low_address(vaddr & TARGET_PAGE_MASK) && lowprot_enabled(env, asc)) { /* * If any part of this page is currently protected, make sure the @@ -390,12 +388,9 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, */ *flags |= PAGE_WRITE_INV; if (is_low_address(vaddr) && rw == MMU_DATA_STORE) { - if (exc) { - /* LAP sets bit 56 */ - tec |= 0x80; - trigger_access_exception(env, PGM_PROTECTION, ilen, tec); - } - return -EACCES; + /* LAP sets bit 56 */ + *tec |= 0x80; + return PGM_PROTECTION; } } @@ -425,30 +420,21 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, /* perform the DAT translation */ r = mmu_translate_asce(env, vaddr, asc, asce, raddr, flags, rw); if (unlikely(r)) { - if (exc) { - trigger_access_exception(env, r, ilen, tec); - } - return -1; + return r; } /* check for DAT protection */ if (unlikely(rw == MMU_DATA_STORE && !(*flags & PAGE_WRITE))) { - if (exc) { - /* DAT sets bit 61 only */ - tec |= 0x4; - trigger_access_exception(env, PGM_PROTECTION, ilen, tec); - } - return -1; + /* DAT sets bit 61 only */ + *tec |= 0x4; + return PGM_PROTECTION; } /* check for Instruction-Execution-Protection */ if (unlikely(rw == MMU_INST_FETCH && !(*flags & PAGE_EXEC))) { - if (exc) { - /* IEP sets bit 56 and 61 */ - tec |= 0x84; - trigger_access_exception(env, PGM_PROTECTION, ilen, tec); - } - return -1; + /* IEP sets bit 56 and 61 */ + *tec |= 0x84; + return PGM_PROTECTION; } nodat: @@ -472,9 +458,12 @@ static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages, int ret, i, pflags; for (i = 0; i < nr_pages; i++) { - ret = mmu_translate(env, addr, is_write, asc, &pages[i], &pflags, true); + uint64_t tec; + + ret = mmu_translate(env, addr, is_write, asc, &pages[i], &pflags, &tec); if (ret) { - return ret; + trigger_access_exception(env, ret, ILEN_AUTO, tec); + return -EFAULT; } if (!address_space_access_valid(&address_space_memory, pages[i], TARGET_PAGE_SIZE, is_write,