FAILED: patch "[PATCH] drm/xe: Hold a dma-buf reference for imported BOs" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 62775525a27c3b0d56382e08ba81ee2d322058b6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072925-decathlon-canopener-953d@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 62775525a27c3b0d56382e08ba81ee2d322058b6 Mon Sep 17 00:00:00 2001
From: Nitin Gote <[email protected]>
Date: Sat, 11 Jul 2026 00:40:28 +0530
Subject: [PATCH] drm/xe: Hold a dma-buf reference for imported BOs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
An imported dma-buf BO is created as a ttm_bo_type_sg BO whose reservation object is the exporter's dma_buf->resv. The importer, however, only takes a dma-buf reference after a successful dma_buf_dynamic_attach(). Until then nothing keeps the exporter alive, so if the exporter is freed while the BO still references its resv, a later access to that resv is a use-after-free:
Oops: general protection fault, probably for non-canonical address
0x6b6b6b6b6b6b6b9c
Workqueue: ttm ttm_bo_delayed_delete [ttm]
RIP: 0010:mutex_can_spin_on_owner+0x3f/0xc0This can be reached on two paths:
- dma_buf_dynamic_attach() fails, or
- ttm_bo_init_reserved() fails during BO creation.
In both cases the BO already has bo->base.resv pointing at the exporter resv, and sg BOs are always torn down via ttm_bo_delayed_delete(), which locks bo->base.resv asynchronously - potentially after the exporter has been freed.
Take the dma-buf reference in xe_bo_init_locked(), before ttm_bo_init_reserved(), so it also covers a creation failure there, and release it in xe_ttm_bo_destroy(). The reference is held for the whole BO lifetime, keeping the shared resv alive on every path.
v2:
- Reworked the fix to avoid creating the imported sg BO before dma_buf_dynamic_attach() succeeds.
- Attach with importer_priv == NULL and make invalidate_mappings ignore incomplete imports.
v3:
- Dropped the xe-side reordering approach since importer_priv must be valid when dma_buf_dynamic_attach() publishes the attachment.
- Per Christian's suggestion on the v1 thread, keyed the check on import_attach rather than removing the sg guard entirely.
- Fixes both xe and amdgpu in a single TTM patch.
v4:
- Moved import_attach check to after dma_resv_copy_fences() so fences are copied before returning for successful imports (Thomas).
- Removed exporter-alive claim from commit message (Thomas).
v5:
- Add drm/xe patch to keep imported sg BOs off the LRU before attach succeeds; the TTM fix alone is not sufficient for xe if the BO is already LRU-visible. (Thomas)
v4 patch:
https://patchwork.freedesktop.org/patch/736663/?series=169129&rev=2
- Patch 1 (drm/ttm) carries Christian's Reviewed-by from v4.
v6:
- Reworked the fix based on Thomas' suggestion. Instead of the TTM resv individualization (v1-v5) plus the xe off-LRU/placement handling (v5), just hold a dma-buf reference for the imported BO lifetime so the shared resv can never be freed while the BO still references it. Single xe patch, no TTM change. (Thomas)
- Take the reference in xe_bo_init_locked() before ttm_bo_init_reserved() so a TTM creation failure is covered too (Thomas).
- Dropped the v5 series (drm/ttm + drm/xe off-LRU); the off-LRU approach also regressed in CI BAT via ttm_bo_pipeline_gutting() creating a ghost BO that outlived the exporter.
Link to v5: https://patchwork.freedesktop.org/series/169984/
v7:
- Move changelog above --- so it stays in the commit message.
- Reorder changelog entries oldest-to-newest. (Thomas)
drivers/gpu/drm/xe/xe_bo.c +20 -4
@@ -1349,7 +1349,7 @@ int xe_bo_notifier_prepare_pinned(struct xe_bo *bo) backup =xe_bo_init_locked (xe,NULL ,NULL , bo->ttm.base.resv,NULL ,xe_bo_size (bo),DRM_XE_GEM_CPU_CACHING_WB , ttm_bo_type_kernel,XE_BO_FLAG_SYSTEM |XE_BO_FLAG_NEEDS_CPU_ACCESS | -XE_BO_FLAG_PINNED , &exec); +XE_BO_FLAG_PINNED ,NULL , &exec);if (IS_ERR (backup)) {drm_exec_retry_on_contention (&exec); ret =PTR_ERR (backup);
@@ -1490,7 +1490,7 @@ int xe_bo_evict_pinned(struct xe_bo *bo)xe_bo_size (bo),DRM_XE_GEM_CPU_CACHING_WB , ttm_bo_type_kernel,XE_BO_FLAG_SYSTEM |XE_BO_FLAG_NEEDS_CPU_ACCESS | - XE_BO_FLAG_PINNED, &exec); + XE_BO_FLAG_PINNED, NULL, &exec);if (IS_ERR (backup)) {drm_exec_retry_on_contention (&exec); ret =PTR_ERR (backup);
@@ -1826,6 +1826,8 @@ static void xe_ttm_bo_destroy(struct ttm_buffer_object *ttm_bo)if (bo->ttm.base.import_attach)drm_prime_gem_destroy (&bo->ttm.base,NULL ); +if (bo->dma_buf) +dma_buf_put (bo->dma_buf);drm_gem_object_release (&bo->ttm.base);xe_assert (xe,list_empty (&ttm_bo->base.gpuva.list));
@@ -2283,6 +2285,8 @@ void xe_bo_free(struct xe_bo *bo)* @cpu_caching: The cpu caching used for system memory backing store. * @type: The TTM buffer object type. * @flags: XE_BO_FLAG_ flags. +* @dma_buf: The dma-buf to reference for the BO lifetime (imported BOs), +* or NULL. * @exec: The drm_exec transaction to use for exhaustive eviction. * * Initialize or create an xe buffer object. On failure, any allocated buffer
@@ -2294,7 +2298,8 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo, struct xe_tile *tile, struct dma_resv *resv, struct ttm_lru_bulk_move *bulk, size_t size, u16 cpu_caching, enum ttm_bo_type type, - u32 flags, struct drm_exec *exec) + u32 flags, struct dma_buf *dma_buf, + struct drm_exec *exec) { struct ttm_operation_ctx ctx = { .interruptible = true,
@@ -2383,6 +2388,17 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo, placement = (type == ttm_bo_type_sg || bo->flags &XE_BO_FLAG_DEFER_BACKING ) ? &sys_placement : &bo->placement; + +/* +* For imported BOs, keep the exporter dma-buf alive for the BO +* lifetime. Taken before ttm_bo_init_reserved() to also cover a +* creation failure there. Released in xe_ttm_bo_destroy(). +*/ +if (dma_buf) { +get_dma_buf (dma_buf); + bo->dma_buf = dma_buf; + } + err =ttm_bo_init_reserved (&xe->ttm, &bo->ttm, type, placement, alignment, &ctx,NULL , resv, xe_ttm_bo_destroy);
@@ -2500,7 +2516,7 @@ __xe_bo_create_locked(struct xe_device *xe, vm && !xe_vm_in_fault_mode (vm) && flags &XE_BO_FLAG_USER ? &vm->lru_bulk_move :NULL , size, - cpu_caching, type, flags, exec); + cpu_caching, type, flags, NULL, exec);if (IS_ERR (bo))return bo;
drivers/gpu/drm/xe/xe_bo.h +2 -1
@@ -118,7 +118,8 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo, struct xe_tile *tile, struct dma_resv *resv, struct ttm_lru_bulk_move *bulk, size_t size, u16 cpu_caching, enum ttm_bo_type type, - u32 flags, struct drm_exec *exec); + u32 flags, struct dma_buf *dma_buf, + struct drm_exec *exec); struct xe_bo *xe_bo_create_locked(struct xe_device *xe, struct xe_tile *tile, struct xe_vm *vm, size_t size, enum ttm_bo_type type, u32 flags,
drivers/gpu/drm/xe/xe_bo_types.h +2 -0
@@ -36,6 +36,8 @@ struct xe_bo {struct xe_bo *backup_obj;/** @parent_obj: Ref to parent bo if this a backup_obj */ struct xe_bo *parent_obj; +/** @dma_buf: Imported dma-buf ref to keep its resv alive. */ +struct dma_buf *dma_buf;/** @flags: flags for this buffer object */ u32 flags;/** @vm: VM this BO is attached to, for extobj this will be NULL */
drivers/gpu/drm/xe/xe_dma_buf.c +1 -1
@@ -302,7 +302,7 @@ xe_dma_buf_create_obj(struct drm_device *dev, struct dma_buf *dma_buf) bo =xe_bo_init_locked (xe,NULL ,NULL , resv,NULL , dma_buf->size,0 ,/* Will require 1way or 2way for vm_bind */ - ttm_bo_type_sg,XE_BO_FLAG_SYSTEM , &exec); + ttm_bo_type_sg,XE_BO_FLAG_SYSTEM , dma_buf, &exec);drm_exec_retry_on_contention (&exec);if (IS_ERR (bo)) { ret =PTR_ERR (bo);
Sasha Levin
maintainerPATCH 1/2 drm/xe: Rename ___xe_bo_create_locked()
From: Thomas Hellström <[email protected]>
[ Upstream commit 550a42a8daee1b056f9b3e6c858e57451a5b315a ]
Don't start external function names with underscores. Rename to xe_bo_init_locked().
Stable-dep-of: 62775525a27c ("drm/xe: Hold a dma-buf reference for imported BOs")
--- drivers/gpu/drm/xe/xe_bo.c | 20 ++++++++++---------- drivers/gpu/drm/xe/xe_bo.h | 10 +++++----- drivers/gpu/drm/xe/xe_dma_buf.c | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-)
drivers/gpu/drm/xe/xe_bo.c +10 -10
@@ -1288,11 +1288,11 @@ void xe_bo_free(struct xe_bo *bo)kfree (bo); } -struct xe_bo *___xe_bo_create_locked (struct xe_device *xe,struct xe_bo *bo, -struct xe_tile *tile,struct dma_resv *resv, -struct ttm_lru_bulk_move *bulk,size_t size, -u16 cpu_caching,enum ttm_bo_type type, -u32 flags) +struct xe_bo *xe_bo_init_locked (struct xe_device *xe,struct xe_bo *bo, +struct xe_tile *tile,struct dma_resv *resv, +struct ttm_lru_bulk_move *bulk,size_t size, +u16 cpu_caching,enum ttm_bo_type type, +u32 flags) {struct ttm_operation_ctx ctx = { .interruptible = true,
@@ -1487,11 +1487,11 @@ __xe_bo_create_locked(struct xe_device *xe, } } - bo =___xe_bo_create_locked (xe, bo, tile, vm ?xe_vm_resv (vm) :NULL , - vm && !xe_vm_in_fault_mode (vm) && - flags &XE_BO_FLAG_USER ? - &vm->lru_bulk_move :NULL , size, - cpu_caching, type, flags); + bo =xe_bo_init_locked (xe, bo, tile, vm ?xe_vm_resv (vm) :NULL , + vm && !xe_vm_in_fault_mode (vm) && + flags &XE_BO_FLAG_USER ? + &vm->lru_bulk_move :NULL , size, + cpu_caching, type, flags);if (IS_ERR (bo))return bo;
drivers/gpu/drm/xe/xe_bo.h +5 -5
@@ -80,11 +80,11 @@ struct sg_table;struct xe_bo *xe_bo_alloc (void );void xe_bo_free (struct xe_bo *bo); -struct xe_bo *___xe_bo_create_locked (struct xe_device *xe,struct xe_bo *bo, -struct xe_tile *tile,struct dma_resv *resv, -struct ttm_lru_bulk_move *bulk,size_t size, -u16 cpu_caching,enum ttm_bo_type type, -u32 flags); +struct xe_bo *xe_bo_init_locked (struct xe_device *xe,struct xe_bo *bo, +struct xe_tile *tile,struct dma_resv *resv, +struct ttm_lru_bulk_move *bulk,size_t size, +u16 cpu_caching,enum ttm_bo_type type, +u32 flags);struct xe_bo * xe_bo_create_locked_range(struct xe_device *xe, struct xe_tile *tile, struct xe_vm *vm,
drivers/gpu/drm/xe/xe_dma_buf.c +3 -3
@@ -212,9 +212,9 @@ xe_dma_buf_init_obj(struct drm_device *dev, struct xe_bo *storage,int ret;dma_resv_lock (resv,NULL ); - bo =___xe_bo_create_locked (xe, storage,NULL , resv,NULL , dma_buf->size, -0 ,/* Will require 1way or 2way for vm_bind */ - ttm_bo_type_sg,XE_BO_FLAG_SYSTEM ); + bo =xe_bo_init_locked (xe, storage,NULL , resv,NULL , dma_buf->size, +0 ,/* Will require 1way or 2way for vm_bind */ + ttm_bo_type_sg,XE_BO_FLAG_SYSTEM );if (IS_ERR (bo)) { ret =PTR_ERR (bo); goto error;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 drm/xe: Hold a dma-buf reference for imported BOs
From: Nitin Gote <[email protected]>
[ Upstream commit 62775525a27c3b0d56382e08ba81ee2d322058b6 ]
An imported dma-buf BO is created as a ttm_bo_type_sg BO whose reservation object is the exporter's dma_buf->resv. The importer, however, only takes a dma-buf reference after a successful dma_buf_dynamic_attach(). Until then nothing keeps the exporter alive, so if the exporter is freed while the BO still references its resv, a later access to that resv is a use-after-free:
Oops: general protection fault, probably for non-canonical address
0x6b6b6b6b6b6b6b9c
Workqueue: ttm ttm_bo_delayed_delete [ttm]
RIP: 0010:mutex_can_spin_on_owner+0x3f/0xc0This can be reached on two paths:
- dma_buf_dynamic_attach() fails, or
- ttm_bo_init_reserved() fails during BO creation.
In both cases the BO already has bo->base.resv pointing at the exporter resv, and sg BOs are always torn down via ttm_bo_delayed_delete(), which locks bo->base.resv asynchronously - potentially after the exporter has been freed.
Take the dma-buf reference in xe_bo_init_locked(), before ttm_bo_init_reserved(), so it also covers a creation failure there, and release it in xe_ttm_bo_destroy(). The reference is held for the whole BO lifetime, keeping the shared resv alive on every path.
v2:
- Reworked the fix to avoid creating the imported sg BO before dma_buf_dynamic_attach() succeeds.
- Attach with importer_priv == NULL and make invalidate_mappings ignore incomplete imports.
v3:
- Dropped the xe-side reordering approach since importer_priv must be valid when dma_buf_dynamic_attach() publishes the attachment.
- Per Christian's suggestion on the v1 thread, keyed the check on import_attach rather than removing the sg guard entirely.
- Fixes both xe and amdgpu in a single TTM patch.
v4:
- Moved import_attach check to after dma_resv_copy_fences() so fences are copied before returning for successful imports (Thomas).
- Removed exporter-alive claim from commit message (Thomas).
v5:
- Add drm/xe patch to keep imported sg BOs off the LRU before attach succeeds; the TTM fix alone is not sufficient for xe if the BO is already LRU-visible. (Thomas)
v4 patch:
https://patchwork.freedesktop.org/patch/736663/?series=169129&rev=2
- Patch 1 (drm/ttm) carries Christian's Reviewed-by from v4.
v6:
- Reworked the fix based on Thomas' suggestion. Instead of the TTM resv individualization (v1-v5) plus the xe off-LRU/placement handling (v5), just hold a dma-buf reference for the imported BO lifetime so the shared resv can never be freed while the BO still references it. Single xe patch, no TTM change. (Thomas)
- Take the reference in xe_bo_init_locked() before ttm_bo_init_reserved() so a TTM creation failure is covered too (Thomas).
- Dropped the v5 series (drm/ttm + drm/xe off-LRU); the off-LRU approach also regressed in CI BAT via ttm_bo_pipeline_gutting() creating a ghost BO that outlived the exporter.
Link to v5: https://patchwork.freedesktop.org/series/169984/
v7:
- Move changelog above --- so it stays in the commit message.
- Reorder changelog entries oldest-to-newest. (Thomas)
--- drivers/gpu/drm/xe/xe_bo.c | 17 +++++++++++++++-- drivers/gpu/drm/xe/xe_bo.h | 2 +- drivers/gpu/drm/xe/xe_bo_types.h | 2 ++ drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_bo.c +15 -2
@@ -1131,6 +1131,8 @@ static void xe_ttm_bo_destroy(struct ttm_buffer_object *ttm_bo)if (bo->ttm.base.import_attach)drm_prime_gem_destroy (&bo->ttm.base,NULL ); +if (bo->dma_buf) +dma_buf_put (bo->dma_buf);drm_gem_object_release (&bo->ttm.base);xe_assert (xe,list_empty (&ttm_bo->base.gpuva.list));
@@ -1292,7 +1294,7 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo, struct xe_tile *tile, struct dma_resv *resv, struct ttm_lru_bulk_move *bulk, size_t size, u16 cpu_caching, enum ttm_bo_type type, - u32 flags) + u32 flags, struct dma_buf *dma_buf) { struct ttm_operation_ctx ctx = { .interruptible = true,
@@ -1377,6 +1379,17 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo, placement = (type == ttm_bo_type_sg || bo->flags &XE_BO_FLAG_DEFER_BACKING ) ? &sys_placement : &bo->placement; + +/* +* For imported BOs, keep the exporter dma-buf alive for the BO +* lifetime. Taken before ttm_bo_init_reserved() to also cover a +* creation failure there. Released in xe_ttm_bo_destroy(). +*/ +if (dma_buf) { +get_dma_buf (dma_buf); + bo->dma_buf = dma_buf; + } + err =ttm_bo_init_reserved (&xe->ttm, &bo->ttm, type, placement, alignment, &ctx,NULL , resv, xe_ttm_bo_destroy);
@@ -1491,7 +1504,7 @@ __xe_bo_create_locked(struct xe_device *xe, vm && !xe_vm_in_fault_mode (vm) && flags &XE_BO_FLAG_USER ? &vm->lru_bulk_move :NULL , size, - cpu_caching, type, flags); + cpu_caching, type, flags, NULL);if (IS_ERR (bo))return bo;
drivers/gpu/drm/xe/xe_bo.h +1 -1
@@ -84,7 +84,7 @@ struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo, struct xe_tile *tile, struct dma_resv *resv, struct ttm_lru_bulk_move *bulk, size_t size, u16 cpu_caching, enum ttm_bo_type type, - u32 flags); + u32 flags, struct dma_buf *dma_buf);struct xe_bo * xe_bo_create_locked_range(struct xe_device *xe, struct xe_tile *tile, struct xe_vm *vm,
drivers/gpu/drm/xe/xe_bo_types.h +2 -0
@@ -30,6 +30,8 @@ struct xe_bo {struct ttm_buffer_object ttm;/** @size: Size of this buffer object */ size_t size; +/** @dma_buf: Imported dma-buf ref to keep its resv alive. */ +struct dma_buf *dma_buf;/** @flags: flags for this buffer object */ u32 flags;/** @vm: VM this BO is attached to, for extobj this will be NULL */
drivers/gpu/drm/xe/xe_dma_buf.c +1 -1
@@ -214,7 +214,7 @@ xe_dma_buf_init_obj(struct drm_device *dev, struct xe_bo *storage,dma_resv_lock (resv,NULL ); bo =xe_bo_init_locked (xe, storage,NULL , resv,NULL , dma_buf->size,0 ,/* Will require 1way or 2way for vm_bind */ - ttm_bo_type_sg,XE_BO_FLAG_SYSTEM ); + ttm_bo_type_sg,XE_BO_FLAG_SYSTEM , dma_buf);if (IS_ERR (bo)) { ret =PTR_ERR (bo); goto error;
Signature · 1 line
2.53.0