From nobody Wed May 1 03:13:08 2024 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=1599149844; cv=none; d=zohomail.com; s=zohoarc; b=myNmxj6+YSmjmws0SkktQ3Ih2LkIJulYwUAwrQGOaeWiCySENWgSUrAGHvWWGLEiGlWxbgIAD5YEPgQBC3hvm2ytdFdG7wvHjCOQSlK1Kp3jR0o/woJmhltPkBuOI2redrm8q7iDMmzJKUndPAt2eae6uzuVARvcuwkhgAd4dy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599149844; 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=nRWfwJF1kic8r7+IRN4Bqmv81Hq3eR0ksOf2YnHD/uc=; b=EgNX9s3t9lo97/58rogN6Cz9TnAOYVMIktQTJ3hR4A9muKPhspN8TJwivqO2FxIV1Lu8AdrJJO9UaleTsc8+7lLsPp/8BNcnmJBYyeifkBaxDf2nM7YptyPpcn6H7SOCmIRRtU4g9vRB5qjtnfL2LsKNwgHS1Ev2xsFhqRw8vVw= 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 1599149844597137.69808412697546; Thu, 3 Sep 2020 09:17:24 -0700 (PDT) Received: from localhost ([::1]:50478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDrvO-00052K-U2 for importer@patchew.org; Thu, 03 Sep 2020 12:17:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDrto-0003yZ-J8 for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:15:44 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:37075 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDrtk-0000Zp-Qd for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:15:44 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-128-JxMj-idwN6GuvpIJDxl-1g-1; Thu, 03 Sep 2020 12:15:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 421E456BF4; Thu, 3 Sep 2020 16:15:26 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-112-236.ams2.redhat.com [10.36.112.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F3E15C3E0; Thu, 3 Sep 2020 16:15:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599149732; 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=nRWfwJF1kic8r7+IRN4Bqmv81Hq3eR0ksOf2YnHD/uc=; b=dNSjAL5VjbrsLRLKgnbIhZCJd/qnr1RbIuRiGcCF1LC38max4iRTqoKDTE1Dq/Ey8mZI6s MSuiy1GpVUB/k7k9hfdKgDpm91/GgfJS+U+mWM6fIyxKvyEWfjrZ+yFmQgj4nNXnXB8Oqp 0nc01XYYVlTmzxKdIw/4ST6FPrLxxXg= X-MC-Unique: JxMj-idwN6GuvpIJDxl-1g-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Peter Xu , qemu-devel@nongnu.org Subject: [PATCH 1/5] memory: Rename memory_region_notify_one to memory_region_notify_iommu_one Date: Thu, 3 Sep 2020 18:14:42 +0200 Message-Id: <20200903161446.29615-2-eperezma@redhat.com> In-Reply-To: <20200903161446.29615-1-eperezma@redhat.com> References: <20200625191651.5817-1-eperezma@redhat.com> <20200903161446.29615-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=205.139.110.61; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:28:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Juan Quintela , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eric Auger , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Avi Kivity , Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Previous name didn't reflect the iommu operation. Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Peter Xu Reviewed-by: David Gibson Reviewed-by: Juan Quintela Reviewed-by: Eric Auger --- include/exec/memory.h | 6 +++--- hw/arm/smmu-common.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/i386/intel_iommu.c | 4 ++-- softmmu/memory.c | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 0cfe987ab4..22c5f564d1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -226,7 +226,7 @@ enum IOMMUMemoryRegionAttr { * The IOMMU implementation must use the IOMMU notifier infrastructure * to report whenever mappings are changed, by calling * memory_region_notify_iommu() (or, if necessary, by calling - * memory_region_notify_one() for each registered notifier). + * memory_region_notify_iommu_one() for each registered notifier). * * Conceptually an IOMMU provides a mapping from input address * to an output TLB entry. If the IOMMU is aware of memory transaction @@ -1274,7 +1274,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *io= mmu_mr, IOMMUTLBEntry entry); =20 /** - * memory_region_notify_one: notify a change in an IOMMU translation + * memory_region_notify_iommu_one: notify a change in an IOMMU translation * entry to a single notifier * * This works just like memory_region_notify_iommu(), but it only @@ -1285,7 +1285,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *io= mmu_mr, * replaces all old entries for the same virtual I/O address range. * Deleted entries have .@perm =3D=3D 0. */ -void memory_region_notify_one(IOMMUNotifier *notifier, +void memory_region_notify_iommu_one(IOMMUNotifier *notifier, IOMMUTLBEntry *entry); =20 /** diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 3838db1395..88d2c454f0 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -472,7 +472,7 @@ static void smmu_unmap_notifier_range(IOMMUNotifier *n) entry.perm =3D IOMMU_NONE; entry.addr_mask =3D n->end - n->start; =20 - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); } =20 /* Unmap all notifiers attached to @mr */ diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 0122700e72..0a893ae918 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -827,7 +827,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, entry.addr_mask =3D num_pages * (1 << granule) - 1; entry.perm =3D IOMMU_NONE; =20 - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); } =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 5284bb68b6..2ad6b9d796 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3498,7 +3498,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *= as, IOMMUNotifier *n) /* This field is meaningless for unmap */ entry.translated_addr =3D 0; =20 - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); =20 start +=3D mask; remain -=3D mask; @@ -3536,7 +3536,7 @@ static void vtd_address_space_refresh_all(IntelIOMMUS= tate *s) =20 static int vtd_replay_hook(IOMMUTLBEntry *entry, void *private) { - memory_region_notify_one((IOMMUNotifier *)private, entry); + memory_region_notify_iommu_one((IOMMUNotifier *)private, entry); return 0; } =20 diff --git a/softmmu/memory.c b/softmmu/memory.c index 70b93104e8..961c25b42f 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1890,8 +1890,8 @@ void memory_region_unregister_iommu_notifier(MemoryRe= gion *mr, memory_region_update_iommu_notify_flags(iommu_mr, NULL); } =20 -void memory_region_notify_one(IOMMUNotifier *notifier, - IOMMUTLBEntry *entry) +void memory_region_notify_iommu_one(IOMMUNotifier *notifier, + IOMMUTLBEntry *entry) { IOMMUNotifierFlag request_flags; hwaddr entry_end =3D entry->iova + entry->addr_mask; @@ -1927,7 +1927,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_one(iommu_notifier, &entry); + memory_region_notify_iommu_one(iommu_notifier, &entry); } } } --=20 2.18.1 From nobody Wed May 1 03:13:08 2024 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=1599149912; cv=none; d=zohomail.com; s=zohoarc; b=WeXDXXUXH7WE5YwCS/znxWmzlYPN2zIreWm9y7f9M8YRtb8cNQ0QmeC95pnRI7kJU3AjBSJjkl3+Fpj8T1n6/5okbG6fG8SXc/6f2rGFED3OJqQU1mcgbhzkrl5dfjDpip8vn6Jx7BtTSf2qYoLtp4Nwo0JwJDU8renOd3srcXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599149912; 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=rtQVbfJ3f165wieCinW2LWcfPAonAGcAO00fNNOHNBQ=; b=j10afo0LgsILJYv3NCRh0uQdKvlx96x62HiXU1iQBU/ZT2d0eHWZNvCxGvirdIicCe9cwQgS0tb010UxCh1pVikOwqP6uoq0rFv9cQ9C5WlJUL3pMYlcDSIeO598DGeMwWGVKJGe3xipUze6tHAMESy3jf18T5etJhiBvN0L/tw= 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 15991499126065.113035347404889; Thu, 3 Sep 2020 09:18:32 -0700 (PDT) Received: from localhost ([::1]:54464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDrwV-0006bS-Nl for importer@patchew.org; Thu, 03 Sep 2020 12:18:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDrtq-0003zK-RP for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:15:46 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42710 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDrtk-0000cD-Ce for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:15:46 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-365-feMONLDEOdCjryAvRo3LqQ-1; Thu, 03 Sep 2020 12:15:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01082801AEA; Thu, 3 Sep 2020 16:15:34 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-112-236.ams2.redhat.com [10.36.112.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0C695C1C2; Thu, 3 Sep 2020 16:15:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599149737; 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=rtQVbfJ3f165wieCinW2LWcfPAonAGcAO00fNNOHNBQ=; b=Mtb0EaumbsgPVMf5cGC9uV9QrNGQGTY/LkQSXjPp63siDNh53sW30GntM1TZUpRmtaGxVn 9eWvkvxmtqr5r8LtKi5rwu8HNwdBIgaM7JNbH3kKRw51Jv9hf7BrM1ubRWFJ+WDTT9oguJ QTXa+kD2MZPQ66D5dvd5nTZmp54+jGc= X-MC-Unique: feMONLDEOdCjryAvRo3LqQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Peter Xu , qemu-devel@nongnu.org Subject: [PATCH 2/5] memory: Add IOMMUTLBEvent Date: Thu, 3 Sep 2020 18:14:43 +0200 Message-Id: <20200903161446.29615-3-eperezma@redhat.com> In-Reply-To: <20200903161446.29615-1-eperezma@redhat.com> References: <20200625191651.5817-1-eperezma@redhat.com> <20200903161446.29615-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.120; envelope-from=eperezma@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 00:24:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-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 , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Juan Quintela , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eric Auger , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Avi Kivity , Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 --- 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 ++++---- softmmu/memory.c | 20 +++++----- 7 files changed, 111 insertions(+), 97 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 22c5f564d1..ab8d1ac9c9 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -106,6 +106,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 @@ -1254,24 +1259,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 @@ -1281,12 +1280,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 0a893ae918..62b0e289ca 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -799,7 +799,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) { @@ -822,12 +822,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 2ad6b9d796..19661bba3e 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; @@ -3486,19 +3495,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; @@ -3534,9 +3544,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 0fecabc135..8bc3cff05d 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 entry.perm ? IOMMU_NOTIFIER_MAP : IOMMU_NOTIFIER_UNMAP; + memory_region_notify_iommu(&tcet->iommu, 0, event); =20 return H_SUCCESS; } diff --git a/softmmu/memory.c b/softmmu/memory.c index 961c25b42f..8694fc7cf7 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1891,11 +1891,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. @@ -1906,20 +1910,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 @@ -1927,7 +1925,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 2.18.1 From nobody Wed May 1 03:13:08 2024 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=1599150861; cv=none; d=zohomail.com; s=zohoarc; b=f1az/ahGqAQEoLFgsEFRlc3JgZXWaw3hRqsuwr8BmHdwagAQI7gljluR18ccasZfdcxbhZQrnvp+2RS7hHFE2UsHztrRQdEiiAdkm0sqfL5ouwxrgy5unYVoFL2MgTymOkotgw1Jld5hSXXwxKV2lcPl1OK0daA5S0r4mY7Ehvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599150861; 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=yrtf80IE2goo/oOobGAyOVwCVPhC9v0NqfwUnNlXbM0=; b=a8DWmRjVjyoiwehR92aF0eo5Y/0EnS29Sze20v9S8sZNTbdX8tS1GOWQHJU2kmcV2KigLXJfAHpGiCOGzAX20EuyUoEpMM9RncvcKL/CfFxZ+v2RTINRGd/L72Pn4Rh5wb5IG+whatBKCmnuseZ5anQngd62H7ufVy4OjwlPbB8= 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 1599150861704901.9798088795694; Thu, 3 Sep 2020 09:34:21 -0700 (PDT) Received: from localhost ([::1]:33324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDsBo-00050R-Ux for importer@patchew.org; Thu, 03 Sep 2020 12:34:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDru0-0004B2-7M for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:15:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24240 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDrtx-0000iD-DN for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:15:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-rB4VHw_AOgqNH_V-Ve1t_g-1; Thu, 03 Sep 2020 12:15:50 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F62A801AEE; Thu, 3 Sep 2020 16:15:48 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-112-236.ams2.redhat.com [10.36.112.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id A03825C1C2; Thu, 3 Sep 2020 16:15:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599149752; 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=yrtf80IE2goo/oOobGAyOVwCVPhC9v0NqfwUnNlXbM0=; b=HIdT90W+PXIPCK2pjGeN2V/j9IZXAMmvzARXdXzvsdxUWTweRcJsaDoofx/DF5+rQwYhho Ln1u1N6J+GAmkrC9Ov0jvk29xI6plYLnqaRUHabd0hbmaLDeuhzSIOd4+KKI+8xzPQsYHq NYyWd9W9cgyereM4iKmJPqc121DQx/o= X-MC-Unique: rB4VHw_AOgqNH_V-Ve1t_g-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Peter Xu , qemu-devel@nongnu.org Subject: [PATCH 3/5] memory: Add IOMMU_NOTIFIER_DEVIOTLB_UNMAP IOMMUTLBNotificationType Date: Thu, 3 Sep 2020 18:14:44 +0200 Message-Id: <20200903161446.29615-4-eperezma@redhat.com> In-Reply-To: <20200903161446.29615-1-eperezma@redhat.com> References: <20200625191651.5817-1-eperezma@redhat.com> <20200903161446.29615-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=205.139.110.120; envelope-from=eperezma@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:58:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-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 , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Juan Quintela , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eric Auger , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Avi Kivity , Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This allows us to differentiate between regular IOMMU map/unmap events and DEVIOTLB unmap. Doing so, notifiers that only need device IOTLB invalidations will not receive regular IOMMU unmappings. Adapt intel and vhost to use it. Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Peter Xu Reviewed-by: Juan Quintela --- include/exec/memory.h | 7 ++++++- hw/i386/intel_iommu.c | 2 +- hw/virtio/vhost.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index ab8d1ac9c9..77afeda60c 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -87,9 +87,14 @@ typedef enum { IOMMU_NOTIFIER_UNMAP =3D 0x1, /* Notify entry changes (newly created entries) */ IOMMU_NOTIFIER_MAP =3D 0x2, + /* Notify changes on device IOTLB entries */ + IOMMU_NOTIFIER_DEVIOTLB_UNMAP =3D 0x04, } IOMMUNotifierFlag; =20 -#define IOMMU_NOTIFIER_ALL (IOMMU_NOTIFIER_MAP | IOMMU_NOTIFIER_UNMAP) +#define IOMMU_NOTIFIER_IOTLB_EVENTS (IOMMU_NOTIFIER_MAP | IOMMU_NOTIFIER_U= NMAP) +#define IOMMU_NOTIFIER_DEVIOTLB_EVENTS IOMMU_NOTIFIER_DEVIOTLB_UNMAP +#define IOMMU_NOTIFIER_ALL (IOMMU_NOTIFIER_IOTLB_EVENTS | \ + IOMMU_NOTIFIER_DEVIOTLB_EVENTS) =20 struct IOMMUNotifier; typedef void (*IOMMUNotify)(struct IOMMUNotifier *notifier, diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 19661bba3e..ab6833d5a0 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -2468,7 +2468,7 @@ static bool vtd_process_device_iotlb_desc(IntelIOMMUS= tate *s, sz =3D VTD_PAGE_SIZE; } =20 - event.type =3D IOMMU_NOTIFIER_UNMAP; + event.type =3D IOMMU_NOTIFIER_DEVIOTLB_UNMAP; event.entry.target_as =3D &vtd_dev_as->as; event.entry.addr_mask =3D sz - 1; event.entry.iova =3D addr; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 1a1384e7a6..1bf5bbc82e 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -729,7 +729,7 @@ static void vhost_iommu_region_add(MemoryListener *list= ener, iommu_idx =3D memory_region_iommu_attrs_to_index(iommu_mr, MEMTXATTRS_UNSPECIFIED); iommu_notifier_init(&iommu->n, vhost_iommu_unmap_notify, - IOMMU_NOTIFIER_UNMAP, + IOMMU_NOTIFIER_DEVIOTLB_UNMAP, section->offset_within_region, int128_get64(end), iommu_idx); --=20 2.18.1 From nobody Wed May 1 03:13:08 2024 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=1599150913; cv=none; d=zohomail.com; s=zohoarc; b=LDYg2WDYwrL1MqPniLDyKOUtAwA0JxyEy94B5kkF/yy/pB35+ht1XUIcVCcgqMHtOvfGjee1V8Aolrh7cnBsvTMDc8Ztb1yVoyUjWTb9siws4sexY/K+O3wMjREzAUWLQ6S94VOFKzxOYig8qxeaDGNBKB0s3Dl8MAgThAsB/Bg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599150913; 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=eT0EEa82buNGU2M6NCOdQv5kzk8iyJg5XUwD3IgGAms=; b=Osqtu9kFm6+dZR8zHTgiED2M9ZpJxxkW94eNoqhfje1nHtAbTXdfQu0EjzeiwDCWx0ChSKkZ3BKKoloZJ6ljgQlkAFm60qPWbIfD2qE+6KiRP9Znn4XFcfGqite85rIH6X80EkGZYkQhYLnAiP7aC0Jc50bgSi/ulF2mQteNrgU= 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 1599150913881191.27679171201078; Thu, 3 Sep 2020 09:35:13 -0700 (PDT) Received: from localhost ([::1]:37406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDsCf-0006gB-1g for importer@patchew.org; Thu, 03 Sep 2020 12:35:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDru7-0004Gq-4q for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:16:03 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:60864 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDru4-0000ji-MW for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:16:02 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-241-3nfKtPf6MimaMeVL3OrNTQ-1; Thu, 03 Sep 2020 12:15:57 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A879510082E8; Thu, 3 Sep 2020 16:15:55 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-112-236.ams2.redhat.com [10.36.112.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E59D5C1C2; Thu, 3 Sep 2020 16:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599149760; 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=eT0EEa82buNGU2M6NCOdQv5kzk8iyJg5XUwD3IgGAms=; b=fCky/zmOf5jmq7/7y0oFe8929PzKQL80GFkUKRvH8De1cSOvmjkc5GY+vF10+N5f9hHMds Z4RuAv/FEqX/tkiLbbLuW+bZU3RcqAOkPs7ejxxNGMK6hWEbySUK4YzkzsS/Fyl+esecB3 4WjrxRiU3Nd5onJ5STo2T70+GRlBKkg= X-MC-Unique: 3nfKtPf6MimaMeVL3OrNTQ-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Peter Xu , qemu-devel@nongnu.org Subject: [PATCH 4/5] intel_iommu: Skip page walking on device iotlb invalidations Date: Thu, 3 Sep 2020 18:14:45 +0200 Message-Id: <20200903161446.29615-5-eperezma@redhat.com> In-Reply-To: <20200903161446.29615-1-eperezma@redhat.com> References: <20200625191651.5817-1-eperezma@redhat.com> <20200903161446.29615-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.81; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 04:23:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Juan Quintela , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eric Auger , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Avi Kivity , Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Although they didn't reach the notifier because of the filtering in memory_region_notify_iommu_one, the vt-d was still splitting huge memory invalidations in chunks. Skipping it. This improves performance in case of netperf with vhost-net: * TCP_STREAM: From 1923.6Mbit/s to 2175.13Mbit/s (13%) * TCP_RR: From 8464.73 trans/s to 8932.703333 trans/s (5.5%) * UDP_RR: From 8562.08 trans/s to 9005.62/s (5.1%) * UDP_STREAM: No change observed (insignificant 0.1% improvement) Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Peter Xu --- hw/i386/intel_iommu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index ab6833d5a0..fbbda0c87e 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1478,6 +1478,10 @@ static int vtd_sync_shadow_page_table(VTDAddressSpac= e *vtd_as) VTDContextEntry ce; IOMMUNotifier *n; =20 + if (!(vtd_as->iommu.iommu_notify_flags & IOMMU_NOTIFIER_IOTLB_EVENTS))= { + return 0; + } + ret =3D vtd_dev_to_context_entry(vtd_as->iommu_state, pci_bus_num(vtd_as->bus), vtd_as->devfn, &ce); --=20 2.18.1 From nobody Wed May 1 03:13:08 2024 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=1599150190; cv=none; d=zohomail.com; s=zohoarc; b=DDnpMHtRLI4akzgLBUYD8I8kSPSouZqAMZaxJR0sIoCC2eM6AW811wZV/o+JV5w7O++X+1xZaDzt39zWYtaQAZYVygTRSQAHaxeGQ38wDCJWTtt2aE2RStm6ki3/FrJVHPn/u591y6J9MTJK2/92G5+u+5AoiD8hZ5ST3puvm6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599150190; 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=pi4j9IwYca8Ff7bM22GVmBPYTiBZQNG/6icR4yOdY5I=; b=ZL8aTfZCcIPB1IVEP6wrst+1KrHI3Ic36g0gf7jk/hWNhMJjuvLf+aejI4TPF3U/1QaqRnTZ8jLDlgo+5h8h44vSdSz8jIGI+GVAkUZvIogKWBc1fYV8B0qIGTIK5oCXHifpRvkfMhFBHjOOJ2om3aU+uHpZsapCTZEhPrIKgHU= 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 1599150190695688.5016315023164; Thu, 3 Sep 2020 09:23:10 -0700 (PDT) Received: from localhost ([::1]:38826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDs0z-0003IF-Oi for importer@patchew.org; Thu, 03 Sep 2020 12:23:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDruM-0004P7-6W for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:16:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30905 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDruI-0000mr-4T for qemu-devel@nongnu.org; Thu, 03 Sep 2020 12:16:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-siiQPCEsOZCQKclMkNbeTA-1; Thu, 03 Sep 2020 12:16:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CEF2F8015A8; Thu, 3 Sep 2020 16:16:09 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-112-236.ams2.redhat.com [10.36.112.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5230A5C1C2; Thu, 3 Sep 2020 16:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599149773; 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=pi4j9IwYca8Ff7bM22GVmBPYTiBZQNG/6icR4yOdY5I=; b=SKaq0HA7FS/xSUhG4N57ozfQRSroQXyaQC0PGhBswttEyIbw0GWwb7kZgJiYsun5sRvTqu nk4FyD10LF4nbsQbwoAIyDRWLF5gRgi49KsBckzEO108mJoDTDxDZe36fgn8Jb2X5JtCcd cJ3DFt5bAwXubvxTnSrgLfbs4W1f/+4= X-MC-Unique: siiQPCEsOZCQKclMkNbeTA-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Peter Xu , qemu-devel@nongnu.org Subject: [PATCH 5/5] memory: Skip bad range assertion if notifier is DEVIOTLB_UNMAP type Date: Thu, 3 Sep 2020 18:14:46 +0200 Message-Id: <20200903161446.29615-6-eperezma@redhat.com> In-Reply-To: <20200903161446.29615-1-eperezma@redhat.com> References: <20200625191651.5817-1-eperezma@redhat.com> <20200903161446.29615-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=205.139.110.120; envelope-from=eperezma@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:58:20 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , Juan Quintela , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eric Auger , qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Avi Kivity , Paolo Bonzini , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Device IOTLB invalidations can unmap arbitrary ranges, eiter outside of the memory region or even [0, ~0ULL] for all the space. The assertion could be hit by a guest, and rhel7 guest effectively hit it. Signed-off-by: Eugenio P=C3=A9rez Reviewed-by: Peter Xu Reviewed-by: Juan Quintela --- softmmu/memory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index 8694fc7cf7..e723fcbaa1 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1895,6 +1895,7 @@ void memory_region_notify_iommu_one(IOMMUNotifier *no= tifier, { IOMMUTLBEntry *entry =3D &event->entry; hwaddr entry_end =3D entry->iova + entry->addr_mask; + IOMMUTLBEntry tmp =3D *entry; =20 if (event->type =3D=3D IOMMU_NOTIFIER_UNMAP) { assert(entry->perm =3D=3D IOMMU_NONE); @@ -1908,10 +1909,18 @@ void memory_region_notify_iommu_one(IOMMUNotifier *= notifier, return; } =20 - assert(entry->iova >=3D notifier->start && entry_end <=3D notifier->en= d); + if (notifier->notifier_flags & IOMMU_NOTIFIER_DEVIOTLB_UNMAP) { + /* Crop (iova, addr_mask) to range */ + tmp.iova =3D MAX(tmp.iova, notifier->start); + tmp.addr_mask =3D MIN(entry_end, notifier->end) - tmp.iova; + /* Confirm no underflow */ + assert(MIN(entry_end, notifier->end) >=3D tmp.iova); + } else { + assert(entry->iova >=3D notifier->start && entry_end <=3D notifier= ->end); + } =20 if (event->type & notifier->notifier_flags) { - notifier->notify(notifier, entry); + notifier->notify(notifier, &tmp); } } =20 --=20 2.18.1