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 1ED5DC4332F for ; Fri, 4 Nov 2022 20:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pIZvKDWbLRulVoud5Oa5/DlaBA2Fdyy7L54RJrM68ps=; b=t2NQ8ld/hANHDX 42V5uoZmJBC1/Ub6ZqXDMPEV1bLJZC5kC8wliknk/GrZ2nxjflUVdAdB5fyUAJiB7w2v0oq0VsNq4 W7LlWWefL6xjiOQjj0IsYLWVtXuAm7SjFqOa0Lck+44FX6w1kJ7ylrZy9CMB+cqGEeQV8MnpeFuId 8GYcN9kub8VfcexFH75FmANnpsJrCRkv6vLKE5Z/nSr+bwrvEu4izS9WlRcYW0/tZ/7l26SJ9yNMa Weie9AutongzsYZ1kYn9m6e1lvVRv4+aMbJYVfJ0BVIPg6SKcVIPl336Yg4qQSNeCv4/wHXx09mOQ GvtAY/h848Fs3dR4cdmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1or32P-004znE-2e; Fri, 04 Nov 2022 20:11:37 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1or32L-004zjZ-Ny for linux-arm-kernel@lists.infradead.org; Fri, 04 Nov 2022 20:11:35 +0000 Received: from [192.168.2.75] (unknown [109.252.117.140]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id E59A7660299E; Fri, 4 Nov 2022 20:11:21 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1667592682; bh=K26ToBYpmKy0NrjP+qIPxtE3x8OgWYPbjNoDGDUZWl0=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=ACrwvNZP6zfxrDnYOCVujx6/y21QXOcrvSJHIwseLlhNbh9V8y4O+84VuNvXfVXf9 EHUZiWK0y29EU0MVBWxY8krHQFJfd3yi36d1BX3EOOftuVdSmEWJ61i2jM9q052j+P 8x+wK+U0gPylWyb1UwSM4KwCG90HSzXinsku0tfIw10aw/A/VqIATJ5e+1hrP+qcyp 8bdPj6oTckVjn9SS/SVEUq63HM1cySSe0WXuI8H8FqrWJMOnp8bYVaBhHHIe5oKJbO DTBn54MStseYyVBI1rEWS7E1oCDQiUVhIVQ78N5/vhIGsqf7z6yjx5eSjyTqLfe7fI 5EZnRZJvZ4cww== Message-ID: Date: Fri, 4 Nov 2022 23:11:18 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.3.1 Subject: Re: [PATCH] drm/panfrost: Update io-pgtable API To: Robin Murphy , robh@kernel.org, tomeu.vizoso@collabora.com Cc: linux-arm-kernel@lists.infradead.org, alyssa.rosenzweig@collabora.com, dri-devel@lists.freedesktop.org, steven.price@arm.com References: Content-Language: en-US From: Dmitry Osipenko In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221104_131134_303046_D8927992 X-CRM114-Status: GOOD ( 20.68 ) 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 On 8/23/22 01:01, Robin Murphy wrote: > Convert to io-pgtable's bulk {map,unmap}_pages() APIs, to help the old > single-page interfaces eventually go away. Unmapping heap BOs still > wants to be done a page at a time, but everything else can get the full > benefit of the more efficient interface. > > Signed-off-by: Robin Murphy > --- > drivers/gpu/drm/panfrost/panfrost_mmu.c | 40 +++++++++++++++---------- > 1 file changed, 25 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c > index b285a8001b1d..e246d914e7f6 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c > +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c > @@ -248,11 +248,15 @@ void panfrost_mmu_reset(struct panfrost_device *pfdev) > mmu_write(pfdev, MMU_INT_MASK, ~0); > } > > -static size_t get_pgsize(u64 addr, size_t size) > +static size_t get_pgsize(u64 addr, size_t size, size_t *count) > { > - if (addr & (SZ_2M - 1) || size < SZ_2M) > - return SZ_4K; > + size_t blk_offset = -addr % SZ_2M; > > + if (blk_offset || size < SZ_2M) { > + *count = min_not_zero(blk_offset, size) / SZ_4K; > + return SZ_4K; > + } > + *count = size / SZ_2M; > return SZ_2M; > } > > @@ -287,12 +291,16 @@ static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu, > dev_dbg(pfdev->dev, "map: as=%d, iova=%llx, paddr=%lx, len=%zx", mmu->as, iova, paddr, len); > > while (len) { > - size_t pgsize = get_pgsize(iova | paddr, len); > + size_t pgcount, mapped = 0; > + size_t pgsize = get_pgsize(iova | paddr, len, &pgcount); > > - ops->map(ops, iova, paddr, pgsize, prot, GFP_KERNEL); > - iova += pgsize; > - paddr += pgsize; > - len -= pgsize; > + ops->map_pages(ops, iova, paddr, pgsize, pgcount, prot, > + GFP_KERNEL, &mapped); > + /* Don't get stuck if things have gone wrong */ > + mapped = max(mapped, pgsize); > + iova += mapped; > + paddr += mapped; > + len -= mapped; > } > } > > @@ -344,15 +352,17 @@ void panfrost_mmu_unmap(struct panfrost_gem_mapping *mapping) > mapping->mmu->as, iova, len); > > while (unmapped_len < len) { > - size_t unmapped_page; > - size_t pgsize = get_pgsize(iova, len - unmapped_len); > + size_t unmapped_page, pgcount; > + size_t pgsize = get_pgsize(iova, len - unmapped_len, &pgcount); > > - if (ops->iova_to_phys(ops, iova)) { > - unmapped_page = ops->unmap(ops, iova, pgsize, NULL); > - WARN_ON(unmapped_page != pgsize); > + if (bo->is_heap) > + pgcount = 1; > + if (!bo->is_heap || ops->iova_to_phys(ops, iova)) { > + unmapped_page = ops->unmap_pages(ops, iova, pgsize, pgcount, NULL); > + WARN_ON(unmapped_page != pgsize * pgcount); This patch causes this WARN_ON to trigger. It doesn't happen all the time, I see that the whole unmapped area is mapped. Initially, I thought that this happens because it tries to unmap a partially mapped range, but I checked that ops->iova_to_phys() returns address for all 4k chunks. For example the pgsize * pgcount = 0x8000000, while returned unmapped_page = 0x6000000. I don't see this problem with this patch reverted. This is using today's linux-next. Any ideas? -- Best regards, Dmitry _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel