From: Matthew Brost <matthew.brost@intel.com> To: <dri-devel@lists.freedesktop.org>, <intel-gfx@lists.freedesktop.org> Cc: john.c.harrison@intel.com Subject: [PATCH 3/3] drm/i915/guc: Flush G2H handler during a GT reset Date: Wed, 19 Jan 2022 13:24:19 -0800 [thread overview] Message-ID: <20220119212419.23068-4-matthew.brost@intel.com> (raw) In-Reply-To: <20220119212419.23068-1-matthew.brost@intel.com> Now that the error capture is fully decoupled from fence signalling (request retirement to free memory, which in turn depends on resets) we can safely flush the G2H handler during a GT reset. This is eliminates corner cases where GuC generated G2H (e.g. engine resets) race with a GT reset. v2: (John Harrison) - Fix typo in commit message (s/is/in) Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: John Harrison <John.C.Harrison@Intel.com> --- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 514b3060b141..406dd2e3f5a9 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1396,8 +1396,6 @@ static void guc_flush_destroyed_contexts(struct intel_guc *guc); void intel_guc_submission_reset_prepare(struct intel_guc *guc) { - int i; - if (unlikely(!guc_submission_initialized(guc))) { /* Reset called during driver load? GuC not yet initialised! */ return; @@ -1414,21 +1412,7 @@ void intel_guc_submission_reset_prepare(struct intel_guc *guc) guc_flush_submissions(guc); guc_flush_destroyed_contexts(guc); - - /* - * Handle any outstanding G2Hs before reset. Call IRQ handler directly - * each pass as interrupt have been disabled. We always scrub for - * outstanding G2H as it is possible for outstanding_submission_g2h to - * be incremented after the context state update. - */ - for (i = 0; i < 4 && atomic_read(&guc->outstanding_submission_g2h); ++i) { - intel_guc_to_host_event_handler(guc); -#define wait_for_reset(guc, wait_var) \ - intel_guc_wait_for_pending_msg(guc, wait_var, false, (HZ / 20)) - do { - wait_for_reset(guc, &guc->outstanding_submission_g2h); - } while (!list_empty(&guc->ct.requests.incoming)); - } + flush_work(&guc->ct.requests.worker); scrub_guc_desc_for_outstanding_g2h(guc); } -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Brost <matthew.brost@intel.com> To: <dri-devel@lists.freedesktop.org>, <intel-gfx@lists.freedesktop.org> Subject: [Intel-gfx] [PATCH 3/3] drm/i915/guc: Flush G2H handler during a GT reset Date: Wed, 19 Jan 2022 13:24:19 -0800 [thread overview] Message-ID: <20220119212419.23068-4-matthew.brost@intel.com> (raw) In-Reply-To: <20220119212419.23068-1-matthew.brost@intel.com> Now that the error capture is fully decoupled from fence signalling (request retirement to free memory, which in turn depends on resets) we can safely flush the G2H handler during a GT reset. This is eliminates corner cases where GuC generated G2H (e.g. engine resets) race with a GT reset. v2: (John Harrison) - Fix typo in commit message (s/is/in) Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: John Harrison <John.C.Harrison@Intel.com> --- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 514b3060b141..406dd2e3f5a9 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1396,8 +1396,6 @@ static void guc_flush_destroyed_contexts(struct intel_guc *guc); void intel_guc_submission_reset_prepare(struct intel_guc *guc) { - int i; - if (unlikely(!guc_submission_initialized(guc))) { /* Reset called during driver load? GuC not yet initialised! */ return; @@ -1414,21 +1412,7 @@ void intel_guc_submission_reset_prepare(struct intel_guc *guc) guc_flush_submissions(guc); guc_flush_destroyed_contexts(guc); - - /* - * Handle any outstanding G2Hs before reset. Call IRQ handler directly - * each pass as interrupt have been disabled. We always scrub for - * outstanding G2H as it is possible for outstanding_submission_g2h to - * be incremented after the context state update. - */ - for (i = 0; i < 4 && atomic_read(&guc->outstanding_submission_g2h); ++i) { - intel_guc_to_host_event_handler(guc); -#define wait_for_reset(guc, wait_var) \ - intel_guc_wait_for_pending_msg(guc, wait_var, false, (HZ / 20)) - do { - wait_for_reset(guc, &guc->outstanding_submission_g2h); - } while (!list_empty(&guc->ct.requests.incoming)); - } + flush_work(&guc->ct.requests.worker); scrub_guc_desc_for_outstanding_g2h(guc); } -- 2.34.1
next prev parent reply other threads:[~2022-01-19 21:30 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-19 21:24 [PATCH 0/3] Flush G2H handler during a GT reset Matthew Brost 2022-01-19 21:24 ` [Intel-gfx] " Matthew Brost 2022-01-19 21:24 ` [PATCH 1/3] drm/i915: Allocate intel_engine_coredump_alloc with ALLOW_FAIL Matthew Brost 2022-01-19 21:24 ` [Intel-gfx] " Matthew Brost 2022-01-19 21:24 ` [PATCH 2/3] drm/i915/guc: Add work queue to trigger a GT reset Matthew Brost 2022-01-19 21:24 ` [Intel-gfx] " Matthew Brost 2022-01-21 1:34 ` John Harrison 2022-01-21 1:34 ` [Intel-gfx] " John Harrison 2022-01-21 4:04 ` Matthew Brost 2022-01-21 4:04 ` [Intel-gfx] " Matthew Brost 2022-01-19 21:24 ` Matthew Brost [this message] 2022-01-19 21:24 ` [Intel-gfx] [PATCH 3/3] drm/i915/guc: Flush G2H handler during " Matthew Brost 2022-01-21 1:36 ` John Harrison 2022-01-21 1:36 ` [Intel-gfx] " John Harrison 2022-01-21 4:05 ` Matthew Brost 2022-01-21 4:05 ` [Intel-gfx] " Matthew Brost 2022-01-19 23:49 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Flush G2H handler during a GT reset (rev3) Patchwork 2022-01-20 0:20 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-01-20 4:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2022-01-21 4:31 [PATCH 0/3] Flush G2H handler during a GT reset Matthew Brost 2022-01-21 4:31 ` [PATCH 3/3] drm/i915/guc: " Matthew Brost 2022-01-18 21:43 [PATCH 0/3] " Matthew Brost 2022-01-18 21:43 ` [PATCH 3/3] drm/i915/guc: " Matthew Brost 2022-01-19 1:38 ` John Harrison
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=20220119212419.23068-4-matthew.brost@intel.com \ --to=matthew.brost@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=john.c.harrison@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: linkBe 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.