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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F4142CD5BC9 for ; Thu, 5 Sep 2024 15:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=i6w4Z3EJyWv4lhtVWJ1gaXh0MDwv8BMq6brdr7+H5uQ=; b=g6xlGGcM0fZ1OFqngdeuqCW4cO i0q+eTrqOh1DHVrLJJMgRS/w1LpArn+I14ppPad4n2N2KfqdwBKzXnFWaOL87TPtLJZQVa7TmohfG W6gGLQOeT7FnBRMSqGpCkWrhFD9+7g5KMafP77xsxzyJusO2IU8C3+aVjKhvvdddEpTfkr3AVsSwR pOKXX6h+UuwCwVBScFLIaZWHDYVPvJLSIFp6m2WEZBFxJSqAhB4yhns2ra2CcGwQ3X6W55imS0YZt J1hJCaC1md/mBJGiSF0eQokzwdvoCEFAgcMli3HXJsKTZzf8W99QCe67ySgZx2Y1OfzwOPxI5Rtvc QX3HlXyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1smEp8-000000091L3-41Lv; Thu, 05 Sep 2024 15:55:06 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1smEni-0000000912t-0IMa for linux-arm-kernel@lists.infradead.org; Thu, 05 Sep 2024 15:53:39 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id B8D4E5C53AE; Thu, 5 Sep 2024 15:53:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13B99C4CEC3; Thu, 5 Sep 2024 15:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725551615; bh=FT/uFKjMbwjJnnJkd4LrmJ5bCz++QM6QGQX26aS6/TY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fDjDFHIMejDOYZ1VSD8UDbscVuMP/PSfJvjVNV/TYwbSKY+jz6Id69N9FhBr3jBFL ar/EINT4oTP8C74poPjbEBjS27L4FT7w4XvUjhGyX1JSio4NZnr1BrW+Q4T5JRu/sj U/CfocxCWVsJIH94pfS+4ul0tG9h2o5GjIwCjNoYjyVQZKXBKeJQO+OwRKkF9dOBw/ kbiE/M09Dlfqx7JsRlxUMqPwFfhzhA9Py9+/16RqfjhJTBrJKoAKZHs6ojWpYPUXd7 3dYiIDvpXRdSiVmgV1aAeHU8Ako29QCgEtmgXpvNjyeYvxgZHRgPtRKsPCs1ndZNia Cv2U3508lueSA== Date: Thu, 5 Sep 2024 16:53:30 +0100 From: Will Deacon To: Rob Clark Cc: iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Ashish Mhetre , Rob Clark , Robin Murphy , Joerg Roedel , "moderated list:ARM SMMU DRIVERS" , open list Subject: Re: [PATCH] Revert "iommu/io-pgtable-arm: Optimise non-coherent unmap" Message-ID: <20240905155330.GA15246@willie-the-truck> References: <20240905124956.84932-1-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240905124956.84932-1-robdclark@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240905_085338_196115_BFB362AF X-CRM114-Status: GOOD ( 17.90 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Rob, On Thu, Sep 05, 2024 at 05:49:56AM -0700, Rob Clark wrote: > From: Rob Clark > > This reverts commit 85b715a334583488ad7fbd3001fe6fd617b7d4c0. > > It was causing gpu smmu faults on x1e80100. > > I _think_ what is causing this is the change in ordering of > __arm_lpae_clear_pte() (dma_sync_single_for_device() on the pgtable > memory) and io_pgtable_tlb_flush_walk(). I'm not entirely sure how > this patch is supposed to work correctly in the face of other > concurrent translations (to buffers unrelated to the one being > unmapped(), because after the io_pgtable_tlb_flush_walk() we can have > stale data read back into the tlb. > > Signed-off-by: Rob Clark > --- > drivers/iommu/io-pgtable-arm.c | 31 ++++++++++++++----------------- > 1 file changed, 14 insertions(+), 17 deletions(-) Please can you try the diff below, instead? Will --->8 diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 0e67f1721a3d..0a32e9499e2c 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -672,7 +672,7 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data, /* Clear the remaining entries */ __arm_lpae_clear_pte(ptep, &iop->cfg, i); - if (gather && !iommu_iotlb_gather_queued(gather)) + if (!iommu_iotlb_gather_queued(gather)) for (int j = 0; j < i; j++) io_pgtable_tlb_add_page(iop, gather, iova + j * size, size);