From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: janusz.krzysztofik@intel.com, andi.shyti@intel.com,
matthew.d.roper@intel.com, jonathan.cavitt@intel.com,
saurabhg.gupta@intel.com, chris.p.wilson@linux.intel.com,
nirmoy.das@intel.com
Subject: [Intel-gfx] [PATCH v11 5/7] drm/i915: No TLB invalidation on wedged GT
Date: Tue, 10 Oct 2023 17:02:46 -0700 [thread overview]
Message-ID: <20231011000248.2181018-6-jonathan.cavitt@intel.com> (raw)
In-Reply-To: <20231011000248.2181018-1-jonathan.cavitt@intel.com>
It is not an error for GuC TLB invalidations to fail when the GT is
wedged or disabled, so do not process a wait failure as one in
guc_send_invalidate_tlb.
Signed-off-by: Fei Yang <fei.yang@intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
CC: John Harrison <john.c.harrison@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
---
.../gpu/drm/i915/gt/uc/intel_guc_submission.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
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 9d5f8cccaa592..1914cba5f48dd 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -32,6 +32,7 @@
#include "i915_drv.h"
#include "i915_reg.h"
+#include "i915_irq.h"
#include "i915_trace.h"
/**
@@ -1941,6 +1942,12 @@ void intel_guc_submission_cancel_requests(struct intel_guc *guc)
/* GuC is blown away, drop all references to contexts */
xa_destroy(&guc->context_lookup);
+
+ /*
+ * Wedged GT won't respond to any TLB invalidation request. Simply
+ * release all the blocked waiters.
+ */
+ wake_up_all_tlb_invalidate(guc);
}
void intel_guc_submission_reset_finish(struct intel_guc *guc)
@@ -4740,6 +4747,14 @@ static long must_wait_woken(struct wait_queue_entry *wq_entry, long timeout)
return timeout;
}
+static bool intel_gt_is_enabled(const struct intel_gt *gt)
+{
+ /* Check if GT is wedged or suspended */
+ if (intel_gt_is_wedged(gt) || !intel_irqs_enabled(gt->i915))
+ return false;
+ return true;
+}
+
static int guc_send_invalidate_tlb(struct intel_guc *guc,
enum intel_guc_tlb_invalidation_type type)
{
@@ -4789,7 +4804,8 @@ static int guc_send_invalidate_tlb(struct intel_guc *guc,
if (err)
goto out;
- if (!must_wait_woken(&wait, intel_guc_ct_max_queue_time_jiffies())) {
+ if (intel_gt_is_enabled(guc_to_gt(guc)) &&
+ !must_wait_woken(&wait, intel_guc_ct_max_queue_time_jiffies())) {
guc_err(guc,
"TLB invalidation response timed out for seqno %u\n", seqno);
err = -ETIME;
--
2.25.1
next prev parent reply other threads:[~2023-10-11 0:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 0:02 [Intel-gfx] [PATCH v11 0/7] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt
2023-10-11 0:02 ` [Intel-gfx] [PATCH v11 1/7] drm/i915: Add GuC TLB Invalidation device info flags Jonathan Cavitt
2023-10-11 9:00 ` Nirmoy Das
2023-10-11 0:02 ` [Intel-gfx] [PATCH v11 2/7] drm/i915/guc: Add CT size delay helper Jonathan Cavitt
2023-10-11 9:00 ` Nirmoy Das
2023-10-11 17:44 ` John Harrison
2023-10-11 0:02 ` [Intel-gfx] [PATCH v11 3/7] drm/i915: Define and use GuC and CTB TLB invalidation routines Jonathan Cavitt
2023-10-11 9:01 ` Nirmoy Das
2023-10-11 17:52 ` John Harrison
2023-10-11 0:02 ` [Intel-gfx] [PATCH v11 4/7] drm/i915: No TLB invalidation on suspended GT Jonathan Cavitt
2023-10-11 11:09 ` Nirmoy Das
2023-10-11 0:02 ` Jonathan Cavitt [this message]
2023-10-11 9:03 ` [Intel-gfx] [PATCH v11 5/7] drm/i915: No TLB invalidation on wedged GT Nirmoy Das
2023-10-11 0:02 ` [Intel-gfx] [PATCH v11 6/7] drm/i915/gt: Increase sleep in gt_tlb selftest sanitycheck Jonathan Cavitt
2023-10-11 9:04 ` Nirmoy Das
2023-10-11 0:02 ` [Intel-gfx] [PATCH v11 7/7] drm/i915: Enable GuC TLB invalidations for MTL Jonathan Cavitt
2023-10-11 9:05 ` Nirmoy Das
2023-10-11 4:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Define and use GuC and CTB TLB invalidation routines Patchwork
2023-10-11 4:17 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-10-11 4:30 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-10-11 8:24 ` [Intel-gfx] [PATCH v11 0/7] " Tvrtko Ursulin
2023-10-11 18:55 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " 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=20231011000248.2181018-6-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=andi.shyti@intel.com \
--cc=chris.p.wilson@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=janusz.krzysztofik@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=nirmoy.das@intel.com \
--cc=saurabhg.gupta@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 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.