From nobody Mon Feb 9 12:09:35 2026 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613657280702913.1810684051608; Thu, 18 Feb 2021 06:08:00 -0800 (PST) Received: from localhost ([::1]:39902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCjyJ-0005RH-0M for importer@patchew.org; Thu, 18 Feb 2021 09:07:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCjtG-0001E3-9S for qemu-devel@nongnu.org; Thu, 18 Feb 2021 09:02:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lCjtB-0002jC-Hc for qemu-devel@nongnu.org; Thu, 18 Feb 2021 09:02:45 -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-509-_IYHxDpkNe2jG7U7J_WzIw-1; Thu, 18 Feb 2021 09:02:38 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 751AB803F78; Thu, 18 Feb 2021 14:02:37 +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 1AB335D9C6; Thu, 18 Feb 2021 14:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613656960; 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=LZhPdSpI9pZBAjT391xPT8LF7YI/+bKc9jvHVBXIyb8=; b=dEwqySTl4FitJ48XM03TmcLWaV3X/NhpYeEOYOR2vG6YL0m3pip2BOdKdlaSzkE49fOELJ C3Qp1S5846WwpEwRyrKavPEEvUXqMQsaX7opu6nKjIHIS0HrUzKrurd9lG4MEIu3pdEjBu z5VVH7SWCA6ccQqSQiURyoWjhe2LfIM= X-MC-Unique: _IYHxDpkNe2jG7U7J_WzIw-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 Subject: [PATCH 2/3] hw/arm/smmuv3: Enforce invalidation on a power of two range Date: Thu, 18 Feb 2021 15:02:18 +0100 Message-Id: <20210218140219.423983-3-eric.auger@redhat.com> In-Reply-To: <20210218140219.423983-1-eric.auger@redhat.com> References: <20210218140219.423983-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=216.205.24.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_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: jasowang@redhat.com, jiangkunkun@huawei.com, peterx@redhat.com, shameerali.kolothum.thodi@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" As of today, the driver can invalide a number of pages that is not a power of 2. However IOTLB unmap notifications and internal IOTLB invalidations work with masks leading to erroneous invalidations. In case the range is not a power of 2, split invalidations into power of 2 invalidations. When looking for a single page entry in the vSMMU internal IOTLB, let's make sure that if the entry is not found using a g_hash_table_remove() we iterate over all the entries to find a potential range that overlaps it. Signed-off-by: Eric Auger --- hw/arm/smmu-common.c | 30 ++++++++++++++++++------------ hw/arm/smmuv3.c | 22 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index e9ca3aebb2..84d2c62c26 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -151,22 +151,28 @@ inline void smmu_iotlb_inv_iova(SMMUState *s, int asid, dma_addr_t iova, uint8_t tg, uint64_t num_pages, uint8_t ttl) { + /* if tg is not set we use 4KB range invalidation */ + uint8_t granule =3D tg ? tg * 2 + 10 : 12; + if (ttl && (num_pages =3D=3D 1) && (asid >=3D 0)) { SMMUIOTLBKey key =3D smmu_get_iotlb_key(asid, iova, tg, ttl); =20 - g_hash_table_remove(s->iotlb, &key); - } else { - /* if tg is not set we use 4KB range invalidation */ - uint8_t granule =3D tg ? tg * 2 + 10 : 12; - - SMMUIOTLBPageInvInfo info =3D { - .asid =3D asid, .iova =3D iova, - .mask =3D (num_pages * 1 << granule) - 1}; - - g_hash_table_foreach_remove(s->iotlb, - smmu_hash_remove_by_asid_iova, - &info); + if (g_hash_table_remove(s->iotlb, &key)) { + return; + } + /* + * if the entry is not found, let's see if it does not + * belong to a larger IOTLB entry + */ } + + SMMUIOTLBPageInvInfo info =3D { + .asid =3D asid, .iova =3D iova, + .mask =3D (num_pages * 1 << granule) - 1}; + + g_hash_table_foreach_remove(s->iotlb, + smmu_hash_remove_by_asid_iova, + &info); } =20 inline void smmu_iotlb_inv_asid(SMMUState *s, uint16_t asid) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index bd1f97000d..0bb8065b16 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -861,7 +861,7 @@ static void smmuv3_s1_range_inval(SMMUState *s, Cmd *cm= d) uint16_t vmid =3D CMD_VMID(cmd); bool leaf =3D CMD_LEAF(cmd); uint8_t tg =3D CMD_TG(cmd); - hwaddr num_pages =3D 1; + uint64_t num_pages =3D 1; int asid =3D -1; =20 if (tg) { @@ -874,9 +874,23 @@ static void smmuv3_s1_range_inval(SMMUState *s, Cmd *c= md) if (type =3D=3D SMMU_CMD_TLBI_NH_VA) { asid =3D CMD_ASID(cmd); } - trace_smmuv3_s1_range_inval(vmid, asid, addr, tg, num_pages, ttl, leaf= ); - smmuv3_inv_notifiers_iova(s, asid, addr, tg, num_pages); - smmu_iotlb_inv_iova(s, asid, addr, tg, num_pages, ttl); + + /* Split invalidations into ^2 range invalidations */ + while (num_pages) { + uint8_t granule =3D tg * 2 + 10; + uint8_t highest_bit; + uint64_t pow2pages; + + highest_bit =3D 64 - clz64(num_pages) - 1; + pow2pages =3D BIT_ULL(highest_bit); + + trace_smmuv3_s1_range_inval(vmid, asid, addr, tg, pow2pages, ttl, = leaf); + smmuv3_inv_notifiers_iova(s, asid, addr, tg, pow2pages); + smmu_iotlb_inv_iova(s, asid, addr, tg, pow2pages, ttl); + + num_pages &=3D ~pow2pages; + addr +=3D pow2pages * BIT_ULL(granule); + } } =20 static int smmuv3_cmdq_consume(SMMUv3State *s) --=20 2.26.2