From nobody Wed Nov 19 04:33:30 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614244817; cv=none; d=zohomail.com; s=zohoarc; b=bu62FRLuVKDnhnoF6pQqGLr57Inm5DrFlU0I7LF0EX4n4TTWBlT+tTc3hETw6nA3OglaLDq1y/+A4pAvVwWLxxwVzl6wBWYXENIoe2Rp+393wEjCywQNR3aUHA0fJYXZSfy3E5SUKRkhSZ7/Ebe+tVYVP0R2v5KeEIav9KLE+q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614244817; 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=8CBiTjBBrSUvl7XaxpyhYLNyR7QNYng/yBdBtviVWFo=; b=j5e9aSWMJyQH1PwzBdxeoyUr/L5VHoy+eSjNYbU6NbKywVZmuBftmN/o5rAEeFfbcWdJQC97NJd8HC/RJJWBd1YKs65OSPJQF8vg8t2eEpT1Ko1kS4lUeej3rY+6J0Mm6hzn7iHifxdG8CoTcQiJ+WD15kJs73t0CQZKchgspmY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1614244817170910.557179858936; Thu, 25 Feb 2021 01:20:17 -0800 (PST) Received: from localhost ([::1]:35406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lFCoh-0000OD-Nh for importer@patchew.org; Thu, 25 Feb 2021 04:20:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46836) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lFCjh-0003Hv-7s for qemu-devel@nongnu.org; Thu, 25 Feb 2021 04:15:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24873) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lFCjf-00066k-Go for qemu-devel@nongnu.org; Thu, 25 Feb 2021 04:15:04 -0500 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-274-WXpuI9esPQqQjbXlh6PTUw-1; Thu, 25 Feb 2021 04:15:01 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9D1C080196C; Thu, 25 Feb 2021 09:14:59 +0000 (UTC) Received: from laptop.redhat.com (ovpn-114-34.ams2.redhat.com [10.36.114.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32B9562467; Thu, 25 Feb 2021 09:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614244502; 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=8CBiTjBBrSUvl7XaxpyhYLNyR7QNYng/yBdBtviVWFo=; b=Z6FMpttrDpOSXpchllwOqeob80+/FCJg2MlP+7fvL9EYOQ76WIW95M8HGY9m975YNDvJfq 4tWe1IllSgCQ+IR3PtRQXsddM05kzOKRvluIi1NBgRGHPvnMsIbM+dayh/aLAWxoQJjMld M6mcGv7YO53lWNCoFT55WZOo3VR3AuI= X-MC-Unique: WXpuI9esPQqQjbXlh6PTUw-1 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, jean-philippe@linaro.org, peterx@redhat.com, jasowang@redhat.com, pbonzini@redhat.com Subject: [PATCH v2 3/7] virtio-iommu: Handle non power of 2 range invalidations Date: Thu, 25 Feb 2021 10:14:31 +0100 Message-Id: <20210225091435.644762-4-eric.auger@redhat.com> In-Reply-To: <20210225091435.644762-1-eric.auger@redhat.com> References: <20210225091435.644762-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: vivek.gautam@arm.com, shameerali.kolothum.thodi@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Unmap notifiers work with an address mask assuming an invalidation range of a power of 2. Nothing mandates this in the VIRTIO-IOMMU spec. So in case the range is not a power of 2, split it into several invalidations. Signed-off-by: Eric Auger Reviewed-by: Peter Xu --- hw/virtio/virtio-iommu.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c index c2883a2f6c..1b23e8e18c 100644 --- a/hw/virtio/virtio-iommu.c +++ b/hw/virtio/virtio-iommu.c @@ -155,6 +155,7 @@ static void virtio_iommu_notify_unmap(IOMMUMemoryRegion= *mr, hwaddr virt_start, hwaddr virt_end) { IOMMUTLBEvent event; + uint64_t delta =3D virt_end - virt_start; =20 if (!(mr->iommu_notify_flags & IOMMU_NOTIFIER_UNMAP)) { return; @@ -164,12 +165,24 @@ static void virtio_iommu_notify_unmap(IOMMUMemoryRegi= on *mr, hwaddr virt_start, =20 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; + event.entry.addr_mask =3D delta; + event.entry.iova =3D virt_start; =20 - memory_region_notify_iommu(mr, 0, event); + if (delta =3D=3D UINT64_MAX) { + memory_region_notify_iommu(mr, 0, event); + } + + + while (virt_start !=3D virt_end + 1) { + uint64_t mask =3D dma_aligned_pow2_mask(virt_start, virt_end, 64); + + event.entry.addr_mask =3D mask; + event.entry.iova =3D virt_start; + memory_region_notify_iommu(mr, 0, event); + virt_start +=3D mask + 1; + } } =20 static gboolean virtio_iommu_notify_unmap_cb(gpointer key, gpointer value, --=20 2.26.2