From patchwork Thu Sep 26 16:26:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174494 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2307351ill; Thu, 26 Sep 2019 09:50:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqwHV6ALDYKjxOgcGWcVFik8P++hkbKOM5aznojQdyEYm5hLcN5ddR5Y8Z1vzlAGnPdgJ3/3 X-Received: by 2002:ac8:4504:: with SMTP id q4mr4945720qtn.354.1569516634317; Thu, 26 Sep 2019 09:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569516634; cv=none; d=google.com; s=arc-20160816; b=SwHK3+T1gExRxf5gX3faJbPx+XJQyJVtqpiqXpx2gDIsSSuNgxUvVVUcY+F3ipJGgw FieDvYKB7Gqf1gs0ocY+rS2440RhjOdEtPZeYECjY4knGe6q+ZQ2DwoxYM77N0qsjL58 0yB+bmfq2QQxDKAHz87KJLWnHCDs6o+JBdZhwi+l5SUqptwsqtnMq770mMi4YoZ8xZWy UCXroM/y/OQzmSJcCLSSOtsNxsQJwbzC2vFggmmxgekPHO76DjfbhuNFYLzbF4NQDcSp l6DvgS1nv4Syt7/B+xRiBcWACtUX01K+bCfJJ8SEreelEQHORUvuOddEYS7CN2GsolXB 6bjQ== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=mWk22l7+U+HSJUTJYCZqfIFiiQLzuuV4OTUO0HR+ZVI=; b=LTc86VFMZXd6YoFXJlUMXAIKiRQJdlGS3qbnXL0ify7JKFKuz/A1vb0E/xwLmgmlh7 c8TPlvVr3IWn3JiejodLLfhh4G8wA0lhG/ByHfq6KdbqePYfB7zZCBpRTm91uqzGVzr1 4c61b/S4ocRGw9q3+hGWG3rp4EArMyMv1+MGh4UKtuXHF3bUzGtFPFNpxjNMN7zAm3K5 55SedXlXkpyedQpE0mTYcx5GPVYDZaimRQ74pEzalMTvTcl53bmvkuIWb0jWVnTK5HgP NqUZEGauIgpwOmmnrQIwnclbamgO5zHY3sau23Jv017AnEqNsKzEmzuQ2JpX8J7MTFnv VkXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ceQokZKt; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 89si2046416qtc.116.2019.09.26.09.50.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Sep 2019 09:50:34 -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; dkim=fail header.i=@linaro.org header.s=google header.b=ceQokZKt; 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=linaro.org Received: from localhost ([::1]:40978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDWyP-0006IU-0f for patch@linaro.org; Thu, 26 Sep 2019 12:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41438) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDWcI-0002kq-4z for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDWcG-0004r0-4c for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:41 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36439) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDWcF-0004qC-SK for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:40 -0400 Received: by mail-pg1-f195.google.com with SMTP id t14so1854205pgs.3 for ; Thu, 26 Sep 2019 09:27:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mWk22l7+U+HSJUTJYCZqfIFiiQLzuuV4OTUO0HR+ZVI=; b=ceQokZKt50XVq/CMsn1tkxFjfpAq5UP4WrHW1IQJuzhq4W72V9XrJPoe3GkNWN3ujo GB4DOUrn0c2456X4Zdsw/hNi2swUBXyMYFYwbA7JjkzsIIRJdeAUDlS3NihcFVFB/AaH ILWc14HZ6dmEXP7xku/epRdS1CFQS7Ro/90uWYhcS8LjFukAbfIHR6WrR0KYXHWRs6YL 1ejS5qUjwt/8RzAAgTxzjoc9BDZ7SMc2mA7u/Rsv5ImWmsuwsh853XIdBg2yI88grx4c ur79hPMLQtfv5qVylg0Ozowip85nildVPu9QpeLwOrl/5n+J9sAEDsiHqAWF+nRI30SH P8Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mWk22l7+U+HSJUTJYCZqfIFiiQLzuuV4OTUO0HR+ZVI=; b=CoXk0qD2wWazcg53M6Arqr/5EfrmMJU1cvPyHZzKWeXdrfCSo9Y8Rxb8KtvwUx82Y8 kBYLy1jEjf2vxYaxKJ+jtmAVMJLwF8bwRQRaUy5ppwJnUUCWODOdqNLbxMJ9LTQ7nvdh TmgVTGzXd7ZGIeRy8uDS/4jqoXIDRErfuvt27VOFpMreNL7qoVRIGdgm1ueF1Od1VyV7 pyqnP2hlMqqekDanxerVA49TgxbvHHv4TixYhzTvopg7Lb20446PDfiN89FK6AtyZkbT iwYgpGSDb8z5ba2yG4kLVCjii0BoE4xweFr+l5YI+nNwfZej3VovMDNZbvoSeNGaSKTv P2CA== X-Gm-Message-State: APjAAAXH7rzIMQcxK2w3IclMDi2DwT0HtYCOVAAO6RdQpXaimvNQxKWn Ih2enZEtbzh6A50uH+2IEYK3vzt5R58= X-Received: by 2002:a62:32c5:: with SMTP id y188mr4504702pfy.97.1569515198469; Thu, 26 Sep 2019 09:26:38 -0700 (PDT) Received: from localhost.localdomain ([12.157.10.114]) by smtp.gmail.com with ESMTPSA id 64sm4453169pfx.31.2019.09.26.09.26.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 09:26:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 15/18] target/s390x: Rely on unwinding in s390_cpu_virt_mem_rw Date: Thu, 26 Sep 2019 09:26:12 -0700 Message-Id: <20190926162615.31168-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190926162615.31168-1-richard.henderson@linaro.org> References: <20190926162615.31168-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.215.195 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, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Richard Henderson --- target/s390x/mmu_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 Reviewed-by: David Hildenbrand diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 5ecd9ee87e..bf7fddb056 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -482,7 +482,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++) {