From patchwork Wed Jun 7 00:31:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9770425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 248ED60234 for ; Wed, 7 Jun 2017 01:21:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 054A72654B for ; Wed, 7 Jun 2017 01:21:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE3752852D; Wed, 7 Jun 2017 01:21:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 608D528539 for ; Wed, 7 Jun 2017 01:21:12 +0000 (UTC) Received: from localhost ([::1]:40777 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIPep-0006ST-87 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 21:21:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOuB-00042g-7x for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:33:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOu9-0002bA-OX for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:59 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:36583) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOu9-0002ac-K0 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:32:57 -0400 Received: by mail-qk0-x242.google.com with SMTP id y201so11030198qka.3 for ; Tue, 06 Jun 2017 17:32:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VPagw5AzNBorqqgRbANXqMGVyFdurLi02dU5Uela6nE=; b=CHflBii6VBwlRUHaL3h1aP3KZ78Dk6uR04DGogTlV15k8wpPkeZXoPz9fXFJ1e70SX wlrLnohk33XN1cOTjnNNKo7h4On3K+shZqx8zkrlkaLsN+ieWSJik2KF9OaR/pGskgbN VC8tZIFVTxYKjQ6r1N68IWeG4h6XhE2TkMTh2q7qbvv+N2YdeVuyZ58x0AWEE9P5BKDI o58L0KPRojGiFoDf/4bI7xMXGm6M70BtJiF1PttiqlC99WmrHpP6KZgcEJ7Evd5YVcMm SQkoN1kRub9vgQYKXCyCIO22SdwLlrUjRxR8JPgWtbHJnFMzUgFe1ljCLRwDLB9mY9w+ gLdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=VPagw5AzNBorqqgRbANXqMGVyFdurLi02dU5Uela6nE=; b=pc5dBUxJi9/5Ubl+jufa0nC5NhCCb6//a9WTz1WRGCCXQsfx03Hi7GtAgq8vebOfE3 zpiVDuT8cvr3hgsBn0ZVhy+kyDPIRP/ukeJpdpR5vKRrS6j4s831kJQrorSWNBgQAYHR BKWKvWyu0LHUJ1coixjUI/kF3sRU+ck3bFighEmGy/0H6DSkEopjT5D3SNzrmW/R/zzr kjJS+Vv77Kk6E9Y16t5D8TUIYBwe7FukBiDW2o2+cNkso/4FRawFLzAa7sx174gH7aPE jH01/9sRGSgP82PiG86MH4F7aHzAKG49+cw9i0JK/s1sSiqcNCU4WNlkUvwiE2ciN9DA LsQQ== X-Gm-Message-State: AKS2vOzLspuE6OwsKxa+Vn+N9gJnFVdvLOncN/jgWCkusmNxffvwmo/o 3w9muh5i+NbxTONn/8g= X-Received: by 10.55.147.135 with SMTP id v129mr35440068qkd.146.1496795576898; Tue, 06 Jun 2017 17:32:56 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.32.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:32:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:31:19 -0700 Message-Id: <20170607003119.14778-71-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PULL v2 70/70] target/s390x: addressing exceptions are suppressing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, aurelien@aurel32.net, David Hildenbrand Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: David Hildenbrand We have to make the address in the old PSW point at the next instruction, as addressing exceptions are suppressing and not nullifying. I assume that there are a lot of other broken cases (as most instructions we care about are suppressing) - all trigger_pgm_exception() specifying and explicit number or ILEN_LATER look suspicious, however this is another story that might require bigger changes (and I have to understand when the address might already have been incremented first). This is needed to make an upcoming kvm-unit-test work. Reviewed-by: Thomas Huth Signed-off-by: David Hildenbrand Message-Id: <20170529121228.2789-1-david@redhat.com> Signed-off-by: Richard Henderson --- target/s390x/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 291db72..a8d20c5 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -204,7 +204,7 @@ int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, if (raddr > ram_size) { DPRINTF("%s: raddr %" PRIx64 " > ram_size %" PRIx64 "\n", __func__, (uint64_t)raddr, (uint64_t)ram_size); - trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_LATER); + trigger_pgm_exception(env, PGM_ADDRESSING, ILEN_LATER_INC); return 1; }