From nobody Wed Oct 29 09:14:51 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.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 1524632099646605.459394313093; Tue, 24 Apr 2018 21:54:59 -0700 (PDT) Received: from localhost ([::1]:33835 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBCSI-0005ws-PT for importer@patchew.org; Wed, 25 Apr 2018 00:54:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBCPa-0004CV-Ky for qemu-devel@nongnu.org; Wed, 25 Apr 2018 00:52:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBCPZ-0007Mh-Oi for qemu-devel@nongnu.org; Wed, 25 Apr 2018 00:52:10 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43226 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 1fBCPZ-0007MV-J6 for qemu-devel@nongnu.org; Wed, 25 Apr 2018 00:52:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1855087ABE; Wed, 25 Apr 2018 04:52:09 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-55.pek2.redhat.com [10.72.12.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88AF683B84; Wed, 25 Apr 2018 04:52:06 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 25 Apr 2018 12:51:25 +0800 Message-Id: <20180425045129.17449-7-peterx@redhat.com> In-Reply-To: <20180425045129.17449-1-peterx@redhat.com> References: <20180425045129.17449-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 25 Apr 2018 04:52:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 25 Apr 2018 04:52:09 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@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 06/10] intel-iommu: pass in address space when page walk 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: Jason Wang , Alex Williamson , Jintack Lim , 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" We pass in the VTDAddressSpace to replace the aw bits when doing page walk. The VTDAddressSpace contains the aw bits information, meanwhile we'll need to do something more in the follow up patches regarding to the address spaces. Signed-off-by: Peter Xu --- hw/i386/intel_iommu.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 42f607676c..a19c18b8d4 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -756,13 +756,13 @@ typedef int (*vtd_page_walk_hook)(IOMMUTLBEntry *entr= y, void *private); * @hook_fn: hook func to be called when detected page * @private: private data to be passed into hook func * @notify_unmap: whether we should notify invalid entries - * @aw: maximum address width + * @as: VT-d address space of the device */ typedef struct { + VTDAddressSpace *as; vtd_page_walk_hook hook_fn; void *private; bool notify_unmap; - uint8_t aw; } vtd_page_walk_info; =20 static int vtd_page_walk_one(IOMMUTLBEntry *entry, int level, @@ -799,6 +799,7 @@ static int vtd_page_walk_level(dma_addr_t addr, uint64_= t start, uint64_t iova =3D start; uint64_t iova_next; int ret =3D 0; + uint8_t aw =3D info->as->iommu_state->aw_bits; =20 trace_vtd_page_walk_level(addr, level, start, end); =20 @@ -839,7 +840,7 @@ static int vtd_page_walk_level(dma_addr_t addr, uint64_= t start, =20 if (vtd_is_last_slpte(slpte, level)) { /* NOTE: this is only meaningful if entry_valid =3D=3D true */ - entry.translated_addr =3D vtd_get_slpte_addr(slpte, info->aw); + entry.translated_addr =3D vtd_get_slpte_addr(slpte, aw); if (!entry_valid && !info->notify_unmap) { trace_vtd_page_walk_skip_perm(iova, iova_next); goto next; @@ -865,7 +866,7 @@ static int vtd_page_walk_level(dma_addr_t addr, uint64_= t start, } goto next; } - ret =3D vtd_page_walk_level(vtd_get_slpte_addr(slpte, info->aw= ), + ret =3D vtd_page_walk_level(vtd_get_slpte_addr(slpte, aw), iova, MIN(iova_next, end), level - 1, read_cur, write_cur, info); if (ret < 0) { @@ -888,19 +889,20 @@ next: * @end: IOVA range end address (start <=3D addr < end) * @hook_fn: the hook that to be called for each detected area * @private: private data for the hook function - * @aw: maximum address width + * @as: the VT-d address space of the device */ static int vtd_page_walk(VTDContextEntry *ce, uint64_t start, uint64_t end, vtd_page_walk_hook hook_fn, void *private, - bool notify_unmap, uint8_t aw) + bool notify_unmap, VTDAddressSpace *as) { dma_addr_t addr =3D vtd_ce_get_slpt_base(ce); uint32_t level =3D vtd_ce_get_level(ce); + uint8_t aw =3D as->iommu_state->aw_bits; vtd_page_walk_info info =3D { .hook_fn =3D hook_fn, .private =3D private, .notify_unmap =3D notify_unmap, - .aw =3D aw, + .as =3D as, }; =20 if (!vtd_iova_range_check(start, ce, aw)) { @@ -1464,7 +1466,7 @@ static void vtd_iotlb_page_invalidate_notify(IntelIOM= MUState *s, */ vtd_page_walk(&ce, addr, addr + size, vtd_page_invalidate_notify_hook, - (void *)&vtd_as->iommu, true, s->aw_bits); + (void *)&vtd_as->iommu, true, vtd_as); } else { /* * For UNMAP-only notifiers, we don't need to walk the @@ -2935,7 +2937,7 @@ static void vtd_iommu_replay(IOMMUMemoryRegion *iommu= _mr, IOMMUNotifier *n) if (vtd_as_notify_mappings(vtd_as)) { /* This is required only for MAP typed notifiers */ vtd_page_walk(&ce, 0, ~0ULL, vtd_replay_hook, (void *)n, false, - s->aw_bits); + vtd_as); } } else { trace_vtd_replay_ce_invalid(bus_n, PCI_SLOT(vtd_as->devfn), --=20 2.14.3