From: "Das, Nirmoy" <nirmoy.das@linux.intel.com>
To: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Chris Wilson <chris.p.wilson@intel.com>,
Andrzej Hajda <andrzej.hajda@intel.com>,
Nirmoy Das <nirmoy.das@intel.com>
Subject: Re: [Intel-gfx] [PATCH v2 2/2] drm/i915: Never return 0 if not all requests retired
Date: Fri, 18 Nov 2022 20:56:50 +0100 [thread overview]
Message-ID: <b7b01eef-3550-9f9f-11d0-8698fa322f66@linux.intel.com> (raw)
In-Reply-To: <20221118104222.57328-3-janusz.krzysztofik@linux.intel.com>
On 11/18/2022 11:42 AM, Janusz Krzysztofik wrote:
> Users of intel_gt_retire_requests_timeout() expect 0 return value on
> success. However, we have no protection from passing back 0 potentially
> returned by a call to dma_fence_wait_timeout() when it succedes right
> after its timeout has expired.
>
> Replace 0 with -ETIME before potentially using the timeout value as return
> code, so -ETIME is returned if there are still some requests not retired
> after timeout, 0 otherwise.
>
> v2: Move the added lines down so flush_submission() is not affected.
>
> Fixes: f33a8a51602c ("drm/i915: Merge wait_for_timelines with retire_request")
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
> Cc: stable@vger.kernel.org # v5.5+
> ---
> drivers/gpu/drm/i915/gt/intel_gt_requests.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> index edb881d756309..3ac4603eeb4ee 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c
> @@ -199,6 +199,9 @@ out_active: spin_lock(&timelines->lock);
> if (remaining_timeout)
> *remaining_timeout = timeout;
>
> + if (!timeout)
> + timeout = -ETIME;
This will return error, -ETIME when 0 timeout is passed,
intel_gt_retire_requests().
We don't want that. I think you can use a separate variable to store
return val from the dma_fence_wait_timeout()
Regards,
Nirmoy
> +
> return active_count ? timeout : 0;
> }
>
next prev parent reply other threads:[~2022-11-18 19:57 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 10:42 [Intel-gfx] [PATCH v2 0/2] drm/i915: Fix timeout handling when retiring requests Janusz Krzysztofik
2022-11-18 10:42 ` [Intel-gfx] [PATCH v2 1/2] drm/i915: Fix negative value passed as remaining time Janusz Krzysztofik
2022-11-21 8:36 ` Janusz Krzysztofik
2022-11-18 10:42 ` [Intel-gfx] [PATCH v2 2/2] drm/i915: Never return 0 if not all requests retired Janusz Krzysztofik
2022-11-18 19:56 ` Das, Nirmoy [this message]
2022-11-21 8:30 ` Janusz Krzysztofik
2022-11-21 10:17 ` Andrzej Hajda
2022-11-21 10:51 ` Janusz Krzysztofik
2022-11-21 10:59 ` Janusz Krzysztofik
2022-11-21 12:12 ` Andrzej Hajda
2022-11-21 23:13 ` Janusz Krzysztofik
2022-11-18 11:34 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Fix timeout handling when retiring requests (rev2) Patchwork
2022-11-18 14:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-11-19 1:20 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
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=b7b01eef-3550-9f9f-11d0-8698fa322f66@linux.intel.com \
--to=nirmoy.das@linux.intel.com \
--cc=andrzej.hajda@intel.com \
--cc=chris.p.wilson@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=janusz.krzysztofik@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=nirmoy.das@intel.com \
--cc=tvrtko.ursulin@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox