From nobody Tue Feb 10 23:00:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523974278606949.6993019064889; Tue, 17 Apr 2018 07:11:18 -0700 (PDT) Received: from localhost ([::1]:41052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8RKH-0002fK-Ez for importer@patchew.org; Tue, 17 Apr 2018 10:11:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8RHE-0000IO-8y for qemu-devel@nongnu.org; Tue, 17 Apr 2018 10:08:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f8RHC-0003G9-Gm for qemu-devel@nongnu.org; Tue, 17 Apr 2018 10:08:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35548 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f8RHC-0003Fn-AZ for qemu-devel@nongnu.org; Tue, 17 Apr 2018 10:08:06 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 027EB406C510 for ; Tue, 17 Apr 2018 14:08:06 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-72.ams2.redhat.com [10.36.116.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 887B0200BCB0 for ; Tue, 17 Apr 2018 14:08:05 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2018 16:08:00 +0200 Message-Id: <20180417140802.16711-3-pbonzini@redhat.com> In-Reply-To: <20180417140802.16711-1-pbonzini@redhat.com> References: <20180417140802.16711-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 17 Apr 2018 14:08:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Tue, 17 Apr 2018 14:08:06 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 2/4] exec: small changes to flatview_do_translate 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Prepare for extracting the IOMMU part to a separate function. Mostly cosmetic; the only semantic change is that, if there is more than one cascaded IOMMU and the second one fails to translate, *plen_out is now adjusted according to the page mask of the first IOMMU. Signed-off-by: Paolo Bonzini Reviewed-by: Peter Xu --- exec.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/exec.c b/exec.c index 02b1efebb7..1dea3e9c95 100644 --- a/exec.c +++ b/exec.c @@ -476,6 +476,7 @@ address_space_translate_internal(AddressSpaceDispatch *= d, hwaddr addr, hwaddr *x * would tell. It can be @NULL if we don't care about it. * @is_write: whether the translation operation is for write * @is_mmio: whether this can be MMIO, set true if it can + * @target_as: the address space targeted by the IOMMU * * This function is called from RCU critical section */ @@ -495,14 +496,14 @@ static MemoryRegionSection flatview_do_translate(Flat= View *fv, hwaddr page_mask =3D (hwaddr)(-1); hwaddr plen =3D (hwaddr)(-1); =20 - if (plen_out) { - plen =3D *plen_out; + if (!plen_out) { + plen_out =3D &plen; } =20 for (;;) { section =3D address_space_translate_internal( - flatview_to_dispatch(fv), addr, &addr, - &plen, is_mmio); + flatview_to_dispatch(fv), addr, xlat, + plen_out, is_mmio); =20 iommu_mr =3D memory_region_get_iommu(section->mr); if (!iommu_mr) { @@ -510,35 +511,29 @@ static MemoryRegionSection flatview_do_translate(Flat= View *fv, } imrc =3D memory_region_get_iommu_class_nocheck(iommu_mr); =20 + addr =3D *xlat; iotlb =3D imrc->translate(iommu_mr, addr, is_write ? IOMMU_WO : IOMMU_RO); - addr =3D ((iotlb.translated_addr & ~iotlb.addr_mask) - | (addr & iotlb.addr_mask)); - page_mask &=3D iotlb.addr_mask; - plen =3D MIN(plen, (addr | iotlb.addr_mask) - addr + 1); if (!(iotlb.perm & (1 << is_write))) { goto translate_fail; } =20 + addr =3D ((iotlb.translated_addr & ~iotlb.addr_mask) + | (addr & iotlb.addr_mask)); + page_mask &=3D iotlb.addr_mask; + *plen_out =3D MIN(*plen_out, (addr | iotlb.addr_mask) - addr + 1); fv =3D address_space_to_flatview(iotlb.target_as); *target_as =3D iotlb.target_as; } =20 - *xlat =3D addr; - - if (page_mask =3D=3D (hwaddr)(-1)) { - /* Not behind an IOMMU, use default page size. */ - page_mask =3D ~TARGET_PAGE_MASK; - } - if (page_mask_out) { + if (page_mask =3D=3D (hwaddr)(-1)) { + /* Not behind an IOMMU, use default page size. */ + page_mask =3D ~TARGET_PAGE_MASK; + } *page_mask_out =3D page_mask; } =20 - if (plen_out) { - *plen_out =3D plen; - } - return *section; =20 translate_fail: --=20 2.17.0