From patchwork Thu Oct 10 11:33:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 175761 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2169739ill; Thu, 10 Oct 2019 04:48:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+sciWq6VOACDbEa+WP51z36AILpa/1bzT5fCLFOe9+PmQENM8LnNNJqrCMVSyObPBtzfr X-Received: by 2002:ae9:d8c2:: with SMTP id u185mr9096977qkf.112.1570708094412; Thu, 10 Oct 2019 04:48:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570708094; cv=none; d=google.com; s=arc-20160816; b=VugLbTq1er7VEgbV7MOiTdql+F3nSvtV86+Ad3GVHkVQ+j28nv9BA5Y4SR+gjxeXkU 4Ub7InBjAx5CtOJcw8twnkn/w5/s132PNeNviL3t7da69lYkiBcoRtHDLMomhCcaoJNQ K1RL5WD28XmhbCsICVr/8uPLNOLaqDlgui0HR7NOySdGRFDmjWQuZkhRk3Cqp6wwNhG6 NP5IkCSJjVvg3jIRmZCM/DTS8W5Sp1k8/0X6OwN+Ag3cfQpO/biPylDEcRCdHnDSX8be BV/yvxwlPbHUO6usDKkB8T/IYOuewc2/eG9s53eZivr0ZyPYfT/wT4838PHnfYRo8OqS 0tug== 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=1whqA85+vdT+S5tSXNo/KbQdXPxfzv2bWUt9km5ZE0A=; b=L6sx0UH2Ve35c+nxVy3zEamjhPPwnGRroEMVqv+eITV/TrPT7Ge+jTvhVgkkNIzC2g sZIS9sHOeYMJ6R2jwWAl0kRnpKz63SGIzOpl4ST25WpCnAF+5cwmpkdIkARDJBfEzezS XjJVTVVv4pIIgWS5VURu6+0PQBHto2GoeWbjoBcZhsUg0waW8iuegcSK18AtNaUpXtp9 O8U3yncooWkAFOs2UQCwL7rsKxH5fGaLa7I8VAHli3sieVRPCRIU111X9SgmWGxNRrvc eQRfGK5I+pwYqcjGX1g3nBDsyImXXVEnrPHM8YafbuEZojDLkBRF1P7ELHWgYXPoNU2o zlpQ== 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 p49si5465850qvc.91.2019.10.10.04.48.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 04:48:14 -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]:36670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWvV-0001nQ-9O for patch@linaro.org; Thu, 10 Oct 2019 07:48:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50396) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWiz-0004RW-He for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIWix-000669-Ha for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:35:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42824) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIWiq-00061S-Sl; Thu, 10 Oct 2019 07:35:11 -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 528E23CA00; Thu, 10 Oct 2019 11:35:03 +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 647DA5C231; Thu, 10 Oct 2019 11:34:59 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 17/31] target/s390x: Push trigger_pgm_exception lower in s390_cpu_tlb_fill Date: Thu, 10 Oct 2019 13:33:42 +0200 Message-Id: <20191010113356.5017-18-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.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 10 Oct 2019 11:35:03 +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 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 Signed-off-by: Richard Henderson Message-Id: <20191001171614.8405-6-richard.henderson@linaro.org> Signed-off-by: David Hildenbrand --- target/s390x/excp_helper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.21.0 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); /*