From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, david@redhat.com
Subject: [PATCH v4 05/18] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill
Date: Fri, 27 Sep 2019 12:39:12 -0700 [thread overview]
Message-ID: <20190927193925.23567-6-richard.henderson@linaro.org> (raw)
In-Reply-To: <20190927193925.23567-1-richard.henderson@linaro.org>
Delay triggering an exception until the end, after we have
determined ultimate success or failure, and also taken into
account whether this is a non-faulting probe.
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/excp_helper.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index dbff772d34..552098be5f 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -127,7 +127,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
CPUS390XState *env = &cpu->env;
target_ulong vaddr, raddr;
uint64_t asc;
- int prot, fail;
+ int prot, fail, excp;
qemu_log_mask(CPU_LOG_MMU, "%s: addr 0x%" VADDR_PRIx " rw %d mmu_idx %d\n",
__func__, address, access_type, mmu_idx);
@@ -141,12 +141,14 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
vaddr &= 0x7fffffff;
}
fail = mmu_translate(env, vaddr, access_type, asc, &raddr, &prot, true);
+ excp = 0; /* exception already raised */
} else if (mmu_idx == MMU_REAL_IDX) {
/* 31-Bit mode */
if (!(env->psw.mask & PSW_MASK_64)) {
vaddr &= 0x7fffffff;
}
fail = mmu_translate_real(env, vaddr, access_type, &raddr, &prot);
+ excp = 0; /* exception already raised */
} else {
g_assert_not_reached();
}
@@ -159,7 +161,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
qemu_log_mask(CPU_LOG_MMU,
"%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n",
__func__, (uint64_t)raddr, (uint64_t)ram_size);
- trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_AUTO);
+ excp = PGM_ADDRESSING;
fail = 1;
}
@@ -175,6 +177,9 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
return false;
}
+ if (excp) {
+ trigger_pgm_exception(env, excp, ILEN_AUTO);
+ }
cpu_restore_state(cs, retaddr, true);
/*
--
2.17.1
next prev parent reply other threads:[~2019-09-27 19:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 19:39 [PATCH v4 00/18] target/s390: Use tcg unwinding for ilen Richard Henderson
2019-09-27 19:39 ` [PATCH v4 01/18] target/s390x: Add ilen to unwind data Richard Henderson
2019-09-30 15:43 ` David Hildenbrand
2019-09-27 19:39 ` [PATCH v4 02/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt Richard Henderson
2019-10-01 15:24 ` David Hildenbrand
2019-09-27 19:39 ` [PATCH v4 03/18] target/s390x: Remove ilen parameter from s390_program_interrupt Richard Henderson
2019-09-27 19:39 ` [PATCH v4 04/18] target/s390x: Use tcg_s390_program_interrupt in TCG helpers Richard Henderson
2019-09-27 19:39 ` Richard Henderson [this message]
2019-09-27 19:39 ` [PATCH v4 06/18] target/s390x: Handle tec in s390_cpu_tlb_fill Richard Henderson
2019-09-27 19:39 ` [PATCH v4 07/18] target/s390x: Return exception from mmu_translate_real Richard Henderson
2019-09-27 19:39 ` [PATCH v4 08/18] target/s390x: Remove exc argument to mmu_translate_asce Richard Henderson
2019-09-27 19:39 ` [PATCH v4 09/18] target/s390x: Return exception from mmu_translate Richard Henderson
2019-09-30 15:45 ` David Hildenbrand
2019-10-01 15:30 ` David Hildenbrand
2019-10-01 16:21 ` Richard Henderson
2019-09-27 19:39 ` [PATCH v4 10/18] target/s390x: Return exception from translate_pages Richard Henderson
2019-09-27 19:39 ` [PATCH v4 11/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill Richard Henderson
2019-09-27 19:39 ` [PATCH v4 12/18] target/s390x: Simplify helper_lra Richard Henderson
2019-09-27 19:39 ` [PATCH v4 13/18] target/s390x: Rely on unwinding in s390_cpu_tlb_fill Richard Henderson
2019-09-27 19:39 ` [PATCH v4 14/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Richard Henderson
2019-09-27 19:39 ` [PATCH v4 15/18] target/s390x: Remove ILEN_AUTO Richard Henderson
2019-09-27 19:39 ` [PATCH v4 16/18] target/s390x: Remove ilen argument from trigger_access_exception Richard Henderson
2019-09-27 19:39 ` [PATCH v4 17/18] target/s390x: Remove ilen argument from trigger_pgm_exception Richard Henderson
2019-09-27 19:39 ` [PATCH v4 18/18] target/s390x: Remove ILEN_UNWIND Richard Henderson
2019-09-30 15:45 ` David Hildenbrand
2019-10-01 8:07 ` [PATCH v4 00/18] target/s390: Use tcg unwinding for ilen David Hildenbrand
2019-10-01 15:02 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190927193925.23567-6-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).