All of lore.kernel.org
 help / color / mirror / Atom feed
From: Steven Price <steven.price@arm.com>
To: Boris Brezillon <boris.brezillon@collabora.com>,
	dri-devel@lists.freedesktop.org
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>,
	Rob Herring <robh+dt@kernel.org>,
	Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>,
	Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH v6 14/16] drm/panfrost: Kill in-flight jobs on FD close
Date: Wed, 30 Jun 2021 15:14:53 +0100	[thread overview]
Message-ID: <dc7ed3ca-a30d-8288-8ab4-ef0d2c50301e@arm.com> (raw)
In-Reply-To: <20210630062751.2832545-15-boris.brezillon@collabora.com>

On 30/06/2021 07:27, Boris Brezillon wrote:
> 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.
> 
> v5:
> * Add a panfrost_exception_is_fault() helper and the
>   DRM_PANFROST_EXCEPTION_MAX_NON_FAULT value
> 
> v4:
> * Don't disable/restore irqs when taking the job_lock (not needed since
>   this lock is never taken from an interrupt context)
> 
> v3:
> * Set fence error to ECANCELED when a TERMINATED exception is received
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
>  drivers/gpu/drm/panfrost/panfrost_device.h |  7 ++++
>  drivers/gpu/drm/panfrost/panfrost_job.c    | 42 ++++++++++++++++++----
>  2 files changed, 43 insertions(+), 6 deletions(-)

The panfrost_exception_is_fault() makes the code much more readable -
thanks!

Reviewed-by: Steven Price <steven.price@arm.com>

> 
> diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h
> index 68e93b7e5b61..193cd87f643c 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_device.h
> +++ b/drivers/gpu/drm/panfrost/panfrost_device.h
> @@ -184,6 +184,7 @@ enum drm_panfrost_exception_type {
>  	DRM_PANFROST_EXCEPTION_KABOOM = 0x05,
>  	DRM_PANFROST_EXCEPTION_EUREKA = 0x06,
>  	DRM_PANFROST_EXCEPTION_ACTIVE = 0x08,
> +	DRM_PANFROST_EXCEPTION_MAX_NON_FAULT = 0x3f,
>  	DRM_PANFROST_EXCEPTION_JOB_CONFIG_FAULT = 0x40,
>  	DRM_PANFROST_EXCEPTION_JOB_POWER_FAULT = 0x41,
>  	DRM_PANFROST_EXCEPTION_JOB_READ_FAULT = 0x42,
> @@ -244,6 +245,12 @@ enum drm_panfrost_exception_type {
>  	DRM_PANFROST_EXCEPTION_MEM_ATTR_NONCACHE_3 = 0xef,
>  };
>  
> +static inline bool
> +panfrost_exception_is_fault(u32 exception_code)
> +{
> +	return exception_code > DRM_PANFROST_EXCEPTION_MAX_NON_FAULT;
> +}
> +
>  const char *panfrost_exception_name(u32 exception_code);
>  bool panfrost_exception_needs_reset(const struct panfrost_device *pfdev,
>  				    u32 exception_code);
> diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
> index cf5f9e8b2a27..8a0db9571bfd 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_job.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_job.c
> @@ -483,14 +483,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 (!panfrost_exception_is_fault(js_status)) {
> +				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
> @@ -499,7 +506,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 (panfrost_exception_is_fault(js_status))
> +					error = -EINVAL;
> +
> +				if (error)
> +					dma_fence_set_error(pfdev->jobs[j]->done_fence, error);
> +
>  				status |= JOB_INT_MASK_DONE(j);
>  			}
>  		}
> @@ -665,10 +681,24 @@ 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;
>  	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(&pfdev->js->job_lock);
> +	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(&pfdev->js->job_lock);
>  }
>  
>  int panfrost_job_is_idle(struct panfrost_device *pfdev)
> 


  reply	other threads:[~2021-06-30 14:15 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-30  6:27 [PATCH v6 00/16] drm/panfrost Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 01/16] drm/sched: Document what the timedout_job method should do Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 02/16] drm/sched: Allow using a dedicated workqueue for the timeout/fault tdr Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 03/16] drm/panfrost: Make ->run_job() return an ERR_PTR() when appropriate Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 04/16] drm/panfrost: Get rid of the unused JS_STATUS_EVENT_ACTIVE definition Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 05/16] drm/panfrost: Drop the pfdev argument passed to panfrost_exception_name() Boris Brezillon
2021-06-30 13:56   ` Alyssa Rosenzweig
2021-06-30  6:27 ` [PATCH v6 06/16] drm/panfrost: Do the exception -> string translation using a table Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 07/16] drm/panfrost: Expose a helper to trigger a GPU reset Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 08/16] drm/panfrost: Use a threaded IRQ for job interrupts Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 09/16] drm/panfrost: Simplify the reset serialization logic Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 10/16] drm/panfrost: Make sure job interrupts are masked before resetting Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 11/16] drm/panfrost: Disable the AS on unhandled page faults Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 12/16] drm/panfrost: Reset the GPU when the AS_ACTIVE bit is stuck Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 13/16] drm/panfrost: Don't reset the GPU on job faults unless we really have to Boris Brezillon
2021-06-30  6:27 ` [PATCH v6 14/16] drm/panfrost: Kill in-flight jobs on FD close Boris Brezillon
2021-06-30 14:14   ` Steven Price [this message]
2021-06-30  6:27 ` [PATCH v6 15/16] drm/panfrost: Queue jobs on the hardware Boris Brezillon
2021-06-30 15:00   ` Steven Price
2021-06-30  6:27 ` [PATCH v6 16/16] drm/panfrost: Increase the AS_ACTIVE polling timeout Boris Brezillon
2021-06-30 15:01   ` Steven Price
2021-07-01  6:56 ` [PATCH v6 00/16] drm/panfrost Boris Brezillon

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=dc7ed3ca-a30d-8288-8ab4-ef0d2c50301e@arm.com \
    --to=steven.price@arm.com \
    --cc=alyssa.rosenzweig@collabora.com \
    --cc=boris.brezillon@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=robh+dt@kernel.org \
    --cc=robin.murphy@arm.com \
    --cc=tomeu.vizoso@collabora.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.