From nobody Wed Nov 12 10:13:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1569614121; cv=none; d=zoho.com; s=zohoarc; b=ZpuU43R1D2VHy0CSETYEMHzWTbaJ2yaSNNDcSlf//yI8ag2MYG1ns2uXyK3GN4FSgFC0L7uEfKbBaz1mur69PRD2zGaveuEJPMYl3+b4SHbdnhXgtsCjnHlMr+8Y1lXnBkBh6r2os2BRbfoQgz8g76BsVxHfTPvGeuiLcptVjQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569614121; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qj0g/zRgOiSEpMHPGaPSUxN7m4nHw3kwz18pUXG2uUM=; b=gJG5TsG6VUNMGjStOQit9ic3G7I2c68E4qdt7Xs+QdOCug5UHeuH0eegd2wK0KKhYnOW6Q2YFdj2mJ6s6tx/wz+Y9S2kdN7PppPHOplf/HUuUqFGgpPQzm9Sm0Et8/X0l/dVeFtRohMu0v6yGPm5986YZwHu0hB76th7mEfZSJ8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569614121561249.36808692896273; Fri, 27 Sep 2019 12:55:21 -0700 (PDT) Received: from localhost ([::1]:57046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDwKm-0002Sz-3F for importer@patchew.org; Fri, 27 Sep 2019 15:55:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46646) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDw5q-0003PK-9M for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:39:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDw5m-0006Tr-Mc for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:39:53 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:37121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDw5l-0006S0-OK for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:39:50 -0400 Received: by mail-pg1-x541.google.com with SMTP id c17so4018769pgg.4 for ; Fri, 27 Sep 2019 12:39:49 -0700 (PDT) Received: from localhost.localdomain ([12.206.46.62]) by smtp.gmail.com with ESMTPSA id 192sm3676403pfb.110.2019.09.27.12.39.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 12:39:46 -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=qj0g/zRgOiSEpMHPGaPSUxN7m4nHw3kwz18pUXG2uUM=; b=CJg7JnWIhNVoShk6MsAe8LCPCoHm4beqWO3oG3HlQnt17f75trH+ZwCNpUEzCYrokK 6iHTtRxdOqXkUJeRSYpooCPlOti9ME8YLxkOPXP5p3FqTzOmVgBH0sbUqPsOv3ceuvH8 VsLV31AVHbcALvpHi1T4Oyqp+gEN0PB18dm+MWw+RLy1cTXQeL3yhMh0Ei+BeH+veMsu WFa/QghcENqWIluPrLQ89/jUtRR4fWvNGSk9YH5jlbGu7JxF7IirLNZEW48UXhhU0Vbw asj6XfAiuMO/xdagkTFznLWlvlIsnX/SmymG6BivSiO6JI1E/7fpvwPg/ggQ+ORMoKbd 1IbQ== 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=qj0g/zRgOiSEpMHPGaPSUxN7m4nHw3kwz18pUXG2uUM=; b=SfZya3OgyeBIVYPWakGCWTMyLIaGXo3rlomOGk6MruDcp5fS6ivmxfiuanyDn7KMqG JsIqL9yJdtP0ONPda7yT+0cXB90dXX9bM1sPwgIYMooCKMu4eVHqeCQnjMQgwbDJPtg9 rw17uPbr8jwesCn8RxRDYPdoRcdIhliSahuxWUqJK1tMgNa1vI7tAhkQfLOEnVEQ7ZET 1ed9F9uqitJBuuWQ9oql7ZKVOd9fwNgmQ2UFs6GIkLtpKYj/Vl3xivXocz/DOIkaVFzx o7GzjhwTQx3KlnJxb8Rg7arMINRgIozir5MygRA9nnmgxN61QKUdUTxymww+Fgai8qZ3 2Z5Q== X-Gm-Message-State: APjAAAXqVl8fTmSrJEb4N75any1uSKdnlXSozsV6r6DlFTqAkaydLInr GdzS75Zb3+8KNiVsGvT4ep8R9w1MLQg= X-Google-Smtp-Source: APXvYqxoHQr6aXDQE0XLdYjy5bmg5TGx98j6IWRBs0ofjmLu4KYoXlGCYroAw8oxr8m9cDFNkZKTZg== X-Received: by 2002:a63:cf0a:: with SMTP id j10mr10818410pgg.388.1569613187487; Fri, 27 Sep 2019 12:39:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 10/18] target/s390x: Return exception from translate_pages Date: Fri, 27 Sep 2019 12:39:17 -0700 Message-Id: <20190927193925.23567-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927193925.23567-1-richard.henderson@linaro.org> References: <20190927193925.23567-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- target/s390x/mmu_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 8ea1c95549..98ac58574c 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -452,25 +452,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 *t= ec) { uint64_t asc =3D cpu->env.psw.mask & PSW_MASK_ASC; CPUS390XState *env =3D &cpu->env; int ret, i, pflags; =20 for (i =3D 0; i < nr_pages; i++) { - uint64_t tec; - - ret =3D mmu_translate(env, addr, is_write, asc, &pages[i], &pflags= , &tec); + ret =3D 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 =3D 0; /* unused */ + return PGM_ADDRESSING; } addr +=3D TARGET_PAGE_SIZE; } @@ -498,6 +495,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uin= t8_t ar, void *hostbuf, { int currlen, nr_pages, i; target_ulong *pages; + uint64_t tec; int ret; =20 if (kvm_enabled()) { @@ -511,8 +509,10 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, ui= nt8_t ar, void *hostbuf, + 1; pages =3D g_malloc(nr_pages * sizeof(*pages)); =20 - ret =3D translate_pages(cpu, laddr, nr_pages, pages, is_write); - if (ret =3D=3D 0 && hostbuf !=3D NULL) { + ret =3D translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec); + if (ret) { + trigger_access_exception(&cpu->env, ret, ILEN_AUTO, tec); + } else if (hostbuf !=3D NULL) { /* Copy data by stepping through the area page by page */ for (i =3D 0; i < nr_pages; i++) { currlen =3D MIN(len, TARGET_PAGE_SIZE - (laddr % TARGET_PAGE_S= IZE)); --=20 2.17.1