From nobody Tue Nov 18 01:22:03 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606909351; cv=none; d=zohomail.com; s=zohoarc; b=gDeKsPlJNvia+LeXZPKIYysbHY/J0fV7ddK2wlcsfdLwBPiIAM3uI2hRz/7RLRrJo23X1tguYQZYYq9aiY5kRHBe32p8C3/0DZnbCn1hl2DSwKGHKggmfrpVcKoUmP67WAWEVbU5pTFezfm8pIDr4jrroXGV/hdQAxG6x0IWByY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606909351; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hCZCKCuFOJBCydymGeiwWLBXi/oP0lMJNiHZPbP0zJw=; b=aFDcXZcmmBPWplM+u1sroUKk5dVVhcGtfWCWo2SmSpx+/ba8d8pe9Ch8CW11rbOjKy5dLKWFDZ8YmIOssoBw/xPwCEtSKDNM/UAvfdd6nL2avzWfhJIllqTYOF4dPrz8dutqFsFiZF+rurZF0QhxLCTS7XNWPufi8o0Ynr7bXRI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1606909351874841.563162733676; Wed, 2 Dec 2020 03:42:31 -0800 (PST) Received: from localhost ([::1]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkQWk-0004J8-3l for importer@patchew.org; Wed, 02 Dec 2020 06:42:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkPuu-0002pf-Tk for qemu-devel@nongnu.org; Wed, 02 Dec 2020 06:03:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkPur-0002rs-Mc for qemu-devel@nongnu.org; Wed, 02 Dec 2020 06:03:24 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-7pBY1RS0Pi21Q1BPBpoUdQ-1; Wed, 02 Dec 2020 06:03:19 -0500 Received: by mail-wr1-f70.google.com with SMTP id n1so3305551wro.22 for ; Wed, 02 Dec 2020 03:03:18 -0800 (PST) Received: from redhat.com (bzq-79-176-44-197.red.bezeqint.net. [79.176.44.197]) by smtp.gmail.com with ESMTPSA id a9sm1711967wrp.21.2020.12.02.03.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 03:03:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606907000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hCZCKCuFOJBCydymGeiwWLBXi/oP0lMJNiHZPbP0zJw=; b=geORiVi9V7xc4fCFcHCzGXfSs26nS3Mqs+Lpd80j6NKDNDk8He/aB1vRubppL+FLm99/p6 FjbJEmdUcLWVF7WDsu480BdBmPF4zcLOIov0hgAVkDJgd3nF4yycR/4FNWjUz8HQzBlZJF fjiHgVNMBgYddWSnyHh2CRxNJ1mE/h4= X-MC-Unique: 7pBY1RS0Pi21Q1BPBpoUdQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=hCZCKCuFOJBCydymGeiwWLBXi/oP0lMJNiHZPbP0zJw=; b=ILmbAlMkh7zliOS5Ytd7JwrDpncF7QiH66HI7dgev8753LI/rR2+l0yagCarbj1b9K 88+W8UbChwy5vqm0/M/GLzZq4gpZW9zwRMLkUClHy032kNivu60uBHsYku4EwB/zf22t BaACGKrCbzuEMdA+pawFH+8Y3wWAIxvYCfsBMJ/0OVcRSur02sAVQ9FDWHRC3Dw51+r9 gXF1+r6yuiuXvi4gM2vhkjnBApF10qarcHHyo/4ctNaUfnkxVqWdSX15ZHlHwtzFalTf xyJ1QX3h0NV8q8kIbfvQifwL/md7iaDblCAnFk1syRkSVqSe9pSkh0C37fLmrKasOrML /zJQ== X-Gm-Message-State: AOAM530k2WLgtdLVlJOd8WUea6gARJi/Y2eTC0WTX/1lSVsDdlUZg14O AlVzZNr71MGC7q0qNLrkPC/AbCoKF6iUOL6jLX/qXI1zO/9jC/+CepDxjGy/bQsOMhFk7TEDKzv 0cB6esc4T4+iytLKsi1/G80/ZLE+CwMREkgr9B87lOTUdRawo10YX2jd0cR3w X-Received: by 2002:a1c:a402:: with SMTP id n2mr2582563wme.185.1606906997171; Wed, 02 Dec 2020 03:03:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9bWnKvC5j42PERY34pSEQ/IsLi+CSESyQ55iZ4EfslYU27s+O6YhteYMgvl6Yijidvze1Eg== X-Received: by 2002:a1c:a402:: with SMTP id n2mr2582502wme.185.1606906996743; Wed, 02 Dec 2020 03:03:16 -0800 (PST) Date: Wed, 2 Dec 2020 06:03:13 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 3/6] memory: Add IOMMUTLBEvent Message-ID: <20201202101655.122214-4-mst@redhat.com> References: <20201202101655.122214-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201202101655.122214-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Thomas Huth , Eduardo Habkost , Matthew Rosato , Juan Quintela , Jason Wang , Cornelia Huck , Richard Henderson , Peter Xu , Halil Pasic , Eugenio =?utf-8?B?UMOpcmV6?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Eric Auger , Paolo Bonzini , David Hildenbrand , Christian Borntraeger , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Eugenio P=C3=A9rez This way we can tell between regular IOMMUTLBEntry (entry of IOMMU hardware) and notifications. In the notifications, we set explicitly if it is a MAPs or an UNMAP, instead of trusting in entry permissions to differentiate them. Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Peter Xu Reviewed-by: Juan Quintela Acked-by: Jason Wang Message-Id: <20201116165506.31315-3-eperezma@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Matthew Rosato Acked-by: David Gibson --- include/exec/memory.h | 27 ++++++------ hw/arm/smmu-common.c | 13 +++--- hw/arm/smmuv3.c | 13 +++--- hw/i386/intel_iommu.c | 88 ++++++++++++++++++++++------------------ hw/misc/tz-mpc.c | 32 ++++++++------- hw/ppc/spapr_iommu.c | 15 +++---- hw/s390x/s390-pci-inst.c | 27 +++++++----- hw/virtio/virtio-iommu.c | 30 +++++++------- softmmu/memory.c | 20 ++++----- 9 files changed, 143 insertions(+), 122 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index d8456ccf52..e86b5e92da 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -116,6 +116,11 @@ struct IOMMUNotifier { }; typedef struct IOMMUNotifier IOMMUNotifier; =20 +typedef struct IOMMUTLBEvent { + IOMMUNotifierFlag type; + IOMMUTLBEntry entry; +} IOMMUTLBEvent; + /* RAM is pre-allocated and passed into qemu_ram_alloc_from_ptr */ #define RAM_PREALLOC (1 << 0) =20 @@ -1326,24 +1331,18 @@ uint64_t memory_region_iommu_get_min_page_size(IOMM= UMemoryRegion *iommu_mr); /** * memory_region_notify_iommu: notify a change in an IOMMU translation ent= ry. * - * The notification type will be decided by entry.perm bits: - * - * - For UNMAP (cache invalidation) notifies: set entry.perm to IOMMU_NONE. - * - For MAP (newly added entry) notifies: set entry.perm to the - * permission of the page (which is definitely !IOMMU_NONE). - * * Note: for any IOMMU implementation, an in-place mapping change * should be notified with an UNMAP followed by a MAP. * * @iommu_mr: the memory region that was changed * @iommu_idx: the IOMMU index for the translation table which has changed - * @entry: the new entry in the IOMMU translation table. The entry - * replaces all old entries for the same virtual I/O address range. - * Deleted entries have .@perm =3D=3D 0. + * @event: TLB event with the new entry in the IOMMU translation table. + * The entry replaces all old entries for the same virtual I/O add= ress + * range. */ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, int iommu_idx, - IOMMUTLBEntry entry); + IOMMUTLBEvent event); =20 /** * memory_region_notify_iommu_one: notify a change in an IOMMU translation @@ -1353,12 +1352,12 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *= iommu_mr, * notifies a specific notifier, not all of them. * * @notifier: the notifier to be notified - * @entry: the new entry in the IOMMU translation table. The entry - * replaces all old entries for the same virtual I/O address range. - * Deleted entries have .@perm =3D=3D 0. + * @event: TLB event with the new entry in the IOMMU translation table. + * The entry replaces all old entries for the same virtual I/O add= ress + * range. */ void memory_region_notify_iommu_one(IOMMUNotifier *notifier, - IOMMUTLBEntry *entry); + IOMMUTLBEvent *event); =20 /** * memory_region_register_iommu_notifier: register a notifier for changes = to diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 88d2c454f0..405d5c5325 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -465,14 +465,15 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32= _t sid) /* Unmap the whole notifier's range */ static void smmu_unmap_notifier_range(IOMMUNotifier *n) { - IOMMUTLBEntry entry; + IOMMUTLBEvent event; =20 - entry.target_as =3D &address_space_memory; - entry.iova =3D n->start; - entry.perm =3D IOMMU_NONE; - entry.addr_mask =3D n->end - n->start; + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.target_as =3D &address_space_memory; + event.entry.iova =3D n->start; + event.entry.perm =3D IOMMU_NONE; + event.entry.addr_mask =3D n->end - n->start; =20 - memory_region_notify_iommu_one(n, &entry); + memory_region_notify_iommu_one(n, &event); } =20 /* Unmap all notifiers attached to @mr */ diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 273f5f7dce..bbca0e9f20 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -800,7 +800,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, uint8_t tg, uint64_t num_pages) { SMMUDevice *sdev =3D container_of(mr, SMMUDevice, iommu); - IOMMUTLBEntry entry; + IOMMUTLBEvent event; uint8_t granule =3D tg; =20 if (!tg) { @@ -823,12 +823,13 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, granule =3D tt->granule_sz; } =20 - entry.target_as =3D &address_space_memory; - entry.iova =3D iova; - entry.addr_mask =3D num_pages * (1 << granule) - 1; - entry.perm =3D IOMMU_NONE; + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.target_as =3D &address_space_memory; + event.entry.iova =3D iova; + event.entry.addr_mask =3D num_pages * (1 << granule) - 1; + event.entry.perm =3D IOMMU_NONE; =20 - memory_region_notify_iommu_one(n, &entry); + memory_region_notify_iommu_one(n, &event); } =20 /* invalidate an asid/iova range tuple in all mr's */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 067593b9e4..56180b1c43 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1073,7 +1073,7 @@ static int vtd_iova_to_slpte(IntelIOMMUState *s, VTDC= ontextEntry *ce, } } =20 -typedef int (*vtd_page_walk_hook)(IOMMUTLBEntry *entry, void *private); +typedef int (*vtd_page_walk_hook)(IOMMUTLBEvent *event, void *private); =20 /** * Constant information used during page walking @@ -1094,11 +1094,12 @@ typedef struct { uint16_t domain_id; } vtd_page_walk_info; =20 -static int vtd_page_walk_one(IOMMUTLBEntry *entry, vtd_page_walk_info *inf= o) +static int vtd_page_walk_one(IOMMUTLBEvent *event, vtd_page_walk_info *inf= o) { VTDAddressSpace *as =3D info->as; vtd_page_walk_hook hook_fn =3D info->hook_fn; void *private =3D info->private; + IOMMUTLBEntry *entry =3D &event->entry; DMAMap target =3D { .iova =3D entry->iova, .size =3D entry->addr_mask, @@ -1107,7 +1108,7 @@ static int vtd_page_walk_one(IOMMUTLBEntry *entry, vt= d_page_walk_info *info) }; DMAMap *mapped =3D iova_tree_find(as->iova_tree, &target); =20 - if (entry->perm =3D=3D IOMMU_NONE && !info->notify_unmap) { + if (event->type =3D=3D IOMMU_NOTIFIER_UNMAP && !info->notify_unmap) { trace_vtd_page_walk_one_skip_unmap(entry->iova, entry->addr_mask); return 0; } @@ -1115,7 +1116,7 @@ static int vtd_page_walk_one(IOMMUTLBEntry *entry, vt= d_page_walk_info *info) assert(hook_fn); =20 /* Update local IOVA mapped ranges */ - if (entry->perm) { + if (event->type =3D=3D IOMMU_NOTIFIER_MAP) { if (mapped) { /* If it's exactly the same translation, skip */ if (!memcmp(mapped, &target, sizeof(target))) { @@ -1141,19 +1142,21 @@ static int vtd_page_walk_one(IOMMUTLBEntry *entry, = vtd_page_walk_info *info) int ret; =20 /* Emulate an UNMAP */ + event->type =3D IOMMU_NOTIFIER_UNMAP; entry->perm =3D IOMMU_NONE; trace_vtd_page_walk_one(info->domain_id, entry->iova, entry->translated_addr, entry->addr_mask, entry->perm); - ret =3D hook_fn(entry, private); + ret =3D hook_fn(event, private); if (ret) { return ret; } /* Drop any existing mapping */ iova_tree_remove(as->iova_tree, &target); - /* Recover the correct permission */ + /* Recover the correct type */ + event->type =3D IOMMU_NOTIFIER_MAP; entry->perm =3D cache_perm; } } @@ -1170,7 +1173,7 @@ static int vtd_page_walk_one(IOMMUTLBEntry *entry, vt= d_page_walk_info *info) trace_vtd_page_walk_one(info->domain_id, entry->iova, entry->translated_addr, entry->addr_mask, entry->perm); - return hook_fn(entry, private); + return hook_fn(event, private); } =20 /** @@ -1191,7 +1194,7 @@ static int vtd_page_walk_level(dma_addr_t addr, uint6= 4_t start, uint32_t offset; uint64_t slpte; uint64_t subpage_size, subpage_mask; - IOMMUTLBEntry entry; + IOMMUTLBEvent event; uint64_t iova =3D start; uint64_t iova_next; int ret =3D 0; @@ -1245,13 +1248,15 @@ static int vtd_page_walk_level(dma_addr_t addr, uin= t64_t start, * * In either case, we send an IOTLB notification down. */ - entry.target_as =3D &address_space_memory; - entry.iova =3D iova & subpage_mask; - entry.perm =3D IOMMU_ACCESS_FLAG(read_cur, write_cur); - entry.addr_mask =3D ~subpage_mask; + event.entry.target_as =3D &address_space_memory; + event.entry.iova =3D iova & subpage_mask; + event.entry.perm =3D IOMMU_ACCESS_FLAG(read_cur, write_cur); + event.entry.addr_mask =3D ~subpage_mask; /* NOTE: this is only meaningful if entry_valid =3D=3D true */ - entry.translated_addr =3D vtd_get_slpte_addr(slpte, info->aw); - ret =3D vtd_page_walk_one(&entry, info); + event.entry.translated_addr =3D vtd_get_slpte_addr(slpte, info= ->aw); + event.type =3D event.entry.perm ? IOMMU_NOTIFIER_MAP : + IOMMU_NOTIFIER_UNMAP; + ret =3D vtd_page_walk_one(&event, info); } =20 if (ret < 0) { @@ -1430,10 +1435,10 @@ static int vtd_dev_to_context_entry(IntelIOMMUState= *s, uint8_t bus_num, return 0; } =20 -static int vtd_sync_shadow_page_hook(IOMMUTLBEntry *entry, +static int vtd_sync_shadow_page_hook(IOMMUTLBEvent *event, void *private) { - memory_region_notify_iommu((IOMMUMemoryRegion *)private, 0, *entry); + memory_region_notify_iommu(private, 0, *event); return 0; } =20 @@ -1993,14 +1998,17 @@ static void vtd_iotlb_page_invalidate_notify(IntelI= OMMUState *s, * page tables. We just deliver the PSI down to * invalidate caches. */ - IOMMUTLBEntry entry =3D { - .target_as =3D &address_space_memory, - .iova =3D addr, - .translated_addr =3D 0, - .addr_mask =3D size - 1, - .perm =3D IOMMU_NONE, + IOMMUTLBEvent event =3D { + .type =3D IOMMU_NOTIFIER_UNMAP, + .entry =3D { + .target_as =3D &address_space_memory, + .iova =3D addr, + .translated_addr =3D 0, + .addr_mask =3D size - 1, + .perm =3D IOMMU_NONE, + }, }; - memory_region_notify_iommu(&vtd_as->iommu, 0, entry); + memory_region_notify_iommu(&vtd_as->iommu, 0, event); } } } @@ -2412,7 +2420,7 @@ static bool vtd_process_device_iotlb_desc(IntelIOMMUS= tate *s, VTDInvDesc *inv_desc) { VTDAddressSpace *vtd_dev_as; - IOMMUTLBEntry entry; + IOMMUTLBEvent event; struct VTDBus *vtd_bus; hwaddr addr; uint64_t sz; @@ -2460,12 +2468,13 @@ static bool vtd_process_device_iotlb_desc(IntelIOMM= UState *s, sz =3D VTD_PAGE_SIZE; } =20 - entry.target_as =3D &vtd_dev_as->as; - entry.addr_mask =3D sz - 1; - entry.iova =3D addr; - entry.perm =3D IOMMU_NONE; - entry.translated_addr =3D 0; - memory_region_notify_iommu(&vtd_dev_as->iommu, 0, entry); + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.target_as =3D &vtd_dev_as->as; + event.entry.addr_mask =3D sz - 1; + event.entry.iova =3D addr; + event.entry.perm =3D IOMMU_NONE; + event.entry.translated_addr =3D 0; + memory_region_notify_iommu(&vtd_dev_as->iommu, 0, event); =20 done: return true; @@ -3485,19 +3494,20 @@ static void vtd_address_space_unmap(VTDAddressSpace= *as, IOMMUNotifier *n) size =3D remain =3D end - start + 1; =20 while (remain >=3D VTD_PAGE_SIZE) { - IOMMUTLBEntry entry; + IOMMUTLBEvent event; uint64_t mask =3D get_naturally_aligned_size(start, remain, s->aw_= bits); =20 assert(mask); =20 - entry.iova =3D start; - entry.addr_mask =3D mask - 1; - entry.target_as =3D &address_space_memory; - entry.perm =3D IOMMU_NONE; + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.iova =3D start; + event.entry.addr_mask =3D mask - 1; + event.entry.target_as =3D &address_space_memory; + event.entry.perm =3D IOMMU_NONE; /* This field is meaningless for unmap */ - entry.translated_addr =3D 0; + event.entry.translated_addr =3D 0; =20 - memory_region_notify_iommu_one(n, &entry); + memory_region_notify_iommu_one(n, &event); =20 start +=3D mask; remain -=3D mask; @@ -3533,9 +3543,9 @@ static void vtd_address_space_refresh_all(IntelIOMMUS= tate *s) vtd_switch_address_space_all(s); } =20 -static int vtd_replay_hook(IOMMUTLBEntry *entry, void *private) +static int vtd_replay_hook(IOMMUTLBEvent *event, void *private) { - memory_region_notify_iommu_one((IOMMUNotifier *)private, entry); + memory_region_notify_iommu_one(private, event); return 0; } =20 diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index 98f151237f..30481e1c90 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -82,8 +82,10 @@ static void tz_mpc_iommu_notify(TZMPC *s, uint32_t lutid= x, /* Called when the LUT word at lutidx has changed from oldlut to newlu= t; * must call the IOMMU notifiers for the changed blocks. */ - IOMMUTLBEntry entry =3D { - .addr_mask =3D s->blocksize - 1, + IOMMUTLBEvent event =3D { + .entry =3D { + .addr_mask =3D s->blocksize - 1, + } }; hwaddr addr =3D lutidx * s->blocksize * 32; int i; @@ -100,26 +102,28 @@ static void tz_mpc_iommu_notify(TZMPC *s, uint32_t lu= tidx, block_is_ns =3D newlut & (1 << i); =20 trace_tz_mpc_iommu_notify(addr); - entry.iova =3D addr; - entry.translated_addr =3D addr; + event.entry.iova =3D addr; + event.entry.translated_addr =3D addr; =20 - entry.perm =3D IOMMU_NONE; - memory_region_notify_iommu(&s->upstream, IOMMU_IDX_S, entry); - memory_region_notify_iommu(&s->upstream, IOMMU_IDX_NS, entry); + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.perm =3D IOMMU_NONE; + memory_region_notify_iommu(&s->upstream, IOMMU_IDX_S, event); + memory_region_notify_iommu(&s->upstream, IOMMU_IDX_NS, event); =20 - entry.perm =3D IOMMU_RW; + event.type =3D IOMMU_NOTIFIER_MAP; + event.entry.perm =3D IOMMU_RW; if (block_is_ns) { - entry.target_as =3D &s->blocked_io_as; + event.entry.target_as =3D &s->blocked_io_as; } else { - entry.target_as =3D &s->downstream_as; + event.entry.target_as =3D &s->downstream_as; } - memory_region_notify_iommu(&s->upstream, IOMMU_IDX_S, entry); + memory_region_notify_iommu(&s->upstream, IOMMU_IDX_S, event); if (block_is_ns) { - entry.target_as =3D &s->downstream_as; + event.entry.target_as =3D &s->downstream_as; } else { - entry.target_as =3D &s->blocked_io_as; + event.entry.target_as =3D &s->blocked_io_as; } - memory_region_notify_iommu(&s->upstream, IOMMU_IDX_NS, entry); + memory_region_notify_iommu(&s->upstream, IOMMU_IDX_NS, event); } } =20 diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 0790239ba5..30352df00e 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -445,7 +445,7 @@ static void spapr_tce_reset(DeviceState *dev) static target_ulong put_tce_emu(SpaprTceTable *tcet, target_ulong ioba, target_ulong tce) { - IOMMUTLBEntry entry; + IOMMUTLBEvent event; hwaddr page_mask =3D IOMMU_PAGE_MASK(tcet->page_shift); unsigned long index =3D (ioba - tcet->bus_offset) >> tcet->page_shift; =20 @@ -457,12 +457,13 @@ static target_ulong put_tce_emu(SpaprTceTable *tcet, = target_ulong ioba, =20 tcet->table[index] =3D tce; =20 - entry.target_as =3D &address_space_memory, - entry.iova =3D (ioba - tcet->bus_offset) & page_mask; - entry.translated_addr =3D tce & page_mask; - entry.addr_mask =3D ~page_mask; - entry.perm =3D spapr_tce_iommu_access_flags(tce); - memory_region_notify_iommu(&tcet->iommu, 0, entry); + event.entry.target_as =3D &address_space_memory, + event.entry.iova =3D (ioba - tcet->bus_offset) & page_mask; + event.entry.translated_addr =3D tce & page_mask; + event.entry.addr_mask =3D ~page_mask; + event.entry.perm =3D spapr_tce_iommu_access_flags(tce); + event.type =3D event.entry.perm ? IOMMU_NOTIFIER_MAP : IOMMU_NOTIFIER_= UNMAP; + memory_region_notify_iommu(&tcet->iommu, 0, event); =20 return H_SUCCESS; } diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 70bfd91bf7..d9e1e29f1e 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -602,15 +602,18 @@ static uint32_t s390_pci_update_iotlb(S390PCIIOMMU *i= ommu, S390IOTLBEntry *entry) { S390IOTLBEntry *cache =3D g_hash_table_lookup(iommu->iotlb, &entry->io= va); - IOMMUTLBEntry notify =3D { - .target_as =3D &address_space_memory, - .iova =3D entry->iova, - .translated_addr =3D entry->translated_addr, - .perm =3D entry->perm, - .addr_mask =3D ~PAGE_MASK, + IOMMUTLBEvent event =3D { + .type =3D entry->perm ? IOMMU_NOTIFIER_MAP : IOMMU_NOTIFIER_UNMAP, + .entry =3D { + .target_as =3D &address_space_memory, + .iova =3D entry->iova, + .translated_addr =3D entry->translated_addr, + .perm =3D entry->perm, + .addr_mask =3D ~PAGE_MASK, + }, }; =20 - if (entry->perm =3D=3D IOMMU_NONE) { + if (event.type =3D=3D IOMMU_NOTIFIER_UNMAP) { if (!cache) { goto out; } @@ -623,9 +626,11 @@ static uint32_t s390_pci_update_iotlb(S390PCIIOMMU *io= mmu, goto out; } =20 - notify.perm =3D IOMMU_NONE; - memory_region_notify_iommu(&iommu->iommu_mr, 0, notify); - notify.perm =3D entry->perm; + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.perm =3D IOMMU_NONE; + memory_region_notify_iommu(&iommu->iommu_mr, 0, event); + event.type =3D IOMMU_NOTIFIER_MAP; + event.entry.perm =3D entry->perm; } =20 cache =3D g_new(S390IOTLBEntry, 1); @@ -637,7 +642,7 @@ static uint32_t s390_pci_update_iotlb(S390PCIIOMMU *iom= mu, dec_dma_avail(iommu); } =20 - memory_region_notify_iommu(&iommu->iommu_mr, 0, notify); + memory_region_notify_iommu(&iommu->iommu_mr, 0, event); =20 out: return iommu->dma_limit ? iommu->dma_limit->avail : 1; diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index fc5c75d693..cea8811295 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -129,7 +129,7 @@ static void virtio_iommu_notify_map(IOMMUMemoryRegion *= mr, hwaddr virt_start, hwaddr virt_end, hwaddr paddr, uint32_t flags) { - IOMMUTLBEntry entry; + IOMMUTLBEvent event; IOMMUAccessFlags perm =3D IOMMU_ACCESS_FLAG(flags & VIRTIO_IOMMU_MAP_F= _READ, flags & VIRTIO_IOMMU_MAP_F_W= RITE); =20 @@ -141,19 +141,20 @@ static void virtio_iommu_notify_map(IOMMUMemoryRegion= *mr, hwaddr virt_start, trace_virtio_iommu_notify_map(mr->parent_obj.name, virt_start, virt_en= d, paddr, perm); =20 - entry.target_as =3D &address_space_memory; - entry.addr_mask =3D virt_end - virt_start; - entry.iova =3D virt_start; - entry.perm =3D perm; - entry.translated_addr =3D paddr; + event.type =3D IOMMU_NOTIFIER_MAP; + event.entry.target_as =3D &address_space_memory; + event.entry.addr_mask =3D virt_end - virt_start; + event.entry.iova =3D virt_start; + event.entry.perm =3D perm; + event.entry.translated_addr =3D paddr; =20 - memory_region_notify_iommu(mr, 0, entry); + memory_region_notify_iommu(mr, 0, event); } =20 static void virtio_iommu_notify_unmap(IOMMUMemoryRegion *mr, hwaddr virt_s= tart, hwaddr virt_end) { - IOMMUTLBEntry entry; + IOMMUTLBEvent event; =20 if (!(mr->iommu_notify_flags & IOMMU_NOTIFIER_UNMAP)) { return; @@ -161,13 +162,14 @@ static void virtio_iommu_notify_unmap(IOMMUMemoryRegi= on *mr, hwaddr virt_start, =20 trace_virtio_iommu_notify_unmap(mr->parent_obj.name, virt_start, virt_= end); =20 - entry.target_as =3D &address_space_memory; - entry.addr_mask =3D virt_end - virt_start; - entry.iova =3D virt_start; - entry.perm =3D IOMMU_NONE; - entry.translated_addr =3D 0; + event.type =3D IOMMU_NOTIFIER_UNMAP; + event.entry.target_as =3D &address_space_memory; + event.entry.addr_mask =3D virt_end - virt_start; + event.entry.iova =3D virt_start; + event.entry.perm =3D IOMMU_NONE; + event.entry.translated_addr =3D 0; =20 - memory_region_notify_iommu(mr, 0, entry); + memory_region_notify_iommu(mr, 0, event); } =20 static gboolean virtio_iommu_notify_unmap_cb(gpointer key, gpointer value, diff --git a/softmmu/memory.c b/softmmu/memory.c index 44de610c72..6ca87e8d73 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1943,11 +1943,15 @@ void memory_region_unregister_iommu_notifier(Memory= Region *mr, } =20 void memory_region_notify_iommu_one(IOMMUNotifier *notifier, - IOMMUTLBEntry *entry) + IOMMUTLBEvent *event) { - IOMMUNotifierFlag request_flags; + IOMMUTLBEntry *entry =3D &event->entry; hwaddr entry_end =3D entry->iova + entry->addr_mask; =20 + if (event->type =3D=3D IOMMU_NOTIFIER_UNMAP) { + assert(entry->perm =3D=3D IOMMU_NONE); + } + /* * Skip the notification if the notification does not overlap * with registered range. @@ -1958,20 +1962,14 @@ void memory_region_notify_iommu_one(IOMMUNotifier *= notifier, =20 assert(entry->iova >=3D notifier->start && entry_end <=3D notifier->en= d); =20 - if (entry->perm & IOMMU_RW) { - request_flags =3D IOMMU_NOTIFIER_MAP; - } else { - request_flags =3D IOMMU_NOTIFIER_UNMAP; - } - - if (notifier->notifier_flags & request_flags) { + if (event->type & notifier->notifier_flags) { notifier->notify(notifier, entry); } } =20 void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, int iommu_idx, - IOMMUTLBEntry entry) + IOMMUTLBEvent event) { IOMMUNotifier *iommu_notifier; =20 @@ -1979,7 +1977,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *io= mmu_mr, =20 IOMMU_NOTIFIER_FOREACH(iommu_notifier, iommu_mr) { if (iommu_notifier->iommu_idx =3D=3D iommu_idx) { - memory_region_notify_iommu_one(iommu_notifier, &entry); + memory_region_notify_iommu_one(iommu_notifier, &event); } } } --=20 MST