From nobody Thu Dec 18 20:19:24 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C2101C3C17 for ; Wed, 4 Dec 2024 18:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733338243; cv=pass; b=M1R8o8T6g25LH+7g5j89dS8O28tE/XDaY+xnWQc5L+vjLhtJZhkv00dVkXxVh0Ksv+k7VueWitLmlGt/9KEg12TWea1Cjue56KtSOxCwI0rEDmKXwjvTpikQcRO/3mS+f7TqklIR8DT4oK8HA59lO9ExrFj1LpN2VyKPx8C9BJA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733338243; c=relaxed/simple; bh=Gxmgl7JId5YxLhp27WPo8S0U++enkznLsBC2CCUE1hw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IquKYr7p2Bpf79kS7/06HBUF5nAkNBLXQcDr9YyYs3TPNsZ1uwAQ+zmyiqdVs6wv8vZyR5bfJEGMPJMJkastTeyrqV103b1GWdUc6s6PoH3vZJ4kmprHSrPbcq8nwGJW4FgXu8OcaEQxYnQFVoE6GRZMyFC5xDdKJ+J7fSw5pGo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=ViapI7YA; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="ViapI7YA" ARC-Seal: i=1; a=rsa-sha256; t=1733338222; cv=none; d=zohomail.com; s=zohoarc; b=Acg2d6GZnOyyCpVc6VksZQPJGwLzxw6lyRX9Ul0rq7swnZluA3+3KCIrmSrUVX29k4JSlzR9AeFBs+qdSduwqwqLXNBDP3E55JhexK2BftL/fi+INfXXpJEv/xK4W+3mWpRJg+19HQ5z9iDMi6U2CWcNpwWnUepKB++zFO1hzzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1733338222; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=lEXhHGys1FAioT7vrf84uPdDoQxjt+sd75zd+0joyCA=; b=GVz4aysZo33wyb8f9VAOYWvY7rN10stWqSuV1p30NWYIcCTmEMWx+cYYqcKNsUUHau9aGnGG/fGILSAEIFvHjpZlJn+jVQ8afuJrxvZTOpOyig/MoESRG5/vA2peC52ldwEaha/VLCjfWH4Sl04xZG+CBdju7vF42hE13LrehjY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1733338222; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=lEXhHGys1FAioT7vrf84uPdDoQxjt+sd75zd+0joyCA=; b=ViapI7YA1WLu894zvHjSSoiWCOP/fYk4cwT1cdYnQvPN+mcrJUOmypQw99/FuA7r IMhSLnHPiym0T6OCzZPFHDd/TqUv396Jpqn9ugGA8iYnYt3KeTacwpQAcd3Azab8QdE K//VpzbVfkElJ848yXDXYpSHSGCqqdZPwH/r2fiM= Received: by mx.zohomail.com with SMTPS id 1733338220730866.7866025559289; Wed, 4 Dec 2024 10:50:20 -0800 (PST) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Philipp Zabel Cc: kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/9] drm/panfrost: Handle page mapping failure Date: Wed, 4 Dec 2024 18:49:34 +0000 Message-ID: <20241204184945.1477677-6-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241204184945.1477677-1-adrian.larumbe@collabora.com> References: <20241204184945.1477677-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When mapping the pages of a BO, either a heap type at page fault time or else a non-heap BO at object creation time, if the ARM page table mapping function fails, we unmap what had been mapped so far and bail out. Signed-off-by: Adri=C3=A1n Larumbe --- drivers/gpu/drm/panfrost/panfrost_mmu.c | 49 ++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index 03ac527b35e7..2a6c60170109 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -290,13 +290,32 @@ static void panfrost_mmu_flush_range(struct panfrost_= device *pfdev, pm_runtime_put_autosuspend(pfdev->base.dev); } =20 +static void mmu_unmap_range(struct panfrost_mmu *mmu, u64 iova, size_t len) +{ + struct io_pgtable_ops *ops =3D mmu->pgtbl_ops; + size_t pgsize, unmapped_len =3D 0; + size_t unmapped_page, pgcount; + + while (unmapped_len < len) { + pgsize =3D get_pgsize(iova, len - unmapped_len, &pgcount); + + unmapped_page =3D ops->unmap_pages(ops, iova, pgsize, pgcount, NULL); + WARN_ON(unmapped_page !=3D pgsize * pgcount); + + iova +=3D pgsize * pgcount; + unmapped_len +=3D pgsize * pgcount; + } +} + static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *= mmu, u64 iova, int prot, struct sg_table *sgt) { unsigned int count; struct scatterlist *sgl; struct io_pgtable_ops *ops =3D mmu->pgtbl_ops; + size_t total_mapped =3D 0; u64 start_iova =3D iova; + int ret; =20 for_each_sgtable_dma_sg(sgt, sgl, count) { unsigned long paddr =3D sg_dma_address(sgl); @@ -310,10 +329,14 @@ static int mmu_map_sg(struct panfrost_device *pfdev, = struct panfrost_mmu *mmu, size_t pgcount, mapped =3D 0; size_t pgsize =3D get_pgsize(iova | paddr, len, &pgcount); =20 - ops->map_pages(ops, iova, paddr, pgsize, pgcount, prot, + ret =3D ops->map_pages(ops, iova, paddr, pgsize, pgcount, prot, GFP_KERNEL, &mapped); + if (ret) + goto err_unmap_pages; + /* Don't get stuck if things have gone wrong */ mapped =3D max(mapped, pgsize); + total_mapped +=3D mapped; iova +=3D mapped; paddr +=3D mapped; len -=3D mapped; @@ -323,6 +346,10 @@ static int mmu_map_sg(struct panfrost_device *pfdev, s= truct panfrost_mmu *mmu, panfrost_mmu_flush_range(pfdev, mmu, start_iova, iova - start_iova); =20 return 0; + +err_unmap_pages: + mmu_unmap_range(mmu, start_iova, total_mapped); + return ret; } =20 int panfrost_mmu_map(struct panfrost_gem_mapping *mapping) @@ -333,6 +360,7 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *mappi= ng) struct panfrost_device *pfdev =3D to_panfrost_device(obj->dev); struct sg_table *sgt; int prot =3D IOMMU_READ | IOMMU_WRITE; + int ret; =20 if (WARN_ON(mapping->active)) return 0; @@ -344,11 +372,18 @@ int panfrost_mmu_map(struct panfrost_gem_mapping *map= ping) if (WARN_ON(IS_ERR(sgt))) return PTR_ERR(sgt); =20 - mmu_map_sg(pfdev, mapping->mmu, mapping->mmnode.start << PAGE_SHIFT, - prot, sgt); + ret =3D mmu_map_sg(pfdev, mapping->mmu, mapping->mmnode.start << PAGE_SHI= FT, + prot, sgt); + if (ret) + goto err_put_pages; + mapping->active =3D true; =20 return 0; + +err_put_pages: + drm_gem_shmem_put_pages(shmem); + return ret; } =20 void panfrost_mmu_unmap(struct panfrost_gem_mapping *mapping) @@ -532,8 +567,10 @@ static int panfrost_mmu_map_fault_addr(struct panfrost= _device *pfdev, int as, if (ret) goto err_map; =20 - mmu_map_sg(pfdev, bomapping->mmu, addr, - IOMMU_WRITE | IOMMU_READ | IOMMU_NOEXEC, sgt); + ret =3D mmu_map_sg(pfdev, bomapping->mmu, addr, + IOMMU_WRITE | IOMMU_READ | IOMMU_NOEXEC, sgt); + if (ret) + goto err_mmu_map_sg; =20 bomapping->active =3D true; bo->heap_rss_size +=3D SZ_2M; @@ -547,6 +584,8 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_= device *pfdev, int as, =20 return 0; =20 +err_mmu_map_sg: + dma_unmap_sgtable(pfdev->base.dev, sgt, DMA_BIDIRECTIONAL, 0); err_map: sg_free_table(sgt); err_unlock: --=20 2.47.0