From nobody Wed Dec 17 16:11:03 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 26EFF2EBBB7 for ; Sun, 19 Oct 2025 14:53:16 +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=1760885598; cv=pass; b=nEDzqSlowkMchTtmL2I5bdvgnqlJ1AXS+4pHiGFoYucg2kUHRrn05vNdVL94TIpZsfd9M6CmFcNcIdKmRqKa+7R3umjtCmLE/Np0W1yfNyQ9MAUCJgJ2qPrKKstowt/080fQ1Yb8TbBAbdQi4Y24FJ2LiMt2fHxmFwoSmkvIeM0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760885598; c=relaxed/simple; bh=IDMITfR9BiuuC9h72GoPbsNyO5zFX1xhWT1mcWGPCxo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iHLipK0mQYRtLl0BlX5W/78r6YGhkaNf4dtA+xffV+aVbr7h1bENeBdtY6KxH9/GPJ5mfYgqwyTfPhuAj/RfDiH6bP21hCmDW40mythbyoV4thkgGtUYSqVacC7q7HSG8Kw9oxobRVftutJsw2LZ5n7RKFx3Y0vecTjB3rouhIA= 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=WK9wztCa; 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="WK9wztCa" ARC-Seal: i=1; a=rsa-sha256; t=1760885584; cv=none; d=zohomail.com; s=zohoarc; b=MFLY7Cq9wiJwlVQQj7EmEHmqkvSRn1Lt1AoKYoAsG+Hakzco10hCEPrJTd56tmSlbCk5IrG+JJHtcQackxsJCB2M+6hnmHgByBSkr5HmLY5gyLFgehMyLic8ab4RP4i158SEmXBzBM9SN2wzwhGG89jpbBNV27lsc9kREBewTdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760885584; 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=pIjaVVcQbgvGbEJUVZGp8Tn3zJE9LV4RLz+qKd1LdVE=; b=RedZArIbRqgoef/317stQ1aXQzTigC/ewUkFmgfZg2HB0Qp1Over32gV3j8UT2fHHZOi6UhLeEP7jpURNaqfPi+ZhAPqXKoHkPIbyyoHizslZ2vDkyrZmhfUQKsmaXMnV7CSu2Z0XHciBqOMGg33eaR0sR3EuuQg3xmGDLnazFs= 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=1760885584; 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=pIjaVVcQbgvGbEJUVZGp8Tn3zJE9LV4RLz+qKd1LdVE=; b=WK9wztCaJMVVwOASomFseuEYOiPjww/KxFO3ns2aBi8Z7nWV0AtDbYix6ETRxFn5 z8/VCY2aHC2PskGt+q/WIw2LUhIgovPrUnafQ0A1DDWlsgXEHQWJA0OGJ9Jr9Ile+cs JZfq3urZf1KIQsAx3ulF98S7AGsJK7FTx8Wd94Q0= Received: by mx.zohomail.com with SMTPS id 17608855819873.502349635644123; Sun, 19 Oct 2025 07:53:01 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Steven Price , Boris Brezillon , kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , AngeloGioacchino Del Regno , Rob Herring , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Subject: [PATCH v7 06/12] drm/panfrost: Handle page mapping failure Date: Sun, 19 Oct 2025 15:52:11 +0100 Message-ID: <20251019145225.3621989-7-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251019145225.3621989-1-adrian.larumbe@collabora.com> References: <20251019145225.3621989-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. Reviewed-by: Steven Price Reviewed-by: Boris Brezillon Reviewed-by: AngeloGioacchino Del Regno 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 17897edaa2b4..0e3adfbcbdcf 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -395,13 +395,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); @@ -415,10 +434,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; @@ -428,6 +451,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) @@ -438,6 +465,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 | IOMMU_CACHE; + int ret; =20 if (WARN_ON(mapping->active)) return 0; @@ -449,11 +477,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_locked(shmem); + return ret; } =20 void panfrost_mmu_unmap(struct panfrost_gem_mapping *mapping) @@ -638,8 +673,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_CACHE | IOMMU_NOEXEC, sgt); + ret =3D mmu_map_sg(pfdev, bomapping->mmu, addr, + IOMMU_WRITE | IOMMU_READ | IOMMU_CACHE | IOMMU_NOEXEC, sgt); + if (ret) + goto err_mmu_map_sg; =20 bomapping->active =3D true; bo->heap_rss_size +=3D SZ_2M; @@ -653,6 +690,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.51.0