From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH v7 31/32] drm/xe/vf: Rebase CCS save/restore BB GGTT addresses
Date: Tue, 7 Oct 2025 04:26:40 -0700 [thread overview]
Message-ID: <20251007112641.2669655-32-matthew.brost@intel.com> (raw)
In-Reply-To: <20251007112641.2669655-1-matthew.brost@intel.com>
Rebase the CCS save/restore BB's GGTT addresses during VF post-migration
recovery by setting the software ring tail to zero, the LRC ring head to
zero, and rewriting the jump-to-BB instructions.
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>
---
drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 4 ++++
drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 28 ++++++++++++++++++++++++++++
drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 1 +
3 files changed, 33 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
index f9eb65e417ab..f5deace987e2 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
@@ -34,6 +34,7 @@
#include "xe_pm.h"
#include "xe_sriov.h"
#include "xe_sriov_vf.h"
+#include "xe_sriov_vf_ccs.h"
#include "xe_tile_sriov_vf.h"
#include "xe_tlb_inval.h"
#include "xe_uc_fw.h"
@@ -1143,6 +1144,9 @@ static int vf_post_migration_fixups(struct xe_gt *gt)
if (err)
return err;
+ if (xe_gt_is_main_type(gt))
+ xe_sriov_vf_ccs_rebase(gt_to_xe(gt));
+
xe_gt_sriov_vf_default_lrcs_hwsp_rebase(gt);
err = xe_guc_contexts_hwsp_rebase(>->uc.guc, buf);
if (err)
diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
index 8dec616c37c9..790249801364 100644
--- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
+++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.c
@@ -175,6 +175,15 @@ static void ccs_rw_update_ring(struct xe_sriov_vf_ccs_ctx *ctx)
struct xe_lrc *lrc = xe_exec_queue_lrc(ctx->mig_q);
u32 dw[10], i = 0;
+ /*
+ * XXX: Save/restore fixes — for some reason, the GuC only accepts the
+ * save/restore context if the LRC head pointer is zero. This is evident
+ * from repeated VF migrations failing when the LRC head pointer is
+ * non-zero.
+ */
+ lrc->ring.tail = 0;
+ xe_lrc_set_ring_head(lrc, 0);
+
dw[i++] = MI_ARB_ON_OFF | MI_ARB_ENABLE;
dw[i++] = MI_BATCH_BUFFER_START | XE_INSTR_NUM_DW(3);
dw[i++] = lower_32_bits(addr);
@@ -186,6 +195,25 @@ static void ccs_rw_update_ring(struct xe_sriov_vf_ccs_ctx *ctx)
xe_lrc_set_ring_tail(lrc, lrc->ring.tail);
}
+/**
+ * xe_sriov_vf_ccs_rebase - Rebase GGTT addresses for CCS save / restore
+ * @xe: the &xe_device.
+ */
+void xe_sriov_vf_ccs_rebase(struct xe_device *xe)
+{
+ enum xe_sriov_vf_ccs_rw_ctxs ctx_id;
+
+ if (!IS_VF_CCS_READY(xe))
+ return;
+
+ for_each_ccs_rw_ctx(ctx_id) {
+ struct xe_sriov_vf_ccs_ctx *ctx =
+ &xe->sriov.vf.ccs.contexts[ctx_id];
+
+ ccs_rw_update_ring(ctx);
+ }
+}
+
static int register_save_restore_context(struct xe_sriov_vf_ccs_ctx *ctx)
{
int ctx_type;
diff --git a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h
index 0745c0ff0228..f8ca6efce9ee 100644
--- a/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h
+++ b/drivers/gpu/drm/xe/xe_sriov_vf_ccs.h
@@ -18,6 +18,7 @@ int xe_sriov_vf_ccs_init(struct xe_device *xe);
int xe_sriov_vf_ccs_attach_bo(struct xe_bo *bo);
int xe_sriov_vf_ccs_detach_bo(struct xe_bo *bo);
int xe_sriov_vf_ccs_register_context(struct xe_device *xe);
+void xe_sriov_vf_ccs_rebase(struct xe_device *xe);
void xe_sriov_vf_ccs_print(struct xe_device *xe, struct drm_printer *p);
static inline bool xe_sriov_vf_ccs_ready(struct xe_device *xe)
--
2.34.1
next prev parent reply other threads:[~2025-10-07 11:27 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-07 11:26 [PATCH v7 00/32] VF migration redesign Matthew Brost
2025-10-07 11:26 ` [PATCH v7 01/32] drm/xe: Add NULL checks to scratch LRC allocation Matthew Brost
2025-10-07 11:26 ` [PATCH v7 02/32] drm/xe: Save off position in ring in which a job was programmed Matthew Brost
2025-10-07 11:26 ` [PATCH v7 03/32] drm/xe/guc: Track pending-enable source in submission state Matthew Brost
2025-10-07 11:26 ` [PATCH v7 04/32] drm/xe: Track LR jobs in DRM scheduler pending list Matthew Brost
2025-10-07 11:26 ` [PATCH v7 05/32] drm/xe: Don't change LRC ring head on job resubmission Matthew Brost
2025-10-07 12:29 ` Matthew Auld
2025-10-07 13:00 ` Matthew Brost
2025-10-07 11:26 ` [PATCH v7 06/32] drm/xe: Make LRC W/A scratch buffer usage consistent Matthew Brost
2025-10-07 11:26 ` [PATCH v7 07/32] drm/xe/vf: Add xe_gt_recovery_pending helper Matthew Brost
2025-10-07 11:26 ` [PATCH v7 08/32] drm/xe/vf: Make VF recovery run on per-GT worker Matthew Brost
2025-10-07 11:26 ` [PATCH v7 09/32] drm/xe/vf: Abort H2G sends during VF post-migration recovery Matthew Brost
2025-10-07 11:26 ` [PATCH v7 10/32] drm/xe/vf: Remove memory allocations from VF post migration recovery Matthew Brost
2025-10-07 11:26 ` [PATCH v7 11/32] drm/xe: Move GGTT lock init to alloc Matthew Brost
2025-10-07 11:47 ` Michal Wajdeczko
2025-10-07 12:53 ` Matthew Brost
2025-10-07 11:26 ` [PATCH v7 12/32] drm/xe/vf: Close multi-GT GGTT shift race Matthew Brost
2025-10-07 13:03 ` Michal Wajdeczko
2025-10-07 11:26 ` [PATCH v7 13/32] drm/xe/vf: Teardown VF post migration worker on driver unload Matthew Brost
2025-10-07 11:26 ` [PATCH v7 14/32] drm/xe/vf: Don't allow GT reset to be queued during VF post migration recovery Matthew Brost
2025-10-07 11:26 ` [PATCH v7 15/32] drm/xe/vf: Wakeup in GuC backend on " Matthew Brost
2025-10-07 11:26 ` [PATCH v7 16/32] drm/xe/vf: Avoid indefinite blocking in preempt rebind worker for VFs supporting migration Matthew Brost
2025-10-07 11:26 ` [PATCH v7 17/32] drm/xe/vf: Use GUC_HXG_TYPE_EVENT for GuC context register Matthew Brost
2025-10-07 11:26 ` [PATCH v7 18/32] drm/xe/vf: Flush and stop CTs in VF post migration recovery Matthew Brost
2025-10-07 11:26 ` [PATCH v7 19/32] drm/xe/vf: Reset TLB invalidations during " Matthew Brost
2025-10-07 11:26 ` [PATCH v7 20/32] drm/xe/vf: Kickstart after resfix in " Matthew Brost
2025-10-07 11:26 ` [PATCH v7 21/32] drm/xe: Add CTB_H2G_BUFFER_OFFSET define Matthew Brost
2025-10-07 11:26 ` [PATCH v7 22/32] drm/xe/vf: Start CTs before resfix VF post migration recovery Matthew Brost
2025-10-07 11:26 ` [PATCH v7 23/32] drm/xe/vf: Abort VF post migration recovery on failure Matthew Brost
2025-10-07 11:26 ` [PATCH v7 24/32] drm/xe/vf: Replay GuC submission state on pause / unpause Matthew Brost
2025-10-07 11:26 ` [PATCH v7 25/32] drm/xe: Move queue init before LRC creation Matthew Brost
2025-10-07 11:26 ` [PATCH v7 26/32] drm/xe/vf: Add debug prints for GuC replaying state during VF recovery Matthew Brost
2025-10-07 11:26 ` [PATCH v7 27/32] drm/xe/vf: Workaround for race condition in GuC firmware during VF pause Matthew Brost
2025-10-07 11:26 ` [PATCH v7 28/32] drm/xe: Use PPGTT addresses for TLB invalidation to avoid GGTT fixups Matthew Brost
2025-10-07 11:26 ` [PATCH v7 29/32] drm/xe/vf: Use primary GT ordered work queue on media GT on PTL VF Matthew Brost
2025-10-07 11:26 ` [PATCH v7 30/32] drm/xe/vf: Ensure media GT VF recovery runs after primary GT on PTL Matthew Brost
2025-10-07 11:26 ` Matthew Brost [this message]
2025-10-07 11:26 ` [PATCH v7 32/32] drm/xe/guc: Increase wait timeout to 2sec after BUSY reply from GuC Matthew Brost
2025-10-07 11:38 ` ✗ CI.checkpatch: warning for VF migration redesign (rev7) Patchwork
2025-10-07 11:39 ` ✓ CI.KUnit: success " Patchwork
2025-10-07 12:26 ` ✗ Xe.CI.BAT: failure " Patchwork
2025-10-07 14:23 ` ✗ 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=20251007112641.2669655-32-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