From patchwork Thu Oct 10 11:33:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 175769 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2177456ill; Thu, 10 Oct 2019 04:56:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7lTZeFtii54i4TG7kPGKrGYsDxM1hbORl7kxriBn1lxPns7mk3tksAgW72wzoC9IO+MJh X-Received: by 2002:ac8:1c34:: with SMTP id a49mr10007936qtk.184.1570708561614; Thu, 10 Oct 2019 04:56:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570708561; cv=none; d=google.com; s=arc-20160816; b=BzTMiiWHL+QUyBxGPEBbgAJONX6jFi/sij4X4B3xxVGLfdrVPiJhhFBEDNa+yUiDZG dmNiSFGpVJ1F21G1RRe5BjeSgvBk2YXdWgZu52jHLoFDP+aICtZonOId9DQFXWcQMJkw JzfXcvm9SIqoXr9s2vFT8ooh06zrZnwEKeFdf2v23Hs50aDNTCssAsHKOtz/fGUGhYcD 2HUeDfuL3KyERhFz8Msttm13tXcWVjP5gDtgm6DR5XFT5i7AwxN2wo/5O329joAWrPxH 51N4CCBlRl3RO16jScQTAJlDyZnyeSIW71zU8ZnDju23ersXvDuw9WeDfTo9+cYJaA4M zMRw== 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=uHMsGGnWyFERoahnZ0omXl9LMDr0pe1evBEQpS9VhbE=; b=WomabezbafVnGNBxT3lls+ZgdEdgw3hnYg5oAqeTipRCVUAnxrGGtsCVBaE30P+bF8 GLTNYPOjFlN3Tvxou+Xe/7GRC/zyQEjE5nVP9sdEjbGC5OGpYZN2SaltU2UtZyAGKXoP CM9YFGVgsHh5jYtcBEr2w/RQxXZv5gtyhIHZk91dXyui2x2Sd8+k1ljCQcAJUtkRDn6v d8l3Adn0rf7YKkx2c8OyjzYmnT0XRRopIqbGjB1UC9egAbvpfn1jyTgFu9CU3/055O6X KdX+uzf1pQJPHLsGdt7Sb+hRWykNTTScCjwUnZZBHBASx5SUcoPcQOc5mO8JtEmSTb+x v1nQ== 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 a185si5540111qkg.5.2019.10.10.04.56.01 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 04:56:01 -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]:36779 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIX32-0002hj-Iv for patch@linaro.org; Thu, 10 Oct 2019 07:56:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50727) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWkT-0006cO-W8 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIWkT-0006bv-0k for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31218) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIWkS-0006bg-RZ; Thu, 10 Oct 2019 07:36:48 -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 1913958; Thu, 10 Oct 2019 11:36:48 +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 CDAC05C1B5; Thu, 10 Oct 2019 11:36:42 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 26/31] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Date: Thu, 10 Oct 2019 13:33:51 +0200 Message-Id: <20191010113356.5017-27-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.29]); Thu, 10 Oct 2019 11:36:48 +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 For TCG, we will always call s390_cpu_virt_mem_handle_exc, which will go through the unwinder to set ILEN. For KVM, we do not go through do_program_interrupt, so this argument is unused. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson Message-Id: <20191001171614.8405-15-richard.henderson@linaro.org> Signed-off-by: David Hildenbrand --- target/s390x/mmu_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0 diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 869debd30a..df58fb73ba 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -510,7 +510,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec); if (ret) { - trigger_access_exception(&cpu->env, ret, ILEN_AUTO, tec); + trigger_access_exception(&cpu->env, ret, ILEN_UNWIND, tec); } else if (hostbuf != NULL) { /* Copy data by stepping through the area page by page */ for (i = 0; i < nr_pages; i++) {