From: David Hildenbrand <david@redhat.com>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org
Subject: Re: [PATCH v3 11/18] target/s390: Return exception from translate_pages
Date: Fri, 27 Sep 2019 12:56:07 +0200 [thread overview]
Message-ID: <ac667e90-1aa4-eee5-c856-613a95edf8f2@redhat.com> (raw)
In-Reply-To: <20190926162615.31168-12-richard.henderson@linaro.org>
On 26.09.19 18:26, Richard Henderson wrote:
> Do not raise the exception directly within translate_pages,
> but pass it back so that caller may do so.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/s390x/mmu_helper.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
> index a9219942b1..5ecd9ee87e 100644
> --- a/target/s390x/mmu_helper.c
> +++ b/target/s390x/mmu_helper.c
> @@ -423,25 +423,22 @@ nodat:
> * the MEMOP interface.
> */
> static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages,
> - target_ulong *pages, bool is_write)
> + target_ulong *pages, bool is_write, uint64_t *tec)
> {
> uint64_t asc = cpu->env.psw.mask & PSW_MASK_ASC;
> CPUS390XState *env = &cpu->env;
> int ret, i, pflags;
>
> for (i = 0; i < nr_pages; i++) {
> - uint64_t tec;
> -
> - ret = mmu_translate(env, addr, is_write, asc, &pages[i], &pflags, &tec);
> + ret = mmu_translate(env, addr, is_write, asc, &pages[i], &pflags, tec);
> if (ret) {
> - trigger_access_exception(env, ret, ILEN_AUTO, tec);
> - return -EFAULT;
> + return ret;
> }
> if (!address_space_access_valid(&address_space_memory, pages[i],
> TARGET_PAGE_SIZE, is_write,
> MEMTXATTRS_UNSPECIFIED)) {
> - trigger_access_exception(env, PGM_ADDRESSING, ILEN_AUTO, 0);
> - return -EFAULT;
> + *tec = 0; /* unused */
> + return PGM_ADDRESSING;
> }
> addr += TARGET_PAGE_SIZE;
> }
> @@ -469,6 +466,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,
> {
> int currlen, nr_pages, i;
> target_ulong *pages;
> + uint64_t tec;
> int ret;
>
> if (kvm_enabled()) {
> @@ -482,8 +480,10 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf,
> + 1;
> pages = g_malloc(nr_pages * sizeof(*pages));
>
> - ret = translate_pages(cpu, laddr, nr_pages, pages, is_write);
> - if (ret == 0 && hostbuf != NULL) {
> + ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec);
> + if (ret) {
> + trigger_access_exception(&cpu->env, ret, ILEN_AUTO, tec);
> + } else if (hostbuf != NULL) {
> /* Copy data by stepping through the area page by page */
> for (i = 0; i < nr_pages; i++) {
> currlen = MIN(len, TARGET_PAGE_SIZE - (laddr % TARGET_PAGE_SIZE));
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2019-09-27 14:18 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 16:25 [PATCH v3 00/18] target/s390: Use tcg unwinding for ilen Richard Henderson
2019-09-26 16:25 ` [PATCH v3 01/18] target/s390x: Truncate 32-bit psw_addr before creating TB Richard Henderson
2019-09-27 10:23 ` David Hildenbrand
2019-09-27 18:24 ` Richard Henderson
2019-09-26 16:25 ` [PATCH v3 02/18] target/s390x: Add ilen to unwind data Richard Henderson
2019-09-27 10:30 ` David Hildenbrand
2019-09-27 16:02 ` Richard Henderson
2019-09-30 7:55 ` David Hildenbrand
2019-09-30 15:03 ` Richard Henderson
2019-09-30 15:42 ` David Hildenbrand
2019-09-30 16:15 ` Richard Henderson
2019-09-30 17:13 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 03/18] target/s390x: Remove ilen parameter from tcg_s390_program_interrupt Richard Henderson
2019-09-27 10:31 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 04/18] target/s390x: Remove ilen parameter from s390_program_interrupt Richard Henderson
2019-09-27 10:34 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 05/18] target/s390x: Use tcg_s390_program_interrupt in TCG helpers Richard Henderson
2019-09-27 10:40 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 06/18] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill Richard Henderson
2019-09-27 10:41 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 07/18] target/s390x: Handle tec " Richard Henderson
2019-09-27 10:42 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 08/18] target/s390: Return exception from mmu_translate_real Richard Henderson
2019-09-27 10:44 ` David Hildenbrand
2019-09-27 12:47 ` David Hildenbrand
2019-09-27 16:08 ` Richard Henderson
2019-09-26 16:26 ` [PATCH v3 09/18] target/s390x: Remove exc argument to mmu_translate_asce Richard Henderson
2019-09-27 10:45 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 10/18] target/s390: Return exception from mmu_translate Richard Henderson
2019-09-27 10:55 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 11/18] target/s390: Return exception from translate_pages Richard Henderson
2019-09-27 10:56 ` David Hildenbrand [this message]
2019-09-26 16:26 ` [PATCH v3 12/18] target/s390x: Remove fail variable from s390_cpu_tlb_fill Richard Henderson
2019-09-27 10:56 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 13/18] target/s390x: Simplify helper_lra Richard Henderson
2019-09-27 10:57 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 14/18] target/s390x: Rely on unwinding in s390_cpu_tlb_fill Richard Henderson
2019-09-27 11:02 ` David Hildenbrand
2019-09-27 16:16 ` Richard Henderson
2019-09-30 7:56 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 15/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Richard Henderson
2019-09-27 11:04 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 16/18] target/s390x: Remove ILEN_AUTO Richard Henderson
2019-09-27 11:04 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 17/18] target/s390x: Remove ilen argument from trigger_access_exception Richard Henderson
2019-09-27 11:04 ` David Hildenbrand
2019-09-26 16:26 ` [PATCH v3 18/18] target/s390x: Remove ilen argument from trigger_pgm_exception Richard Henderson
2019-09-27 11:05 ` David Hildenbrand
2019-09-27 8:18 ` [PATCH v3 00/18] target/s390: Use tcg unwinding for ilen David Hildenbrand
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=ac667e90-1aa4-eee5-c856-613a95edf8f2@redhat.com \
--to=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.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).