From nobody Sun Feb 8 13:16:53 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 ARC-Seal: i=1; a=rsa-sha256; t=1613657348; cv=none; d=zohomail.com; s=zohoarc; b=kKQ9VJnmfd/W8vAXjpVIDsSNTK+0HYYENif7ncGQ/kBBfDKhlIpgtLZ0UDPmvnhC0f5mt9aLawMEIod8oWdDKTER/bD/k08Jv2AzZKN+QeIxD9ysOtruOBaI7ntek1VBPbRcnrM9uMf0XhOlCElktmKeQ369T7n56n8Rf3OwVfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613657348; 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=14p+j/CpjB0GM1QQbxolieRgFGzs9w3/Zsqc0TRnMgI=; b=N8l2bQeTdNFUWsojL4hGbQXKwp0TnYNY3uTIi1y0tAYbyu21IVQ6X8S7kb8ANsxDF4TrRZF8FjRQS7bNnoL8QSXWZImMq7mpkqdl/kJg/eCJijgkkwutnTULB/9nDlubVn2EaxSbNvVP95McXUFPYKJN2sdMvRja9IlXJphbaK0= 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 1613657348036626.847046281943; Thu, 18 Feb 2021 06:09:08 -0800 (PST) Received: from localhost ([::1]:42790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCjzN-00077g-EY for importer@patchew.org; Thu, 18 Feb 2021 09:09:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCjtE-00019i-0I for qemu-devel@nongnu.org; Thu, 18 Feb 2021 09:02:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lCjtB-0002j1-H8 for qemu-devel@nongnu.org; Thu, 18 Feb 2021 09:02:43 -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-248-fnfrNYH9NfyFGdYfVw8oLA-1; Thu, 18 Feb 2021 09:02:36 -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 B8E16801995; Thu, 18 Feb 2021 14:02:34 +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 002B05D9C6; Thu, 18 Feb 2021 14:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613656958; 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=14p+j/CpjB0GM1QQbxolieRgFGzs9w3/Zsqc0TRnMgI=; b=Vx09lqDYoawkumYjh3e/oHrIqGRYey8yAi+3hGs2n/jMvNqWQZS3t7iMZs7pCBA1UM5OL4 C/yZnzckY9c7/SLhDCnHehYi9QMhHb71G+Jxrk4UbHlDsynJo5Nx8JUT/rMOy54C5fbkgO lLzPzzFTriwqLk1kuVl2FKXLskHiRZU= X-MC-Unique: fnfrNYH9NfyFGdYfVw8oLA-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 1/3] hw/arm/smmu-common: Fix smmu_iotlb_inv_iova when asid is not set Date: Thu, 18 Feb 2021 15:02:17 +0100 Message-Id: <20210218140219.423983-2-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=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: 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" If the asid is not set, do not attempt to locate the key directly as all inserted keys have a valid asid. Use g_hash_table_foreach_remove instead. Signed-off-by: Eric Auger --- hw/arm/smmu-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 405d5c5325..e9ca3aebb2 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -151,7 +151,7 @@ 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 (ttl && (num_pages =3D=3D 1)) { + 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); --=20 2.26.2 From nobody Sun Feb 8 13:16:53 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 From nobody Sun Feb 8 13:16:53 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 ARC-Seal: i=1; a=rsa-sha256; t=1613657179; cv=none; d=zohomail.com; s=zohoarc; b=dDKF3xYKIKihQDtjAW9PEMS7w8YECXrqa2/lQUzPzXo2jIk7spZACvOeFCa1K6wfHBnB1IIvaonUuaCwPr/crXaQfIk3/VN3SwIWAJsB6isLl5l7p6+k33VRWYantNzQYmIGTlL5ApKUcPtmYaScjZX1N052r+xlEkMzn18LpsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613657179; 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=I3rpFC9qxNagXi7j3VW4a6lZIU+1JGqMp0WU/LXldmQ=; b=fO2bbuWcrOHYIVyvBJpTB6KCsnBVRj+Ghys+Mja5+lplppcfC7rnrq0N/lokXr3LiBSJeUGmCTiMdk4LNxDQbM5dYnoeAGad1mPjZLzGIEL4EfjygGBfBeSxfScP7Y1YV1UxCSmp5CDja7fUEpoKgwrne9W91kd/i81B6oDfHCY= 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 1613657178765554.570857813666; Thu, 18 Feb 2021 06:06:18 -0800 (PST) Received: from localhost ([::1]:36360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCjwe-0003qW-7B for importer@patchew.org; Thu, 18 Feb 2021 09:06:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCjtF-0001Ct-Km for qemu-devel@nongnu.org; Thu, 18 Feb 2021 09:02:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lCjtD-0002k8-Lh 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-9-CT7WZsQdOrCGCFV4GvHzzA-1; Thu, 18 Feb 2021 09:02:41 -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 D141E807918; Thu, 18 Feb 2021 14:02:39 +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 B1CE15D9D7; Thu, 18 Feb 2021 14:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613656963; 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=I3rpFC9qxNagXi7j3VW4a6lZIU+1JGqMp0WU/LXldmQ=; b=eQPYlU04aDnBPNFuoAMzM0C/HadJWk5sPbG4N+1rgC2w7HwIv3ct25uo7dFiUdvthI6+v4 7KWQc9GUimmNtbFwwjAh8z43kz+ZQo6LazxZSpu9uOpejPrDrzTwAYuCunE6bfbuHjtt7O iARHQhcf+zYVmfD3Z4nh+gMuv02DBmQ= X-MC-Unique: CT7WZsQdOrCGCFV4GvHzzA-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 3/3] hw/arm/smmuv3: Fix SMMU_CMD_CFGI_STE_RANGE handling Date: Thu, 18 Feb 2021 15:02:19 +0100 Message-Id: <20210218140219.423983-4-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=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: 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" If the whole SID range (32b) is invalidated (SMMU_CMD_CFGI_ALL), @end overflows and we fail to handle the command properly. Once this gets fixed, the current code really is awkward in the sense it loops over the whole range instead of removing the currently cached configs through a hash table lookup. Fix both the overflow and the lookup. Signed-off-by: Eric Auger --- hw/arm/smmu-internal.h | 5 +++++ hw/arm/smmuv3.c | 34 ++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/hw/arm/smmu-internal.h b/hw/arm/smmu-internal.h index 55147f29be..2d75b31953 100644 --- a/hw/arm/smmu-internal.h +++ b/hw/arm/smmu-internal.h @@ -104,4 +104,9 @@ typedef struct SMMUIOTLBPageInvInfo { uint64_t mask; } SMMUIOTLBPageInvInfo; =20 +typedef struct SMMUSIDRange { + uint32_t start; + uint32_t end; +} SMMUSIDRange; + #endif diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 0bb8065b16..032cc3b300 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -32,6 +32,7 @@ =20 #include "hw/arm/smmuv3.h" #include "smmuv3-internal.h" +#include "smmu-internal.h" =20 /** * smmuv3_trigger_irq - pulse @irq if enabled and update @@ -893,6 +894,20 @@ static void smmuv3_s1_range_inval(SMMUState *s, Cmd *c= md) } } =20 +static gboolean +smmuv3_invalidate_ste(gpointer key, gpointer value, gpointer user_data) +{ + SMMUDevice *sdev =3D (SMMUDevice *)key; + uint32_t sid =3D smmu_get_sid(sdev); + SMMUSIDRange *sid_range =3D (SMMUSIDRange *)user_data; + + if (sid < sid_range->start || sid > sid_range->end) { + return false; + } + trace_smmuv3_config_cache_inv(sid); + return true; +} + static int smmuv3_cmdq_consume(SMMUv3State *s) { SMMUState *bs =3D ARM_SMMU(s); @@ -963,27 +978,18 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) } case SMMU_CMD_CFGI_STE_RANGE: /* same as SMMU_CMD_CFGI_ALL */ { - uint32_t start =3D CMD_SID(&cmd), end, i; + uint32_t start =3D CMD_SID(&cmd); uint8_t range =3D CMD_STE_RANGE(&cmd); + uint64_t end =3D start + (1ULL << (range + 1)) - 1; + SMMUSIDRange sid_range =3D {start, end}; =20 if (CMD_SSEC(&cmd)) { cmd_error =3D SMMU_CERROR_ILL; break; } - - end =3D start + (1 << (range + 1)) - 1; trace_smmuv3_cmdq_cfgi_ste_range(start, end); - - for (i =3D start; i <=3D end; i++) { - IOMMUMemoryRegion *mr =3D smmu_iommu_mr(bs, i); - SMMUDevice *sdev; - - if (!mr) { - continue; - } - sdev =3D container_of(mr, SMMUDevice, iommu); - smmuv3_flush_config(sdev); - } + g_hash_table_foreach_remove(bs->configs, smmuv3_invalidate_ste, + &sid_range); break; } case SMMU_CMD_CFGI_CD: --=20 2.26.2