From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAAFDECE587 for ; Tue, 1 Oct 2019 15:49:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 70BF72070B for ; Tue, 1 Oct 2019 15:49:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70BF72070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFKOl-0002Zk-IO for qemu-devel@archiver.kernel.org; Tue, 01 Oct 2019 11:49:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46929) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFK74-00027T-IQ for qemu-devel@nongnu.org; Tue, 01 Oct 2019 11:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFK72-0008LK-R4 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 11:30:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFK72-0008Jc-Iv; Tue, 01 Oct 2019 11:30:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97926307D97F; Tue, 1 Oct 2019 15:30:51 +0000 (UTC) Received: from [10.36.116.54] (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FF9E60BE0; Tue, 1 Oct 2019 15:30:50 +0000 (UTC) Subject: Re: [PATCH v4 09/18] target/s390x: Return exception from mmu_translate To: Richard Henderson , qemu-devel@nongnu.org References: <20190927193925.23567-1-richard.henderson@linaro.org> <20190927193925.23567-10-richard.henderson@linaro.org> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: <68d9b84b-7c89-46c3-a97d-2c67d75aeddf@redhat.com> Date: Tue, 1 Oct 2019 17:30:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190927193925.23567-10-richard.henderson@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 01 Oct 2019 15:30:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 27.09.19 21:39, Richard Henderson wrote: > 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/mem_helper.c | 13 +++++++--- > target/s390x/mmu_helper.c | 49 +++++++++++++++----------------------- > 4 files changed, 32 insertions(+), 36 deletions(-) > > 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/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 aa8712221e..8ea1c95549 100644 > --- a/target/s390x/mmu_helper.c > +++ b/target/s390x/mmu_helper.c > @@ -369,17 +369,15 @@ static void mmu_handle_skey(target_ulong addr, int rw, int *flags) > * @return 0 if the translation was successful, -1 if a fault occurred > */ > 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 > @@ -391,12 +389,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; > } > } > > @@ -426,30 +421,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: > @@ -473,9 +459,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, > This patch breaks "tests/test-hmp" [dhildenb@desktop qemu]$ LANG=C make check-qtest-s390x make[1]: Entering directory '/home/dhildenb/git/qemu/slirp' make[1]: Nothing to be done for 'all'. make[1]: Leaving directory '/home/dhildenb/git/qemu/slirp' CHK version_gen.h TEST check-qtest-s390x: tests/boot-serial-test TEST check-qtest-s390x: tests/pxe-test TEST check-qtest-s390x: tests/test-netfilter TEST check-qtest-s390x: tests/test-filter-mirror TEST check-qtest-s390x: tests/test-filter-redirector TEST check-qtest-s390x: tests/drive_del-test TEST check-qtest-s390x: tests/device-plug-test TEST check-qtest-s390x: tests/virtio-ccw-test TEST check-qtest-s390x: tests/cpu-plug-test TEST check-qtest-s390x: tests/migration-test TEST check-qtest-s390x: tests/qmp-test TEST check-qtest-s390x: tests/qmp-cmd-test TEST check-qtest-s390x: tests/device-introspect-test TEST check-qtest-s390x: tests/cdrom-test TEST check-qtest-s390x: tests/machine-none-test TEST check-qtest-s390x: tests/qom-test TEST check-qtest-s390x: tests/test-hmp Broken pipe tests/libqtest.c:149: kill_qemu() detected QEMU death from signal 11 (Segmentation fault) (core dumped) ERROR - too few tests run (expected 4, got 0) make: *** [/home/dhildenb/git/qemu/tests/Makefile.include:901: check-qtest-s390x] Error 1 Haven't looked at the detail, but I could imagine some debug page access. The current combined tree resides at: https://github.com/davidhildenbrand/qemu/tree/mmu_plus_rewind -- Thanks, David / dhildenb