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 X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71D4CC2B9F4 for ; Fri, 25 Jun 2021 14:46:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F07361965 for ; Fri, 25 Jun 2021 14:46:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F07361965 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8AE216EDED; Fri, 25 Jun 2021 14:46:39 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id A56166EDED for ; Fri, 25 Jun 2021 14:46:38 +0000 (UTC) Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 2133F1F43ABB; Fri, 25 Jun 2021 15:46:37 +0100 (BST) Date: Fri, 25 Jun 2021 16:46:34 +0200 From: Boris Brezillon To: Lucas Stach Subject: Re: [PATCH v3 14/15] drm/panfrost: Kill in-flight jobs on FD close Message-ID: <20210625164634.6092778e@collabora.com> In-Reply-To: <595cfd158a03c0c22af8bb6d186da43fd12c99ac.camel@pengutronix.de> References: <20210625133327.2598825-1-boris.brezillon@collabora.com> <20210625133327.2598825-15-boris.brezillon@collabora.com> <595cfd158a03c0c22af8bb6d186da43fd12c99ac.camel@pengutronix.de> Organization: Collabora X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomeu Vizoso , dri-devel@lists.freedesktop.org, Steven Price , Rob Herring , Alyssa Rosenzweig , Robin Murphy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, 25 Jun 2021 15:43:45 +0200 Lucas Stach wrote: > Am Freitag, dem 25.06.2021 um 15:33 +0200 schrieb Boris Brezillon: > > If the process who submitted these jobs decided to close the FD before > > the jobs are done it probably means it doesn't care about the result. > > > > v3: > > * Set fence error to ECANCELED when a TERMINATED exception is received > > > > Signed-off-by: Boris Brezillon > > --- > > drivers/gpu/drm/panfrost/panfrost_job.c | 43 +++++++++++++++++++++---- > > 1 file changed, 37 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c > > index 948bd174ff99..aa1e6542adde 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_job.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c > > @@ -498,14 +498,21 @@ static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status) > > > > if (status & JOB_INT_MASK_ERR(j)) { > > u32 js_status = job_read(pfdev, JS_STATUS(j)); > > + const char *exception_name = panfrost_exception_name(js_status); > > > > job_write(pfdev, JS_COMMAND_NEXT(j), JS_COMMAND_NOP); > > > > - dev_err(pfdev->dev, "js fault, js=%d, status=%s, head=0x%x, tail=0x%x", > > - j, > > - panfrost_exception_name(js_status), > > - job_read(pfdev, JS_HEAD_LO(j)), > > - job_read(pfdev, JS_TAIL_LO(j))); > > + if (js_status < DRM_PANFROST_EXCEPTION_JOB_CONFIG_FAULT) { > > + dev_dbg(pfdev->dev, "js interrupt, js=%d, status=%s, head=0x%x, tail=0x%x", > > + j, exception_name, > > + job_read(pfdev, JS_HEAD_LO(j)), > > + job_read(pfdev, JS_TAIL_LO(j))); > > + } else { > > + dev_err(pfdev->dev, "js fault, js=%d, status=%s, head=0x%x, tail=0x%x", > > + j, exception_name, > > + job_read(pfdev, JS_HEAD_LO(j)), > > + job_read(pfdev, JS_TAIL_LO(j))); > > + } > > > > /* If we need a reset, signal it to the timeout > > * handler, otherwise, update the fence error field and > > @@ -514,7 +521,16 @@ static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status) > > if (panfrost_exception_needs_reset(pfdev, js_status)) { > > drm_sched_fault(&pfdev->js->queue[j].sched); > > } else { > > - dma_fence_set_error(pfdev->jobs[j]->done_fence, -EINVAL); > > + int error = 0; > > + > > + if (js_status == DRM_PANFROST_EXCEPTION_TERMINATED) > > + error = -ECANCELED; > > + else if (js_status >= DRM_PANFROST_EXCEPTION_JOB_CONFIG_FAULT) > > + error = -EINVAL; > > + > > + if (error) > > + dma_fence_set_error(pfdev->jobs[j]->done_fence, error); > > + > > status |= JOB_INT_MASK_DONE(j); > > } > > } > > @@ -673,10 +689,25 @@ int panfrost_job_open(struct panfrost_file_priv *panfrost_priv) > > > > void panfrost_job_close(struct panfrost_file_priv *panfrost_priv) > > { > > + struct panfrost_device *pfdev = panfrost_priv->pfdev; > > + unsigned long flags; > > int i; > > > > for (i = 0; i < NUM_JOB_SLOTS; i++) > > drm_sched_entity_destroy(&panfrost_priv->sched_entity[i]); > > + > > + /* Kill in-flight jobs */ > > + spin_lock_irqsave(&pfdev->js->job_lock, flags); > > Micro-optimization, but this code is never called from IRQ context, so > a spin_lock_irq would do here, no need to save/restore flags. Ah, right, I moved patches around. This patch was before the 'move to threaded-irq' one in v2, but now that it's coming after, we can use a regular lock here. > > Regards, > Lucas > > > + for (i = 0; i < NUM_JOB_SLOTS; i++) { > > + struct drm_sched_entity *entity = &panfrost_priv->sched_entity[i]; > > + struct panfrost_job *job = pfdev->jobs[i]; > > + > > + if (!job || job->base.entity != entity) > > + continue; > > + > > + job_write(pfdev, JS_COMMAND(i), JS_COMMAND_HARD_STOP); > > + } > > + spin_unlock_irqrestore(&pfdev->js->job_lock, flags); > > } > > > > int panfrost_job_is_idle(struct panfrost_device *pfdev) > >