mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Adrián Larumbe" <adrian.larumbe@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org,
	"Steven Price" <steven.price@arm.com>,
	"Boris Brezillon" <boris.brezillon@collabora.com>,
	kernel@collabora.com,
	"Adrián Larumbe" <adrian.larumbe@collabora.com>,
	"Rob Herring" <robh@kernel.org>,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Maxime Ripard" <mripard@kernel.org>,
	"Thomas Zimmermann" <tzimmermann@suse.de>,
	"David Airlie" <airlied@gmail.com>,
	"Simona Vetter" <simona@ffwll.ch>
Subject: [PATCH v5 05/12] drm/panfrost: Check sgt to know whether pages are already mapped
Date: Tue,  7 Oct 2025 16:01:47 +0100	[thread overview]
Message-ID: <20251007150216.254250-6-adrian.larumbe@collabora.com> (raw)
In-Reply-To: <20251007150216.254250-1-adrian.larumbe@collabora.com>

In the MMU's page fault ISR for a heap object, determine whether the
faulting address belongs to a 2MiB block that was already mapped by
checking its corresponding sgt in the Panfrost BO.

Also avoid retrieving pages from the shmem file if last one in the block
was already present, as this means all of them had already been fetched.

This is done in preparation for a future commit in which the MMU mapping
helper might fail, but the page array is left populated, so this cannot
be used as a check for an early bail-out.

Signed-off-by: Adrián Larumbe <adrian.larumbe@collabora.com>
---
 drivers/gpu/drm/panfrost/panfrost_mmu.c | 41 +++++++++++++++----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index cf272b167feb..72864d0d478e 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -600,32 +600,39 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
 		refcount_set(&bo->base.pages_use_count, 1);
 	} else {
 		pages = bo->base.pages;
-		if (pages[page_offset]) {
-			/* Pages are already mapped, bail out. */
-			goto out;
-		}
+	}
+
+	sgt = &bo->sgts[page_offset / (SZ_2M / PAGE_SIZE)];
+	if (sgt->sgl) {
+		/* Pages are already mapped, bail out. */
+		goto out;
 	}
 
 	mapping = bo->base.base.filp->f_mapping;
 	mapping_set_unevictable(mapping);
 
-	for (i = page_offset; i < page_offset + NUM_FAULT_PAGES; i++) {
-		/* Can happen if the last fault only partially filled this
-		 * section of the pages array before failing. In that case
-		 * we skip already filled pages.
+	if (!pages[page_offset + NUM_FAULT_PAGES - 1]) {
+		/* Pages are retrieved sequentially, so if the very last
+		 * one in the subset we want to map is already assigned, then
+		 * there's no need to further iterate.
 		 */
-		if (pages[i])
-			continue;
-
-		pages[i] = shmem_read_mapping_page(mapping, i);
-		if (IS_ERR(pages[i])) {
-			ret = PTR_ERR(pages[i]);
-			pages[i] = NULL;
-			goto err_unlock;
+		for (i = page_offset; i < page_offset + NUM_FAULT_PAGES; i++) {
+			/* Can happen if the last fault only partially filled this
+			 * section of the pages array before failing. In that case
+			 * we skip already filled pages.
+			 */
+			if (pages[i])
+				continue;
+
+			pages[i] = shmem_read_mapping_page(mapping, i);
+			if (IS_ERR(pages[i])) {
+				ret = PTR_ERR(pages[i]);
+				pages[i] = NULL;
+				goto err_unlock;
+			}
 		}
 	}
 
-	sgt = &bo->sgts[page_offset / (SZ_2M / PAGE_SIZE)];
 	ret = sg_alloc_table_from_pages(sgt, pages + page_offset,
 					NUM_FAULT_PAGES, 0, SZ_2M, GFP_KERNEL);
 	if (ret)
-- 
2.51.0


  parent reply	other threads:[~2025-10-07 15:03 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-07 15:01 [PATCH v5 00/12] Some Panfrost fixes and improvements Adrián Larumbe
2025-10-07 15:01 ` [PATCH v5 01/12] drm/panfrost: Replace DRM driver allocation method with newer one Adrián Larumbe
2025-10-07 15:01 ` [PATCH v5 02/12] drm/panfrost: Handle inexistent GPU during probe Adrián Larumbe
2025-10-07 15:01 ` [PATCH v5 03/12] drm/panfrost: Handle job HW submit errors Adrián Larumbe
2025-10-09 15:17   ` Steven Price
2025-10-07 15:01 ` [PATCH v5 04/12] drm/panfrost: Handle error when allocating AS number Adrián Larumbe
2025-10-09 15:17   ` Steven Price
2025-10-07 15:01 ` Adrián Larumbe [this message]
2025-10-07 16:20   ` [PATCH v5 05/12] drm/panfrost: Check sgt to know whether pages are already mapped Boris Brezillon
2025-10-07 15:01 ` [PATCH v5 06/12] drm/panfrost: Handle page mapping failure Adrián Larumbe
2025-10-07 16:24   ` Boris Brezillon
2025-10-07 15:01 ` [PATCH v5 07/12] drm/panfrost: Don't rework job IRQ enable mask in the enable path Adrián Larumbe
2025-10-09 15:33   ` Steven Price
2025-10-07 15:01 ` [PATCH v5 08/12] drm/panfrost: Make re-enabling job interrupts at device reset optional Adrián Larumbe
2025-10-09 15:35   ` Steven Price
2025-10-07 15:01 ` [PATCH v5 09/12] drm/panfrost: Add forward declaration and types header Adrián Larumbe
2025-10-09 15:36   ` Steven Price
2025-10-07 15:01 ` [PATCH v5 10/12] drm/panfrost: Remove unused device property Adrián Larumbe
2025-10-09 15:37   ` Steven Price
2025-10-07 15:01 ` [PATCH v5 11/12] drm/panfrost: Rename panfrost_job functions to reflect real role Adrián Larumbe
2025-10-09 15:43   ` Steven Price
2025-10-07 15:01 ` [PATCH v5 12/12] MAINTAINERS: Add Adrian Larumbe as Panfrost driver maintainer Adrián Larumbe
2025-10-09 15:26   ` Boris Brezillon
2025-10-09 15:47   ` Steven Price
2025-10-09 15:56     ` Boris Brezillon
2025-10-14 23:25     ` Adrián Larumbe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251007150216.254250-6-adrian.larumbe@collabora.com \
    --to=adrian.larumbe@collabora.com \
    --cc=airlied@gmail.com \
    --cc=boris.brezillon@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kernel@collabora.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=robh@kernel.org \
    --cc=simona@ffwll.ch \
    --cc=steven.price@arm.com \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®