From: "Das, Nirmoy" <nirmoy.das@intel.com>
To: Andi Shyti <andi.shyti@linux.intel.com>,
<intel-gfx@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>, <stable@vger.kernel.org>
Cc: Matthew Auld <matthew.auld@intel.com>,
Maciej Patelczyk <maciej.patelczyk@intel.com>,
Chris Wilson <chris.p.wilson@linux.intel.com>,
Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>,
Andi Shyti <andi.shyti@kernel.org>
Subject: Re: [PATCH v4 5/5] drm/i915/gt: Make sure that errors are propagated through request chains
Date: Tue, 11 Apr 2023 08:39:00 +0200 [thread overview]
Message-ID: <1bee29d0-a5cc-9ff3-d164-f162259558e2@intel.com> (raw)
In-Reply-To: <20230308094106.203686-6-andi.shyti@linux.intel.com>
On 3/8/2023 10:41 AM, Andi Shyti wrote:
> Currently, when we perform operations such as clearing or copying
> large blocks of memory, we generate multiple requests that are
> executed in a chain.
>
> However, if one of these requests fails, we may not realize it
> unless it happens to be the last request in the chain. This is
> because errors are not properly propagated.
>
> For this we need to keep propagating the chain of fence
> notification in order to always reach the final fence associated
> to the final request.
>
> To address this issue, we need to ensure that the chain of fence
> notifications is always propagated so that we can reach the final
> fence associated with the last request. By doing so, we will be
> able to detect any memory operation failures and determine
> whether the memory is still invalid.
>
> On copy and clear migration signal fences upon completion.
>
> On copy and clear migration, signal fences upon request
> completion to ensure that we have a reliable perpetuation of the
> operation outcome.
>
> Fixes: cf586021642d80 ("drm/i915/gt: Pipelined page migration")
> Reported-by: Matthew Auld <matthew.auld@intel.com>
> Suggested-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
> Cc: stable@vger.kernel.org
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
With Matt's comment regarding missing lock in
intel_context_migrate_clear addressed, this is:
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
> ---
> drivers/gpu/drm/i915/gt/intel_migrate.c | 41 ++++++++++++++++++-------
> 1 file changed, 30 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
> index 3f638f1987968..0031e7b1b4704 100644
> --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
> +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
> @@ -742,13 +742,19 @@ intel_context_migrate_copy(struct intel_context *ce,
> dst_offset = 2 * CHUNK_SZ;
> }
>
> + /*
> + * While building the chain of requests, we need to ensure
> + * that no one can sneak into the timeline unnoticed.
> + */
> + mutex_lock(&ce->timeline->mutex);
> +
> do {
> int len;
>
> - rq = i915_request_create(ce);
> + rq = i915_request_create_locked(ce);
> if (IS_ERR(rq)) {
> err = PTR_ERR(rq);
> - goto out_ce;
> + break;
> }
>
> if (deps) {
> @@ -878,10 +884,14 @@ intel_context_migrate_copy(struct intel_context *ce,
>
> /* Arbitration is re-enabled between requests. */
> out_rq:
> - if (*out)
> + i915_sw_fence_await(&rq->submit);
> + i915_request_get(rq);
> + i915_request_add_locked(rq);
> + if (*out) {
> + i915_sw_fence_complete(&(*out)->submit);
> i915_request_put(*out);
> - *out = i915_request_get(rq);
> - i915_request_add(rq);
> + }
> + *out = rq;
>
> if (err)
> break;
> @@ -905,7 +915,10 @@ intel_context_migrate_copy(struct intel_context *ce,
> cond_resched();
> } while (1);
>
> -out_ce:
> + mutex_unlock(&ce->timeline->mutex);
> +
> + if (*out)
> + i915_sw_fence_complete(&(*out)->submit);
> return err;
> }
>
> @@ -1005,7 +1018,7 @@ intel_context_migrate_clear(struct intel_context *ce,
> rq = i915_request_create(ce);
> if (IS_ERR(rq)) {
> err = PTR_ERR(rq);
> - goto out_ce;
> + break;
> }
>
> if (deps) {
> @@ -1056,17 +1069,23 @@ intel_context_migrate_clear(struct intel_context *ce,
>
> /* Arbitration is re-enabled between requests. */
> out_rq:
> - if (*out)
> - i915_request_put(*out);
> - *out = i915_request_get(rq);
> + i915_sw_fence_await(&rq->submit);
> + i915_request_get(rq);
> i915_request_add(rq);
> + if (*out) {
> + i915_sw_fence_complete(&(*out)->submit);
> + i915_request_put(*out);
> + }
> + *out = rq;
> +
> if (err || !it.sg || !sg_dma_len(it.sg))
> break;
>
> cond_resched();
> } while (1);
>
> -out_ce:
> + if (*out)
> + i915_sw_fence_complete(&(*out)->submit);
> return err;
> }
>
next prev parent reply other threads:[~2023-04-11 6:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 9:41 [PATCH v4 0/5] Fix error propagation amongst request Andi Shyti
2023-03-08 9:41 ` [PATCH v4 1/5] drm/i915: Throttle for ringspace prior to taking the timeline mutex Andi Shyti
2023-04-11 8:58 ` [Intel-gfx] " Andrzej Hajda
2023-03-08 9:41 ` [PATCH v4 2/5] drm/i915/gt: Add intel_context_timeline_is_locked helper Andi Shyti
2023-04-11 6:30 ` Das, Nirmoy
2023-03-08 9:41 ` [PATCH v4 3/5] drm/i915: Create the locked version of the request create Andi Shyti
2023-04-11 6:30 ` Das, Nirmoy
2023-03-08 9:41 ` [PATCH v4 4/5] drm/i915: Create the locked version of the request add Andi Shyti
2023-03-08 9:41 ` [PATCH v4 5/5] drm/i915/gt: Make sure that errors are propagated through request chains Andi Shyti
2023-03-10 10:03 ` Matthew Auld
2023-04-11 6:39 ` Das, Nirmoy [this message]
2023-04-11 14:35 ` [Intel-gfx] " Rodrigo Vivi
2023-04-12 10:56 ` Andi Shyti
2023-04-12 13:10 ` Rodrigo Vivi
2023-04-13 11:25 ` Tvrtko Ursulin
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=1bee29d0-a5cc-9ff3-d164-f162259558e2@intel.com \
--to=nirmoy.das@intel.com \
--cc=andi.shyti@kernel.org \
--cc=andi.shyti@linux.intel.com \
--cc=chris.p.wilson@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gwan-gyeong.mun@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maciej.patelczyk@intel.com \
--cc=matthew.auld@intel.com \
--cc=stable@vger.kernel.org \
/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