From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E572BA939 for ; Fri, 4 Aug 2023 09:31:29 +0000 (UTC) Received: from canpemm500006.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RHL3d3LknztRs2; Fri, 4 Aug 2023 17:27:57 +0800 (CST) Received: from [10.67.145.224] (10.67.145.224) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 4 Aug 2023 17:31:21 +0800 Subject: [PATCH v2 1/1] iommu/arm-smmu-v3: Fix error case of range command From: zhurui To: Will Deacon CC: , , , Robin Murphy , Joerg Roedel , Lu Baolu , Jason Gunthorpe , Yicong Yang , Tomas Krcka , Jean-Philippe Brucker , Nicolin Chen References: <1690784482-30028-1-git-send-email-wangwudi@hisilicon.com> <20230801085504.GA26130@willie-the-truck> <27c895b8-1fb0-be88-8bc3-878d754684c8@huawei.com> Message-ID: Date: Fri, 4 Aug 2023 17:31:20 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <27c895b8-1fb0-be88-8bc3-878d754684c8@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.67.145.224] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected When tg != 0 but ttl, scale, num all 0 in a range tlbi command, it is reserved and will cause the CERROR_ILL error. This case means that the size to be invalidated is only one page size, and the range invalidation is meaningless here. So we set tg to 0 in this case to do an non-range invalidation instead. Cc: Will Deacon Cc: Robin Murphy Cc: Joerg Roedel Cc: Lu Baolu Cc: Jason Gunthorpe Cc: Yicong Yang Cc: Tomas Krcka Cc: Jean-Philippe Brucker Cc: Nicolin Chen Cc: Rui Zhu Signed-off-by: Rui Zhu --- ChangeLog: v1-->v2: 1. Change from "Revert" to modify the problematic case drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 9b0dc3505601..5e56c7e85819 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1895,9 +1895,6 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, /* Get the leaf page size */ tg = __ffs(smmu_domain->domain.pgsize_bitmap); - /* Convert page size of 12,14,16 (log2) to 1,2,3 */ - cmd->tlbi.tg = (tg - 10) / 2; - /* * Determine what level the granule is at. For non-leaf, io-pgtable * assumes .tlb_flush_walk can invalidate multiple levels at once, @@ -1930,6 +1927,12 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, num = (num_pages >> scale) & CMDQ_TLBI_RANGE_NUM_MAX; cmd->tlbi.num = num - 1; + /* Prevent error caused by one page tlbi with leaf 0 */ + if (scale == 0 && num == 1 && cmd->tlbi.leaf == 0) + cmd->tlbi.tg = 0; + else /* Convert page size of 12,14,16 (log2) to 1,2,3 */ + cmd->tlbi.tg = (tg - 10) / 2; + /* range is num * 2^scale * pgsize */ inv_range = num << (scale + tg); -- 1.8.3.1