From nobody Wed Nov 5 16:15:27 2025 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497013589395306.4191025648654; Fri, 9 Jun 2017 06:06:29 -0700 (PDT) Received: from localhost ([::1]:54558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJJcQ-0005OY-RE for importer@patchew.org; Fri, 09 Jun 2017 09:06:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJJag-0004H9-1f for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:04:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJJaf-0003yP-6v for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:04:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48308) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJJaf-0003y9-0u for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:04:37 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 12DA5C057FA4 for ; Fri, 9 Jun 2017 13:04:36 +0000 (UTC) Received: from pxdev.xzpeter.org.com (ovpn-12-95.pek2.redhat.com [10.72.12.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B37F18793; Fri, 9 Jun 2017 13:04:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 12DA5C057FA4 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 12DA5C057FA4 From: Peter Xu To: qemu-devel@nongnu.org Date: Fri, 9 Jun 2017 21:04:12 +0800 Message-Id: <1497013453-13688-3-git-send-email-peterx@redhat.com> In-Reply-To: <1497013453-13688-1-git-send-email-peterx@redhat.com> References: <1497013453-13688-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 09 Jun 2017 13:04:36 +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 Subject: [Qemu-devel] [PATCH 2/3] intel_iommu: cleanup vtd_iommu_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: , Cc: Marcel Apfelbaum , Jason Wang , peterx@redhat.com, "Michael S . Tsirkin" 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" So even with PT we'll get a log now. Also, remove useless assignments. Signed-off-by: Peter Xu --- hw/i386/intel_iommu.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index c818dd4..f94fc4e 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2253,25 +2253,21 @@ static IOMMUTLBEntry vtd_iommu_translate(MemoryRegi= on *iommu, hwaddr addr, VTDAddressSpace *vtd_as =3D container_of(iommu, VTDAddressSpace, iommu= ); IntelIOMMUState *s =3D vtd_as->iommu_state; IOMMUTLBEntry ret =3D { + /* We'll fill in the rest later. */ .target_as =3D &address_space_memory, - .iova =3D addr, - .translated_addr =3D 0, - .addr_mask =3D ~(hwaddr)0, - .perm =3D IOMMU_NONE, }; =20 - if (!s->dmar_enabled) { + if (likely(s->dmar_enabled)) { + vtd_do_iommu_translate(vtd_as, vtd_as->bus, vtd_as->devfn, addr, + flag & IOMMU_WO, &ret); + } else { /* DMAR disabled, passthrough, use 4k-page*/ ret.iova =3D addr & VTD_PAGE_MASK_4K; ret.translated_addr =3D addr & VTD_PAGE_MASK_4K; ret.addr_mask =3D ~VTD_PAGE_MASK_4K; ret.perm =3D IOMMU_RW; - return ret; } =20 - vtd_do_iommu_translate(vtd_as, vtd_as->bus, vtd_as->devfn, addr, - flag & IOMMU_WO, &ret); - trace_vtd_dmar_translate(pci_bus_num(vtd_as->bus), VTD_PCI_SLOT(vtd_as->devfn), VTD_PCI_FUNC(vtd_as->devfn), --=20 2.7.4