From patchwork Thu Oct 10 11:33:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 175771 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2179255ill; Thu, 10 Oct 2019 04:57:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8WtyIJ9PxQ2taPv/3TanRnIBckDkoKUraAzaAmR/Qlr7hGgzIZdbX5rEf6OlHmQWqCQFg X-Received: by 2002:ac8:1c34:: with SMTP id a49mr10015483qtk.184.1570708676967; Thu, 10 Oct 2019 04:57:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570708676; cv=none; d=google.com; s=arc-20160816; b=EJue1czQipFwAySNSKXFYwZz44VdTYCWfFxbu7XMrJ23BGN5Dkg8GICM8dC0POur9A 7047+FC6GAXat+U8QPuEXhsvAw5n1ZfIPso4scP3DdBJ/RE3y3w8J0sA2Fuf562r0PBY XV0icnPne6Bh/0DP0XADTWUmeRO9fZzzDnGrBvHpkODX9MzEDkmWSXmBORnE/V+gfuG1 w6AU/wcVa/UM8L3iqXHsOzYlKL+hCe5YkohnJKnEOGQnNtFfV0537a5pciY0cXl8n+S1 QOdjjXlbPL3mGAcILSlorjAZ6rB7L6nNTIBEFKZXtTD5rMIQI4zMyeWKlNxBycrzRCP0 VtKQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=w7Gv2f9saYqkbXs/nEo9XyrT9KNMM2DbxaC8sA0X6t4=; b=ZGvjv9hq5L3Mu+9kYAKbsr6P8R0uA/bTPgKqyNuXjhJI2NPjfD6DrFgIzTLx8I08h6 ttwoCl9YKk/+rjevSWgm+ZEjJgBUMNt36RUDVRRUNNx63NKGYUyBcov5aIHUCwNxlEk0 On0MOcI9S+tZ6ijCCpxC36hcRfLtsL821yhVCao4x73iZYnIpI53wYALHe2uoIjpLYNc 5vKY6E8R7i2Pee+1qFkv59eVccAdP88x9HF5d7GmCfQ/gDT3TCbQAjLhi+9CYlHZPLQs FfJNC6LYPrsT1pvR/jQkMbhppqC6YISL7yRMY3oVV82Qpd/gMykk/ggrDCNKG1aWuCSn IFZA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j4si5685274qkd.85.2019.10.10.04.57.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 04:57:56 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIX4u-0005L1-FF for patch@linaro.org; Thu, 10 Oct 2019 07:57:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50583) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWjn-0005Sz-Mq for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIWjm-0006QO-Ja for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48114) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIWjm-0006QE-AK; Thu, 10 Oct 2019 07:36:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7F27010CC1E3; Thu, 10 Oct 2019 11:36:05 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-138.ams2.redhat.com [10.36.117.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9B9B5E1C2; Thu, 10 Oct 2019 11:35:49 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 22/31] target/s390x: Return exception from translate_pages Date: Thu, 10 Oct 2019 13:33:47 +0200 Message-Id: <20191010113356.5017-23-david@redhat.com> In-Reply-To: <20191010113356.5017-1-david@redhat.com> References: <20191010113356.5017-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Thu, 10 Oct 2019 11:36:05 +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, Cornelia Huck , Richard Henderson , Thomas Huth , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Do not raise the exception directly within translate_pages, but pass it back so that caller may do so. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson Message-Id: <20191001171614.8405-11-richard.henderson@linaro.org> Signed-off-by: David Hildenbrand --- target/s390x/mmu_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.21.0 diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 001d0a9c8a..869debd30a 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -451,25 +451,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; } @@ -497,6 +494,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()) { @@ -510,8 +508,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));