From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Subject: [PATCH v5 01/30] drm/xe: Add NULL checks to scratch LRC allocation
Date: Mon, 6 Oct 2025 03:44:16 -0700 [thread overview]
Message-ID: <20251006104445.2210624-2-matthew.brost@intel.com> (raw)
In-Reply-To: <20251006104445.2210624-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>
---
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 47e9df775072..9feca10837b0 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
next prev parent reply other threads:[~2025-10-06 10:44 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 ` Matthew Brost [this message]
2025-10-06 14:17 ` [PATCH v5 01/30] drm/xe: Add NULL checks to scratch LRC allocation 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 ` [PATCH v5 10/30] drm/xe/vf: Remove memory allocations from VF post migration recovery Matthew Brost
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-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