From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED22EC43618 for ; Wed, 5 May 2021 16:34:58 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE65C616ED for ; Wed, 5 May 2021 16:34:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE65C616ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=X32aLPcA2aPpOYJp0I2n3fe3CYfBJLgqr+y0U7tiXiE=; b=KBKKTW1VEzcdIfPWLZSsDMv1K J/2TfCuADq/MDR/6Szgf/DAXzc6ncra9F4Cw33IWyF17KbKUgjvNYXkuUWccc4hDfWUPS+MPFiA4m PqKQVYa10ZlU4zIqaE7YZjuw4Z5Hb4VB3YMszRTfTbylRUaSwvjy00Q8DJX6emgCuCayjgRiyj9fx 7d9VW7JSZuVoJiJV2jPzohW6EAh0kv+VuWVghJHkfwf1IgazT1FEexXtQ9eg1OvENgUi/FpFax0os aNbI+X7CsGHWAl/b7eEKSMvVZquzIxgLa3xRsG2JSvCDq2mcLsa9h0BPo3nYhogA6vfnUgo2jr8Uo aemTgT/yw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1leKRg-001eSP-OM; Wed, 05 May 2021 16:32:20 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leKRd-001eSD-Bw for linux-arm-kernel@desiato.infradead.org; Wed, 05 May 2021 16:32:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=PxuQA2cOKgRTMk16LRw42ASuayLkNnBGO1hc4eF30ys=; b=sGooAM4W+kl4HwzpocVNJnVfhu J+lIwmJasbh8HejIZQPI/J2vIsSNGdMdvdSVOTSzF/SCEZ0zD6YVZ9sFXCPtOFIFbpwtaSVdGC9Pb gzAE6ZDyfTw3rL8w/nqlTkGa7cNyoyv3GcxtG0DIHVQfLlIYhKJaEwekqsPN9dJFZeM/pizmqRZ/z TnS4ZpbnfCZUshTXFZIqdUb1TocyVPsvn0kd6xJmWDn62RWFc04N8gYPsBuzJByReXX9BQXOIG22K JML9jbICiacM57azqXU2uTR7RtzjJcbuKhqIU34hpvkirK/xaVVvF6UrNZhWYJue3AuByWIcdAxyE u/C4GFPQ==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1leKRa-004wI4-QS for linux-arm-kernel@lists.infradead.org; Wed, 05 May 2021 16:32:16 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 967D4613FE; Wed, 5 May 2021 16:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232334; bh=tm8jSpP60pbo5RlHvOGMwjbKX7BlomLq7rcI8Zd1ArA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ICDvFJ1ObZSCg2xwedzl9XYK9MXsnVMgU3oeKTp87nnbh27OjBABSUFA8D4zYuNJ9 xWfPMDmK6qCbgOSvZ1/xeaqvYVgpVzT8jPyvn59Z9DNhJuHvbB2h8JVF2N52z8AfEI NOEdBDz4JDsifdAKDyDQIBVFmlHoe2xPoqSxgt3mNQLBRWlK2l2PBWCrjIqZkzrv35 f3agdzwUTdtd+LZqIYhaFlC9yRkS3Irt82xW6w3XTvlyDetDbBGOhpcyJM43jl4uja jmru5tD+1VszFSmwgBja5j/KUmv8ZoVjNXwqH4aamypPs7q87RQBB7sEHNR8L+L08J JO9MjUq3xiOng== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiang Chen , Will Deacon , Sasha Levin , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.12 036/116] iommu/arm-smmu-v3: Add a check to avoid invalid iotlb sync Date: Wed, 5 May 2021 12:30:04 -0400 Message-Id: <20210505163125.3460440-36-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163125.3460440-1-sashal@kernel.org> References: <20210505163125.3460440-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210505_093214_907803_E51D9AEE X-CRM114-Status: UNSURE ( 9.21 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Xiang Chen [ Upstream commit 6cc7e5a9c6b02507b9be5a99b51e970afa91c85f ] It may send a invalid tlb sync for smmuv3 if iotlb_gather is not valid (iotlb_gather->pgsize = 0). So add a check to avoid invalid iotlb sync for it. Signed-off-by: Xiang Chen Link: https://lore.kernel.org/r/1617109106-121844-1-git-send-email-chenxiang66@hisilicon.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 3 +++ 1 file changed, 3 insertions(+) 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 8594b4a83043..941ba5484731 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2305,6 +2305,9 @@ static void arm_smmu_iotlb_sync(struct iommu_domain *domain, { struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + if (!gather->pgsize) + return; + arm_smmu_tlb_inv_range_domain(gather->start, gather->end - gather->start + 1, gather->pgsize, true, smmu_domain); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel