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 v8 01/33] drm/xe: Add NULL checks to scratch LRC allocation
Date: Tue,  7 Oct 2025 06:04:33 -0700	[thread overview]
Message-ID: <20251007130505.2694829-2-matthew.brost@intel.com> (raw)
In-Reply-To: <20251007130505.2694829-1-matthew.brost@intel.com>

kmalloc can fail, the returned value must have a NULL check. This should
be immediately after kmalloc for clarity.

v5:
 - Assert state->buffer in setup_bo if buffer is iomem (Tomasz)

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Tomasz Lis <tomasz.lis@intel.com>
---
 drivers/gpu/drm/xe/xe_lrc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index af09f70f6e78..2c6eae2de1f2 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1214,8 +1214,7 @@ static int setup_bo(struct bo_setup_state *state)
 	ssize_t remain;
 
 	if (state->lrc->bo->vmap.is_iomem) {
-		if (!state->buffer)
-			return -ENOMEM;
+		xe_gt_assert(state->hwe->gt, state->buffer);
 		state->ptr = state->buffer;
 	} else {
 		state->ptr = state->lrc->bo->vmap.vaddr + state->offset;
@@ -1303,8 +1302,11 @@ static int setup_wa_bb(struct xe_lrc *lrc, struct xe_hw_engine *hwe)
 	u32 *buf = NULL;
 	int ret;
 
-	if (lrc->bo->vmap.is_iomem)
+	if (lrc->bo->vmap.is_iomem) {
 		buf = kmalloc(LRC_WA_BB_SIZE, GFP_KERNEL);
+		if (!buf)
+			return -ENOMEM;
+	}
 
 	ret = xe_lrc_setup_wa_bb_with_scratch(lrc, hwe, buf);
 
@@ -1347,8 +1349,11 @@ setup_indirect_ctx(struct xe_lrc *lrc, struct xe_hw_engine *hwe)
 	if (xe_gt_WARN_ON(lrc->gt, !state.funcs))
 		return 0;
 
-	if (lrc->bo->vmap.is_iomem)
+	if (lrc->bo->vmap.is_iomem) {
 		state.buffer = kmalloc(state.max_size, GFP_KERNEL);
+		if (!state.buffer)
+			return -ENOMEM;
+	}
 
 	ret = setup_bo(&state);
 	if (ret) {
-- 
2.34.1


  reply	other threads:[~2025-10-07 13:05 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-07 13:04 [PATCH v8 00/33] VF migration redesign Matthew Brost
2025-10-07 13:04 ` Matthew Brost [this message]
2025-10-07 13:04 ` [PATCH v8 02/33] drm/xe: Save off position in ring in which a job was programmed Matthew Brost
2025-10-07 13:04 ` [PATCH v8 03/33] drm/xe/guc: Track pending-enable source in submission state Matthew Brost
2025-10-07 13:04 ` [PATCH v8 04/33] drm/xe: Track LR jobs in DRM scheduler pending list Matthew Brost
2025-10-07 13:04 ` [PATCH v8 05/33] drm/xe: Return first unsignaled job first pending job helper Matthew Brost
2025-10-08  8:27   ` Matthew Auld
2025-10-07 13:04 ` [PATCH v8 06/33] drm/xe: Don't change LRC ring head on job resubmission Matthew Brost
2025-10-07 13:04 ` [PATCH v8 07/33] drm/xe: Make LRC W/A scratch buffer usage consistent Matthew Brost
2025-10-07 13:04 ` [PATCH v8 08/33] drm/xe/vf: Add xe_gt_recovery_pending helper Matthew Brost
2025-10-07 13:04 ` [PATCH v8 09/33] drm/xe/vf: Make VF recovery run on per-GT worker Matthew Brost
2025-10-07 13:04 ` [PATCH v8 10/33] drm/xe/vf: Abort H2G sends during VF post-migration recovery Matthew Brost
2025-10-07 13:04 ` [PATCH v8 11/33] drm/xe/vf: Remove memory allocations from VF post migration recovery Matthew Brost
2025-10-07 13:04 ` [PATCH v8 12/33] drm/xe: Move GGTT lock init to alloc Matthew Brost
2025-10-07 13:37   ` Michal Wajdeczko
2025-10-07 13:04 ` [PATCH v8 13/33] drm/xe/vf: Close multi-GT GGTT shift race Matthew Brost
2025-10-07 13:04 ` [PATCH v8 14/33] drm/xe/vf: Teardown VF post migration worker on driver unload Matthew Brost
2025-10-07 13:04 ` [PATCH v8 15/33] drm/xe/vf: Don't allow GT reset to be queued during VF post migration recovery Matthew Brost
2025-10-07 13:04 ` [PATCH v8 16/33] drm/xe/vf: Wakeup in GuC backend on " Matthew Brost
2025-10-07 13:04 ` [PATCH v8 17/33] drm/xe/vf: Avoid indefinite blocking in preempt rebind worker for VFs supporting migration Matthew Brost
2025-10-07 13:04 ` [PATCH v8 18/33] drm/xe/vf: Use GUC_HXG_TYPE_EVENT for GuC context register Matthew Brost
2025-10-07 13:04 ` [PATCH v8 19/33] drm/xe/vf: Flush and stop CTs in VF post migration recovery Matthew Brost
2025-10-07 13:04 ` [PATCH v8 20/33] drm/xe/vf: Reset TLB invalidations during " Matthew Brost
2025-10-07 13:04 ` [PATCH v8 21/33] drm/xe/vf: Kickstart after resfix in " Matthew Brost
2025-10-07 13:04 ` [PATCH v8 22/33] drm/xe: Add CTB_H2G_BUFFER_OFFSET define Matthew Brost
2025-10-07 13:34   ` Michal Wajdeczko
2025-10-07 13:04 ` [PATCH v8 23/33] drm/xe/vf: Start CTs before resfix VF post migration recovery Matthew Brost
2025-10-07 14:24   ` Michal Wajdeczko
2025-10-07 13:04 ` [PATCH v8 24/33] drm/xe/vf: Abort VF post migration recovery on failure Matthew Brost
2025-10-07 13:04 ` [PATCH v8 25/33] drm/xe/vf: Replay GuC submission state on pause / unpause Matthew Brost
2025-10-07 13:04 ` [PATCH v8 26/33] drm/xe: Move queue init before LRC creation Matthew Brost
2025-10-07 14:36   ` Lis, Tomasz
2025-10-07 13:04 ` [PATCH v8 27/33] drm/xe/vf: Add debug prints for GuC replaying state during VF recovery Matthew Brost
2025-10-07 13:05 ` [PATCH v8 28/33] drm/xe/vf: Workaround for race condition in GuC firmware during VF pause Matthew Brost
2025-10-07 13:05 ` [PATCH v8 29/33] drm/xe: Use PPGTT addresses for TLB invalidation to avoid GGTT fixups Matthew Brost
2025-10-07 13:05 ` [PATCH v8 30/33] drm/xe/vf: Use primary GT ordered work queue on media GT on PTL VF Matthew Brost
2025-10-08 17:34   ` Lucas De Marchi
2025-10-07 13:05 ` [PATCH v8 31/33] drm/xe/vf: Ensure media GT VF recovery runs after primary GT on PTL Matthew Brost
2025-10-07 13:05 ` [PATCH v8 32/33] drm/xe/vf: Rebase CCS save/restore BB GGTT addresses Matthew Brost
2025-10-07 13:05 ` [PATCH v8 33/33] drm/xe/guc: Increase wait timeout to 2sec after BUSY reply from GuC Matthew Brost
2025-10-07 13:17 ` ✗ CI.checkpatch: warning for VF migration redesign (rev8) Patchwork
2025-10-07 13:18 ` ✓ CI.KUnit: success " Patchwork
2025-10-07 13:57 ` ✓ Xe.CI.BAT: " Patchwork
2025-10-07 17:02 ` ✗ Xe.CI.Full: failure " Patchwork
2025-10-07 20:49   ` 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=20251007130505.2694829-2-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