Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Tomasz Lis <tomasz.lis@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Michał Winiarski" <michal.winiarski@intel.com>,
	"Michał Wajdeczko" <michal.wajdeczko@intel.com>,
	"Piotr Piórkowski" <piotr.piorkowski@intel.com>,
	"Matthew Brost" <matthew.brost@intel.com>,
	"Lucas De Marchi" <lucas.demarchi@intel.com>
Subject: [PATCH v1 5/7] drm/xe/vf: Rebase HWSP of all contexts after migration
Date: Wed, 14 May 2025 00:49:50 +0200	[thread overview]
Message-ID: <20250513224952.701343-6-tomasz.lis@intel.com> (raw)
In-Reply-To: <20250513224952.701343-1-tomasz.lis@intel.com>

All contexts require an update due to GGTT range shift, as that
affects their HWSP.

The HW status page of a context contains GGTT references, which
need to be shifted to a new range (or re-computed using the
previously updated vma nodes). The references include ring start
address and indirect state address.

Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
---
 drivers/gpu/drm/xe/xe_lrc.c      | 18 ++++++++++++++++
 drivers/gpu/drm/xe/xe_lrc.h      |  1 +
 drivers/gpu/drm/xe/xe_sriov_vf.c | 35 ++++++++++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 61a2e87990a9..43e1c18e1769 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1184,6 +1184,24 @@ void xe_lrc_destroy(struct kref *ref)
 	kfree(lrc);
 }
 
+/**
+ * xe_lrc_update_hwctx_regs_with_address - Re-compute GGTT references within given LRC.
+ * @lrc: the &xe_lrc struct instance
+ */
+void xe_lrc_update_hwctx_regs_with_address(struct xe_lrc *lrc)
+{
+	struct xe_gt *gt = lrc->fence_ctx.gt;
+
+	if (xe_gt_has_indirect_ring_state(gt)) {
+		xe_lrc_write_ctx_reg(lrc, CTX_INDIRECT_RING_STATE,
+				     __xe_lrc_indirect_ring_ggtt_addr(lrc));
+
+		xe_lrc_write_indirect_ctx_reg(lrc, INDIRECT_CTX_RING_START,
+					      __xe_lrc_ring_ggtt_addr(lrc));
+	} else
+		xe_lrc_write_ctx_reg(lrc, CTX_RING_START, __xe_lrc_ring_ggtt_addr(lrc));
+}
+
 void xe_lrc_set_ring_tail(struct xe_lrc *lrc, u32 tail)
 {
 	if (xe_lrc_has_indirect_ring_state(lrc))
diff --git a/drivers/gpu/drm/xe/xe_lrc.h b/drivers/gpu/drm/xe/xe_lrc.h
index eb6e8de8c939..e7a99cfd0abe 100644
--- a/drivers/gpu/drm/xe/xe_lrc.h
+++ b/drivers/gpu/drm/xe/xe_lrc.h
@@ -88,6 +88,7 @@ bool xe_lrc_ring_is_idle(struct xe_lrc *lrc);
 u32 xe_lrc_indirect_ring_ggtt_addr(struct xe_lrc *lrc);
 u32 xe_lrc_ggtt_addr(struct xe_lrc *lrc);
 u32 *xe_lrc_regs(struct xe_lrc *lrc);
+void xe_lrc_update_hwctx_regs_with_address(struct xe_lrc *lrc);
 
 u32 xe_lrc_read_ctx_reg(struct xe_lrc *lrc, int reg_nr);
 void xe_lrc_write_ctx_reg(struct xe_lrc *lrc, int reg_nr, u32 val);
diff --git a/drivers/gpu/drm/xe/xe_sriov_vf.c b/drivers/gpu/drm/xe/xe_sriov_vf.c
index ab91ac68ef5f..016faa29cddd 100644
--- a/drivers/gpu/drm/xe/xe_sriov_vf.c
+++ b/drivers/gpu/drm/xe/xe_sriov_vf.c
@@ -7,12 +7,14 @@
 
 #include "xe_assert.h"
 #include "xe_device.h"
+#include "xe_exec_queue_types.h"
 #include "xe_gt.h"
 #include "xe_gt_sriov_printk.h"
 #include "xe_gt_sriov_vf.h"
 #include "xe_guc_ct.h"
 #include "xe_guc_submit.h"
 #include "xe_irq.h"
+#include "xe_lrc.h"
 #include "xe_pm.h"
 #include "xe_sriov.h"
 #include "xe_sriov_printk.h"
@@ -223,6 +225,34 @@ static int vf_post_migration_requery_guc(struct xe_device *xe)
 	return ret;
 }
 
+static void xe_exec_queue_contexts_hwsp_rebase(struct xe_exec_queue *eq)
+{
+	int i;
+
+	for (i = 0; i < eq->width; ++i)
+		xe_lrc_update_hwctx_regs_with_address(eq->lrc[i]);
+}
+
+static void xe_guc_contexts_hwsp_rebase(struct xe_guc *guc)
+{
+	struct xe_exec_queue *eq;
+	unsigned long index;
+
+	mutex_lock(&guc->submission_state.lock);
+	xa_for_each(&guc->submission_state.exec_queue_lookup, index, eq)
+		xe_exec_queue_contexts_hwsp_rebase(eq);
+	mutex_unlock(&guc->submission_state.lock);
+}
+
+static void vf_post_migration_fixup_contexts(struct xe_device *xe)
+{
+	struct xe_gt *gt;
+	unsigned int id;
+
+	for_each_gt(gt, xe, id)
+		xe_guc_contexts_hwsp_rebase(&gt->uc.guc);
+}
+
 static void vf_post_migration_fixup_ctb(struct xe_device *xe)
 {
 	struct xe_gt *gt;
@@ -303,9 +333,10 @@ static void vf_post_migration_recovery(struct xe_device *xe)
 		goto fail;
 
 	need_fixups = vf_post_migration_fixup_ggtt_nodes(xe);
-	/* FIXME: add the recovery steps */
-	if (need_fixups)
+	if (need_fixups) {
+		vf_post_migration_fixup_contexts(xe);
 		vf_post_migration_fixup_ctb(xe);
+	}
 
 	vf_post_migration_kickstart(xe);
 	vf_post_migration_notify_resfix_done(xe);
-- 
2.25.1


  parent reply	other threads:[~2025-05-13 22:50 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-13 22:49 [PATCH v1 0/7] drm/xe/vf: Post-migration recovery of queues and jobs Tomasz Lis
2025-05-13 22:49 ` [PATCH v1 1/7] drm/xe/sa: Avoid caching GGTT address within the manager Tomasz Lis
2025-05-14 16:36   ` Michal Wajdeczko
2025-05-14 18:23   ` Matthew Brost
2025-05-13 22:49 ` [PATCH v1 2/7] drm/xe/vf: Finish RESFIX by reset if CTB not enabled Tomasz Lis
2025-05-14 17:23   ` Michal Wajdeczko
2025-05-14 23:27     ` Lis, Tomasz
2025-05-13 22:49 ` [PATCH v1 3/7] drm/xe/vf: Pause submissions during RESFIX fixups Tomasz Lis
2025-05-14 18:06   ` Michal Wajdeczko
2025-05-15 12:56     ` Lis, Tomasz
2025-05-13 22:49 ` [PATCH v1 4/7] drm/xe: Block reset while recovering from VF migration Tomasz Lis
2025-05-13 22:49 ` Tomasz Lis [this message]
2025-05-14 18:37   ` [PATCH v1 5/7] drm/xe/vf: Rebase HWSP of all contexts after migration Michal Wajdeczko
2025-05-15 22:07     ` Lis, Tomasz
2025-05-13 22:49 ` [PATCH v1 6/7] drm/xe/vf: Rebase MEMIRQ structures for " Tomasz Lis
2025-05-14 20:03   ` Michal Wajdeczko
2025-05-15 22:07     ` Lis, Tomasz
2025-05-13 22:49 ` [PATCH v1 7/7] drm/xe/vf: Post migration, repopulate ring area for pending request Tomasz Lis
2025-05-14 18:49   ` Michal Wajdeczko
2025-05-15 22:08     ` Lis, Tomasz
2025-05-14 20:04 ` ✓ CI.Patch_applied: success for drm/xe/vf: Post-migration recovery of queues and jobs Patchwork
2025-05-14 20:04 ` ✗ CI.checkpatch: warning " Patchwork
2025-05-14 20:06 ` ✓ CI.KUnit: success " Patchwork
2025-05-14 20:16 ` ✓ CI.Build: " Patchwork
2025-05-14 20:19 ` ✓ CI.Hooks: " Patchwork
2025-05-14 20:20 ` ✓ CI.checksparse: " Patchwork
2025-05-14 21:11 ` ✓ Xe.CI.BAT: " Patchwork
2025-05-15  4:52 ` ✗ Xe.CI.Full: failure " 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=20250513224952.701343-6-tomasz.lis@intel.com \
    --to=tomasz.lis@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=lucas.demarchi@intel.com \
    --cc=matthew.brost@intel.com \
    --cc=michal.wajdeczko@intel.com \
    --cc=michal.winiarski@intel.com \
    --cc=piotr.piorkowski@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox