Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH 12/28] drm/xe/vf: Abort H2G sends during VF post-migration recovery
Date: Tue, 16 Sep 2025 20:45:59 -0700	[thread overview]
Message-ID: <20250917034615.3977603-13-matthew.brost@intel.com> (raw)
In-Reply-To: <20250917034615.3977603-1-matthew.brost@intel.com>

While VF post-migration recovery is in progress, abort H2G sends with
-ECANCEL. These messages are treated as lost, and TLB invalidation
errors are suppressed. During this phase, the H2G channel is down, and
VF recovery requires the CT lock to proceed.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_ct.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index 47079ab9922c..661ab1bf4502 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -25,6 +25,7 @@
 #include "xe_gt_printk.h"
 #include "xe_gt_sriov_pf_control.h"
 #include "xe_gt_sriov_pf_monitor.h"
+#include "xe_gt_sriov_vf.h"
 #include "xe_guc.h"
 #include "xe_guc_log.h"
 #include "xe_guc_relay.h"
@@ -851,7 +852,7 @@ static int __guc_ct_send_locked(struct xe_guc_ct *ct, const u32 *action,
 				u32 len, u32 g2h_len, u32 num_g2h,
 				struct g2h_fence *g2h_fence)
 {
-	struct xe_gt *gt __maybe_unused = ct_to_gt(ct);
+	struct xe_gt *gt = ct_to_gt(ct);
 	u16 seqno;
 	int ret;
 
@@ -872,7 +873,8 @@ static int __guc_ct_send_locked(struct xe_guc_ct *ct, const u32 *action,
 		goto out;
 	}
 
-	if (ct->state == XE_GUC_CT_STATE_STOPPED) {
+	if (ct->state == XE_GUC_CT_STATE_STOPPED ||
+	    xe_gt_sriov_vf_recovery_inprogress(gt)) {
 		ret = -ECANCELED;
 		goto out;
 	}
-- 
2.34.1


  parent reply	other threads:[~2025-09-17  3:46 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-17  3:45 [PATCH 00/28] VF migration redesign Matthew Brost
2025-09-17  3:45 ` [PATCH 01/28] drm/xe/vf: Lock querying GGTT config during driver init Matthew Brost
2025-09-17  3:45 ` [PATCH 02/28] Revert "drm/xe/vf: Rebase exec queue parallel commands during migration recovery" Matthew Brost
2025-09-17  3:45 ` [PATCH 03/28] Revert "drm/xe/vf: Post migration, repopulate ring area for pending request" Matthew Brost
2025-09-17  3:45 ` [PATCH 04/28] Revert "drm/xe/vf: Fixup CTB send buffer messages after migration" Matthew Brost
2025-09-17  3:45 ` [PATCH 05/28] drm/xe: Save off position in ring in which a job was programmed Matthew Brost
2025-09-17  3:45 ` [PATCH 06/28] drm/xe/guc: Track pending-enable source in submission state Matthew Brost
2025-09-17  3:45 ` [PATCH 07/28] drm/xe: Track LR jobs in DRM scheduler pending list Matthew Brost
2025-09-17  3:45 ` [PATCH 08/28] drm/xe: Don't change LRC ring head on job resubmission Matthew Brost
2025-09-17  3:45 ` [PATCH 09/28] drm/xe/guc: Document GuC submission backend Matthew Brost
2025-09-17  3:45 ` [PATCH 10/28] drm/xe/vf: Add xe_gt_sriov_vf_recovery_inprogress helper Matthew Brost
2025-09-17  3:45 ` [PATCH 11/28] drm/xe/vf: Make VF recovery run on per-GT worker Matthew Brost
2025-09-17  3:45 ` Matthew Brost [this message]
2025-09-17  3:46 ` [PATCH 13/28] drm/xe/vf: Remove memory allocations from VF post migration recovery Matthew Brost
2025-09-17  3:46 ` [PATCH 14/28] drm/xe/vf: Close multi-GT GGTT shift race Matthew Brost
2025-09-17  3:46 ` [PATCH 15/28] drm/xe/vf: Teardown VF post migration worker on driver unload Matthew Brost
2025-09-17  3:46 ` [PATCH 16/28] drm/xe/vf: Don't allow GT reset to be queued during VF post migration recovery Matthew Brost
2025-09-17  3:46 ` [PATCH 17/28] drm/xe/vf: Wakeup in GuC backend on " Matthew Brost
2025-09-17  3:46 ` [PATCH 18/28] drm/xe/vf: Extra debug on GGTT shift Matthew Brost
2025-09-17  3:46 ` [PATCH 19/28] drm/xe/vf: Use GUC_HXG_TYPE_EVENT for GuC context register Matthew Brost
2025-09-17  3:46 ` [PATCH 20/28] drm/xe/vf: Stop and flush CTs in VF post migration recovery Matthew Brost
2025-09-17  3:46 ` [PATCH 21/28] drm/xe/vf: Reset TLB invalidations during " Matthew Brost
2025-09-17  3:46 ` [PATCH 22/28] drm/xe/vf: Kickstart after resfix in " Matthew Brost
2025-09-17  3:46 ` [PATCH 23/28] drm/xe/vf: Start CTs before resfix " Matthew Brost
2025-09-17  3:46 ` [PATCH 24/28] drm/xe/vf: Abort VF post migration recovery on failure Matthew Brost
2025-09-17  3:46 ` [PATCH 25/28] drm/xe/vf: Replay GuC submission state on pause / unpause Matthew Brost
2025-09-17  3:46 ` [PATCH 26/28] drm/xe: Move queue init before LRC creation Matthew Brost
2025-09-17  3:46 ` [PATCH 27/28] drm/xe/vf: Add debug prints for GuC replaying state during VF recovery Matthew Brost
2025-09-17  3:46 ` [PATCH 28/28] drm/xe/vf: Workaround for race condition in GuC firmware during VF pause Matthew Brost
2025-09-17  3:55 ` ✗ CI.checkpatch: warning for VF migration redesign Patchwork
2025-09-17  3:56 ` ✓ CI.KUnit: success " Patchwork
2025-09-17  4:39 ` ✗ Xe.CI.BAT: failure " Patchwork
2025-09-17  6:38 ` ✗ Xe.CI.Full: " 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=20250917034615.3977603-13-matthew.brost@intel.com \
    --to=matthew.brost@intel.com \
    --cc=intel-xe@lists.freedesktop.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