From nobody Wed Oct 1 22:18:41 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 B220A2727F8 for ; Wed, 1 Oct 2025 02:21:45 +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=1759285307; cv=pass; b=BM+9sKnYuTwg4+5BQJSr/5b22/PfmKi8pB6PzAFhPTdzEB6sSVmLQABfauJPv9iEnikfgw49aQWjLpVVt46DC6AzKHzX9yHtUnvNN3iXMCyVWTRBCjCB5cDWxohLI4QUW0rZaMUK3IDIhkELkNgjzOFTgJjQez0UmjcWPV+Z+7A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759285307; c=relaxed/simple; bh=cRrUwnwF86d1yu9Fw25VuWlxKq0VumrWcIsVB2cMl1A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=D+iuERatJ6b0KuL4t1lydD3jxoKpPW6WEQ/1xH2kdtkjkNC4geB1IoTiD+T4kuWhqyI5o2gv2+mdqaz2Hi4cpsfMJQudjpomqlx+KmpZ3G0hfXgAtTrPmR1Ba5lSMhpCfr5iFxC0AfmwmNVOJ10mTm8aoc88jGL9HCVbpYFVDgs= 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=e52Q6lv9; 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="e52Q6lv9" ARC-Seal: i=1; a=rsa-sha256; t=1759285288; cv=none; d=zohomail.com; s=zohoarc; b=nbXCxcL9CFoaGi5jSBm8MiovxiRZ8VJsO+IRMLaFykqsJ1rt/GW1NgyEQp9Ulw4ItdGxYZysK4GHLtFLg3BJfeMj50mTZtdqZVsUiBAwFdZGcE+KMD6RcZamj2ZVlRTJghA5xH3MEZuI+vvqTDk/2637cGXFErwvz8CRnSHokBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759285288; 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=mQiIY5OmbYYLXAmVuDEakyrhct3EalPsV4lWvohUfgE=; b=Gw5qbkxkzS5/KvFXfQtG0i9oqd0VRMs9T83GdpZua90YiZ+cfsSUXHK9Zj5BbRWQo+6KOhruXplqSfncux1EWXEJ6RRABNIQ5X2yGuWlgnpEVcahAFnt1r0j3dmC1VGa050fGW6SEx1oyMklHy/ilIXsOacFvGOzrNhqUshj1tY= 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=1759285288; 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=mQiIY5OmbYYLXAmVuDEakyrhct3EalPsV4lWvohUfgE=; b=e52Q6lv9LVm2e2RtdR5uV4rWONWpcaWZMNI7fdyrOoe71wlNuhCZXps5EpCvTp+l zcRz4XikKUdgS05jeN1IF5fIvrFvePuOvfWWsGwgkIA7L5nznsfBqN/Z2/l3JwBe9Id hQuYJonB3vNjo95r0Jm87NYCPcfkc7i0CTtZKzHo= Received: by mx.zohomail.com with SMTPS id 1759285286372925.1259711011884; Tue, 30 Sep 2025 19:21:26 -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?= , Rob Herring , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Subject: [PATCH v4 04/10] drm/panfrost: Handle error when allocating AS number Date: Wed, 1 Oct 2025 03:20:25 +0100 Message-ID: <20251001022039.1215976-5-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001022039.1215976-1-adrian.larumbe@collabora.com> References: <20251001022039.1215976-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 If we reach the beginning of the LRU AS list, then return an error. Reviewed-by: Boris Brezillon Signed-off-by: Adri=C3=A1n Larumbe --- drivers/gpu/drm/panfrost/panfrost_job.c | 6 +++++- drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 +++-- drivers/gpu/drm/panfrost/panfrost_mmu.h | 2 +- drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 9 ++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panf= rost/panfrost_job.c index 3f60adc9b69d..ba934437a8ea 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -215,7 +215,11 @@ static int panfrost_job_hw_submit(struct panfrost_job = *job, int js) goto err_hwsubmit; } =20 - cfg =3D panfrost_mmu_as_get(pfdev, job->mmu); + ret =3D panfrost_mmu_as_get(pfdev, job->mmu); + if (ret < 0) + goto err_hwsubmit; + + cfg =3D ret; =20 job_write(pfdev, JS_HEAD_NEXT_LO(js), lower_32_bits(jc_head)); job_write(pfdev, JS_HEAD_NEXT_HI(js), upper_32_bits(jc_head)); diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panf= rost/panfrost_mmu.c index 1d696eeea2fa..cf272b167feb 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -258,7 +258,7 @@ static int panfrost_mmu_cfg_init(struct panfrost_mmu *m= mu, } } =20 -u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu) +int panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu) { int as; =20 @@ -300,7 +300,8 @@ u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, = struct panfrost_mmu *mmu) if (!atomic_read(&lru_mmu->as_count)) break; } - WARN_ON(&lru_mmu->list =3D=3D &pfdev->as_lru_list); + if (WARN_ON(&lru_mmu->list =3D=3D &pfdev->as_lru_list)) + return -EBUSY; =20 list_del_init(&lru_mmu->list); as =3D lru_mmu->as; diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.h b/drivers/gpu/drm/panf= rost/panfrost_mmu.h index 022a9a74a114..e6e6966a0cca 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.h +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.h @@ -16,7 +16,7 @@ void panfrost_mmu_fini(struct panfrost_device *pfdev); void panfrost_mmu_reset(struct panfrost_device *pfdev); void panfrost_mmu_suspend_irq(struct panfrost_device *pfdev); =20 -u32 panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu); +int panfrost_mmu_as_get(struct panfrost_device *pfdev, struct panfrost_mmu= *mmu); void panfrost_mmu_as_put(struct panfrost_device *pfdev, struct panfrost_mm= u *mmu); =20 struct panfrost_mmu *panfrost_mmu_ctx_get(struct panfrost_mmu *mmu); diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/= panfrost/panfrost_perfcnt.c index 718eb44b40f8..a8d821e1bde2 100644 --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c @@ -132,7 +132,12 @@ static int panfrost_perfcnt_enable_locked(struct panfr= ost_device *pfdev, =20 perfcnt->user =3D user; =20 - as =3D panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu); + ret =3D panfrost_mmu_as_get(pfdev, perfcnt->mapping->mmu); + if (ret < 0) + goto err_unsetuser; + + as =3D ret; + cfg =3D GPU_PERFCNT_CFG_AS(as) | GPU_PERFCNT_CFG_MODE(GPU_PERFCNT_CFG_MODE_MANUAL); =20 @@ -166,6 +171,8 @@ static int panfrost_perfcnt_enable_locked(struct panfro= st_device *pfdev, =20 return 0; =20 +err_unsetuser: + perfcnt->user =3D NULL; err_vunmap: drm_gem_vunmap(&bo->base, &map); err_put_mapping: --=20 2.51.0