From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH v5 10/30] drm/xe/vf: Remove memory allocations from VF post migration recovery
Date: Mon, 6 Oct 2025 03:44:25 -0700 [thread overview]
Message-ID: <20251006104445.2210624-11-matthew.brost@intel.com> (raw)
In-Reply-To: <20251006104445.2210624-1-matthew.brost@intel.com>
VF post migration recovery is the path of dma-fence signaling / reclaim,
avoid memory allocations in this path.
v3:
- s/lrc_wa_bb/scratch (Tomasz)
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Tomasz Lis <tomasz.lis@intel.com>
---
drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 23 +++++++++++++----------
drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 ++
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
index b3cee182087c..55a1ebbbf47f 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c
@@ -1160,17 +1160,13 @@ static size_t post_migration_scratch_size(struct xe_device *xe)
static int vf_post_migration_fixups(struct xe_gt *gt)
{
+ void *buf = gt->sriov.vf.migration.scratch;
s64 shift;
- void *buf;
int err;
- buf = kmalloc(post_migration_scratch_size(gt_to_xe(gt)), GFP_ATOMIC);
- if (!buf)
- return -ENOMEM;
-
err = xe_gt_sriov_vf_query_config(gt);
if (err)
- goto out;
+ return err;
shift = xe_gt_sriov_vf_ggtt_shift(gt);
if (shift) {
@@ -1178,12 +1174,10 @@ static int vf_post_migration_fixups(struct xe_gt *gt)
xe_gt_sriov_vf_default_lrcs_hwsp_rebase(gt);
err = xe_guc_contexts_hwsp_rebase(>->uc.guc, buf);
if (err)
- goto out;
+ return err;
}
-out:
- kfree(buf);
- return err;
+ return 0;
}
static void vf_post_migration_kickstart(struct xe_gt *gt)
@@ -1268,9 +1262,18 @@ static void migration_worker_func(struct work_struct *w)
*/
int xe_gt_sriov_vf_init_early(struct xe_gt *gt)
{
+ void *buf;
+
if (!xe_sriov_vf_migration_supported(gt_to_xe(gt)))
return 0;
+ buf = drmm_kmalloc(>_to_xe(gt)->drm,
+ post_migration_scratch_size(gt_to_xe(gt)),
+ GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ gt->sriov.vf.migration.scratch = buf;
spin_lock_init(>->sriov.vf.migration.lock);
INIT_WORK(>->sriov.vf.migration.worker, migration_worker_func);
diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h
index b2c8e8c89c30..e753646debc4 100644
--- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h
@@ -55,6 +55,8 @@ struct xe_gt_sriov_vf_migration {
struct work_struct worker;
/** @lock: Protects recovery_queued */
spinlock_t lock;
+ /** @scratch: Scratch memory for VF recovery */
+ void *scratch;
/** @recovery_queued: VF post migration recovery in queued */
bool recovery_queued;
/** @recovery_inprogress: VF post migration recovery in progress */
--
2.34.1
next prev parent reply other threads:[~2025-10-06 10:45 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-06 10:44 [PATCH v5 00/30] VF migration redesign Matthew Brost
2025-10-06 10:44 ` [PATCH v5 01/30] drm/xe: Add NULL checks to scratch LRC allocation Matthew Brost
2025-10-06 14:17 ` Lis, Tomasz
2025-10-06 10:44 ` [PATCH v5 02/30] drm/xe: Save off position in ring in which a job was programmed Matthew Brost
2025-10-06 10:44 ` [PATCH v5 03/30] drm/xe/guc: Track pending-enable source in submission state Matthew Brost
2025-10-06 10:44 ` [PATCH v5 04/30] drm/xe: Track LR jobs in DRM scheduler pending list Matthew Brost
2025-10-06 10:44 ` [PATCH v5 05/30] drm/xe: Don't change LRC ring head on job resubmission Matthew Brost
2025-10-06 10:44 ` [PATCH v5 06/30] drm/xe: Make LRC W/A scratch buffer usage consistent Matthew Brost
2025-10-06 10:44 ` [PATCH v5 07/30] drm/xe/vf: Add xe_gt_recovery_pending helper Matthew Brost
2025-10-06 14:24 ` Lis, Tomasz
2025-10-06 10:44 ` [PATCH v5 08/30] drm/xe/vf: Make VF recovery run on per-GT worker Matthew Brost
2025-10-06 10:44 ` [PATCH v5 09/30] drm/xe/vf: Abort H2G sends during VF post-migration recovery Matthew Brost
2025-10-06 10:44 ` Matthew Brost [this message]
2025-10-06 10:44 ` [PATCH v5 11/30] drm/xe/vf: Close multi-GT GGTT shift race Matthew Brost
2025-10-06 10:44 ` [PATCH v5 12/30] drm/xe/vf: Teardown VF post migration worker on driver unload Matthew Brost
2025-10-06 10:44 ` [PATCH v5 13/30] drm/xe/vf: Don't allow GT reset to be queued during VF post migration recovery Matthew Brost
2025-10-06 10:44 ` [PATCH v5 14/30] drm/xe/vf: Wakeup in GuC backend on " Matthew Brost
2025-10-06 10:44 ` [PATCH v5 15/30] drm/xe/vf: Avoid indefinite blocking in preempt rebind worker for VFs supporting migration Matthew Brost
2025-10-06 10:44 ` [PATCH v5 16/30] drm/xe/vf: Use GUC_HXG_TYPE_EVENT for GuC context register Matthew Brost
2025-10-06 10:44 ` [PATCH v5 17/30] drm/xe/vf: Flush and stop CTs in VF post migration recovery Matthew Brost
2025-10-06 10:44 ` [PATCH v5 18/30] drm/xe/vf: Reset TLB invalidations during " Matthew Brost
2025-10-06 10:44 ` [PATCH v5 19/30] drm/xe/vf: Kickstart after resfix in " Matthew Brost
2025-10-06 10:44 ` [PATCH v5 20/30] drm/xe/vf: Start CTs before resfix " Matthew Brost
2025-10-06 10:44 ` [PATCH v5 21/30] drm/xe/vf: Abort VF post migration recovery on failure Matthew Brost
2025-10-06 10:44 ` [PATCH v5 22/30] drm/xe/vf: Replay GuC submission state on pause / unpause Matthew Brost
2025-10-06 10:44 ` [PATCH v5 23/30] drm/xe: Move queue init before LRC creation Matthew Brost
2025-10-06 10:44 ` [PATCH v5 24/30] drm/xe/vf: Add debug prints for GuC replaying state during VF recovery Matthew Brost
2025-10-06 10:44 ` [PATCH v5 25/30] drm/xe/vf: Workaround for race condition in GuC firmware during VF pause Matthew Brost
2025-10-06 10:44 ` [PATCH v5 26/30] drm/xe: Use PPGTT addresses for TLB invalidation to avoid GGTT fixups Matthew Brost
2025-10-06 10:44 ` [PATCH v5 27/30] drm/xe/vf: Use primary GT ordered work queue on media GT on PTL VF Matthew Brost
2025-10-06 10:44 ` [PATCH v5 28/30] drm/xe/vf: Ensure media GT VF recovery runs after primary GT on PTL Matthew Brost
2025-10-06 10:44 ` [PATCH v5 29/30] drm/xe/vf: Rebase CCS save/restore BB GGTT addresses Matthew Brost
2025-10-06 10:44 ` [PATCH v5 30/30] drm/xe/guc: Increase wait timeout to 2sec after BUSY reply from GuC Matthew Brost
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=20251006104445.2210624-11-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