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 93DD6ECE57A for ; Mon, 9 Sep 2024 14:51:27 +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=CTQf36g2YUMPDOeOi/VZW0Qc+wZvdvweFENzO3NyTE4=; b=PXCO1ydDi3CXwx2OoPFAnC9yIk JcyXqMlAOnfUA7dzHgMsuqlJI1Wdk2FfukgqLuhV6eYVz9LbRxNZ8Wd05YBRUNMOko9ImoyhFmhq8 RiQ5lySxoM/5xeZXNkrOf5cRkmaZSWumboWyjaEcG5NXOkzdNN59sGOiVtNw431uhTYWkSYgJ1/o6 LG/c+rLamj7XF5k/iGzVFsYUq+ec2IkAC3vtMdbHUXm04cOhxNRtJ2BkRvxltZ/QKnLmEwoeWcE6V Y2+SbFrXMl7UDPRaoJclqrn+2/RI3AYMLjv432YfbRvwo4g4Emutp4lVBEtpKN67Atpz9cenYuCm6 Khd2NoeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1snfjW-00000002ME4-0t8W; Mon, 09 Sep 2024 14:51:14 +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 1snfiU-00000002LuQ-1G6e for linux-arm-kernel@lists.infradead.org; Mon, 09 Sep 2024 14:50:11 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id B7E645C01E3; Mon, 9 Sep 2024 14:50:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35CF6C4CEC5; Mon, 9 Sep 2024 14:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725893409; bh=E55QCe1LlO+SgbpQ8x5M5ZFRadQoSvxYJkVZCOdkJ8M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=caE5/RNTOUOsQsj8LWstsX0UOrUi2jXtTVmUSgE0NSXCn1ylC4knk6tA3GzsVdO0L OGM4P/yJlj/iV5nNgz9Zay3U0ENwIFNRAC3lw+4sNQIvaIM8BqSkm7ANQ8RFGc2G25 X16ImJ5hGf8Ml/26fhUB9tleasW6LHXdeRHVTfQDPzfktf2V3yQz8+GwHYYN/JLCwK epTfR0BJS9jHfhoEWfX4fjqvqJS3DTtc3E8TsHITLxhudD8Xl7pWZLNlO7IrFf95AE 1+aJ+4ntWXUFaOdDWPM5YZb8JbdXfa4epw+jLt6+JOgM3H0cmTrKhPdYQ6uQ0gJ0Hy USV/12/5rovqw== Date: Mon, 9 Sep 2024 15:50:03 +0100 From: Will Deacon To: Robin Murphy Cc: Rob Clark , iommu@lists.linux.dev, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Ashish Mhetre , Rob Clark , Joerg Roedel , "moderated list:ARM SMMU DRIVERS" , open list Subject: Re: [PATCH] Revert "iommu/io-pgtable-arm: Optimise non-coherent unmap" Message-ID: <20240909145003.GB19863@willie-the-truck> References: <20240905124956.84932-1-robdclark@gmail.com> <20240905155330.GA15246@willie-the-truck> <53f13813-a515-475a-836d-0b6017a117eb@arm.com> <20240906105656.GA16124@willie-the-truck> <8e17f1ac-0178-454b-b9dc-bb14ad6c465b@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8e17f1ac-0178-454b-b9dc-bb14ad6c465b@arm.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-20240909_075010_492188_0718D48F X-CRM114-Status: GOOD ( 42.06 ) 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 On Fri, Sep 06, 2024 at 04:25:19PM +0100, Robin Murphy wrote: > On 06/09/2024 11:56 am, Will Deacon wrote: > > On Thu, Sep 05, 2024 at 05:27:28PM +0100, Robin Murphy wrote: > > > On 05/09/2024 4:53 pm, Will Deacon wrote: > > > > 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? > > > > > > Given that the GPU driver's .tlb_add_page is a no-op, I can't see this > > > making a difference. In fact, given that msm_iommu_pagetable_unmap() still > > > does a brute-force iommu_flush_iotlb_all() after io-pgtable returns, and in > > > fact only recently made .tlb_flush_walk start doing anything either for the > > > sake of the map path, I'm now really wondering how this patch has had any > > > effect at all... :/ > > > > Hmm, yup. Looks like Rob has come back to say the problem lies elsewhere > > anyway. > > > > One thing below though... > > > > > > > > > > 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)) > > > > > > Note that this would reintroduce the latent issue which was present > > > originally, wherein iommu_iotlb_gather_queued(NULL) is false, but if we > > > actually allow a NULL gather to be passed to io_pgtable_tlb_add_page() it > > > may end up being dereferenced (e.g. in arm-smmu-v3). > > > > I think there is still something to fix here. arm_lpae_init_pte() can > > pass a NULL gather to __arm_lpae_unmap() and I don't think skipping the > > invalidation is correct in that case. Either the drivers need to handle > > that or we shouldn't be passing NULL. > > > > What do you think? > > The subtlety there is that in that case it's always a non-leaf PTE, so all > that goes back to the driver is io_pgtable_tlb_flush_walk() and the gather > is never used. Beautiful... Will