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 A1BB9ECAAD5 for ; Thu, 1 Sep 2022 10:18: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: 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=D2P8T11hOHn2jNDypOV788C70NH7zyQ6oxVUXs661so=; b=2svpW/+01ArxPj 9xTmw+pAu9lboumpV9CqXDM65TAe6E+8RHJDOmFsP4DAn77zdG96pIvfjsgrQGy/pdzFaRx9dwiyD 7a9qKw9HA6I2pqf4brLhZsr0z+PRWR3CYZoOmxhEnHp4dfXVgxz/3XqMkKwcCIuDR7Dth2A8D5tzU 0Zrr1lzyBzO1mkIWVXkySjNOGapqmGft1tJ5zF03xlMs4v+/0di13qNlDYAGk1YOm+2ml+NL3AOJh XWN6ty7ZXOcFEA7/1+hByvLauHJDeFjtMtSr2ToBiOuaAGKPnUrtpSGR409gf0Yft9Vpghj7i0PTv JwXQCveVv7M9jCgtJaLA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oThGA-00AzNl-4I; Thu, 01 Sep 2022 10:17:18 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oThG6-00AzLg-MZ for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2022 10:17:16 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DE857D6E; Thu, 1 Sep 2022 03:17:14 -0700 (PDT) Received: from [10.1.39.17] (e122027.cambridge.arm.com [10.1.39.17]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4DCA23F7B4; Thu, 1 Sep 2022 03:17:07 -0700 (PDT) Message-ID: <029ebcb2-1c5b-0215-a6db-d22692205bb4@arm.com> Date: Thu, 1 Sep 2022 11:17:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] drm/panfrost: Update io-pgtable API Content-Language: en-GB To: Robin Murphy , robh@kernel.org, tomeu.vizoso@collabora.com Cc: alyssa.rosenzweig@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org References: From: Steven Price In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220901_031714_863954_5F7F8D66 X-CRM114-Status: GOOD ( 19.04 ) 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 22/08/2022 23: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 Looks correct to me. Although the voodoo magic does take a little bit of figuring out ;) Reviewed-by: Steven Price I'll push to drm-misc-next. Thanks, Steve > --- > 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); > } > - iova += pgsize; > - unmapped_len += pgsize; > + iova += pgsize * pgcount; > + unmapped_len += pgsize * pgcount; > } > > panfrost_mmu_flush_range(pfdev, mapping->mmu, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel