From: Greg Kroah-Hartman Date: Wed, 29 Jul 2026 11:14:40 +0000 (+0200) Subject: 6.18-stable patches X-Git-Tag: v6.1.179~62 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3194e975d5aa6dd573d6761b1493db6b2157d0be;p=thirdparty%2Fkernel%2Fstable-queue.git 6.18-stable patches added patches: drm-amdkfd-check-bounds-in-allocate_event_notification_slot.patch drm-amdkfd-check-bounds-on-criu-restore-queue-type-and-mqd-size.patch drm-amdkfd-fix-32-bit-overflow-in-cwsr-total-size-calculation.patch drm-amdkfd-use-kvcalloc-to-allocate-arrays.patch drm-imagination-acquire-vm_ctx-lock-before-mapping-memory-to-gpu-vm.patch drm-imagination-fix-double-call-to-drm_sched_entity_fini.patch drm-imagination-fix-error-checking-of-pvr_vm_context_lookup.patch drm-imagination-fix-user-array-stride-in-pvr_set_uobj_array.patch drm-xe-hold-a-dma-buf-reference-for-imported-bos.patch --- diff --git a/queue-6.18/drm-amdkfd-check-bounds-in-allocate_event_notification_slot.patch b/queue-6.18/drm-amdkfd-check-bounds-in-allocate_event_notification_slot.patch new file mode 100644 index 0000000000..a6a8670ddf --- /dev/null +++ b/queue-6.18/drm-amdkfd-check-bounds-in-allocate_event_notification_slot.patch @@ -0,0 +1,44 @@ +From bb52249fbbe948875155ccd45cd8d74bf4ae747b Mon Sep 17 00:00:00 2001 +From: David Francis +Date: Thu, 21 May 2026 09:18:59 -0400 +Subject: drm/amdkfd: Check bounds in allocate_event_notification_slot + +From: David Francis + +commit bb52249fbbe948875155ccd45cd8d74bf4ae747b upstream. + +The valid event ids go from 0 to KFD_SIGNAL_EVENT_LIMIT + +allocate_event_notification_slot has an option to specify +an event id to allocate at, used by CRIU. We weren't checking +the bounds on that value. + +Check them. + +v2: Lower bounds check is unecessary because of idr_alloc +already rejecting negative numbers. Upper bounds check should +be KFD_SIGNAL_EVENT_LIMIT since the signal mode mappings might +not yet exist + +Signed-off-by: David Francis +Reviewed-by: David Yat Sin +Signed-off-by: Alex Deucher +(cherry picked from commit 6853f1f6cbbeb3f53ebbbd7286536aeb2c5d5f50) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c +@@ -107,6 +107,9 @@ static int allocate_event_notification_s + } + + if (restore_id) { ++ if (*restore_id >= KFD_SIGNAL_EVENT_LIMIT) ++ return -EINVAL; ++ + id = idr_alloc(&p->event_idr, ev, *restore_id, *restore_id + 1, + GFP_KERNEL); + } else { diff --git a/queue-6.18/drm-amdkfd-check-bounds-on-criu-restore-queue-type-and-mqd-size.patch b/queue-6.18/drm-amdkfd-check-bounds-on-criu-restore-queue-type-and-mqd-size.patch new file mode 100644 index 0000000000..235f35c205 --- /dev/null +++ b/queue-6.18/drm-amdkfd-check-bounds-on-criu-restore-queue-type-and-mqd-size.patch @@ -0,0 +1,109 @@ +From 47ea05f246bebc81c7796f56265cffd812cf0601 Mon Sep 17 00:00:00 2001 +From: David Francis +Date: Mon, 6 Jul 2026 10:19:04 -0400 +Subject: drm/amdkfd: Check bounds on CRIU restore queue type and mqd size + +From: David Francis + +commit 47ea05f246bebc81c7796f56265cffd812cf0601 upstream. + +We weren't checking whether the values provided in the private +data in kfd CRIU restore were within bounds. + +For queue type, add a KFD_QUEUE_TYPE_MAX and ensure the provided +type is less than it. + +For mqd_size, add new function mqd_size_from_queue_type and confirm +that the provided mqd_size matches expectations. + +Reviewed-by: David Yat Sin +Signed-off-by: David Francis +Signed-off-by: Alex Deucher +(cherry picked from commit f19d8086f6644083c913d70bfdeee20e1b6f46a5) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 ++++ + drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 24 ++++++++++++----- + 4 files changed, 27 insertions(+), 8 deletions(-) + +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +@@ -3628,6 +3628,12 @@ out: + dqm_unlock(dqm); + return r; + } ++ ++size_t mqd_size_from_queue_type(struct device_queue_manager *dqm, enum kfd_queue_type type) ++{ ++ return dqm->mqd_mgrs[get_mqd_type_from_queue_type(type)]->mqd_size; ++} ++ + #if defined(CONFIG_DEBUG_FS) + + static void seq_reg_dump(struct seq_file *m, +--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h +@@ -327,6 +327,8 @@ int debug_refresh_runlist(struct device_ + bool kfd_dqm_is_queue_in_process(struct device_queue_manager *dqm, + struct qcm_process_device *qpd, + int doorbell_off, u32 *queue_format); ++size_t mqd_size_from_queue_type(struct device_queue_manager *dqm, ++ enum kfd_queue_type type); + + static inline unsigned int get_sh_mem_bases_32(struct kfd_process_device *pdd) + { +--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +@@ -436,7 +436,8 @@ enum kfd_queue_type { + KFD_QUEUE_TYPE_HIQ, + KFD_QUEUE_TYPE_DIQ, + KFD_QUEUE_TYPE_SDMA_XGMI, +- KFD_QUEUE_TYPE_SDMA_BY_ENG_ID ++ KFD_QUEUE_TYPE_SDMA_BY_ENG_ID, ++ KFD_QUEUE_TYPE_MAX, + }; + + enum kfd_queue_format { +--- a/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +@@ -1015,6 +1015,23 @@ int kfd_criu_restore_queue(struct kfd_pr + goto exit; + } + ++ pdd = kfd_process_device_data_by_id(p, q_data->gpu_id); ++ if (!pdd) { ++ pr_err("Failed to get pdd\n"); ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ if (q_data->type >= KFD_QUEUE_TYPE_MAX) { ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ if (q_data->mqd_size != mqd_size_from_queue_type(pdd->dev->dqm, q_data->type)) { ++ ret = -EINVAL; ++ goto exit; ++ } ++ + *priv_data_offset += sizeof(*q_data); + q_extra_data_size = (uint64_t)q_data->ctl_stack_size + q_data->mqd_size; + +@@ -1037,13 +1054,6 @@ int kfd_criu_restore_queue(struct kfd_pr + + *priv_data_offset += q_extra_data_size; + +- pdd = kfd_process_device_data_by_id(p, q_data->gpu_id); +- if (!pdd) { +- pr_err("Failed to get pdd\n"); +- ret = -EINVAL; +- goto exit; +- } +- + /* + * data stored in this order: + * mqd[xcc0], mqd[xcc1],..., ctl_stack[xcc0], ctl_stack[xcc1]... diff --git a/queue-6.18/drm-amdkfd-fix-32-bit-overflow-in-cwsr-total-size-calculation.patch b/queue-6.18/drm-amdkfd-fix-32-bit-overflow-in-cwsr-total-size-calculation.patch new file mode 100644 index 0000000000..7cc5e8fd0b --- /dev/null +++ b/queue-6.18/drm-amdkfd-fix-32-bit-overflow-in-cwsr-total-size-calculation.patch @@ -0,0 +1,89 @@ +From 2b0386d4293920e690c0e017708f999b93cc729b Mon Sep 17 00:00:00 2001 +From: Yongqiang Sun +Date: Mon, 6 Jul 2026 15:15:07 -0400 +Subject: drm/amdkfd: fix 32-bit overflow in CWSR total size calculation + +From: Yongqiang Sun + +commit 2b0386d4293920e690c0e017708f999b93cc729b upstream. + +total_cwsr_size was computed in 32-bit before being used as a BO/SVM +allocation size. +With large ctx_save_restore_area_size and debug_memory_size +multiplied by the XCC count, the product can wrap, +yielding an undersized CWSR save area that firmware later overruns. + +Promote total_cwsr_size to u64 and use check_add_overflow()/ +check_mul_overflow() in both kfd_queue_acquire_buffers() and +kfd_queue_release_buffers(). + +Signed-off-by: Yongqiang Sun +Reviewed-by: Philip Yang +Signed-off-by: Alex Deucher +(cherry picked from commit 319f7e13423ae3f486b9aea82f9ad2d6af0ee608) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/amd/amdkfd/kfd_queue.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_queue.c +@@ -23,6 +23,7 @@ + */ + + #include ++#include + #include "kfd_priv.h" + #include "kfd_topology.h" + #include "kfd_svm.h" +@@ -235,7 +236,7 @@ int kfd_queue_acquire_buffers(struct kfd + struct kfd_topology_device *topo_dev; + u64 expected_queue_size; + struct amdgpu_vm *vm; +- u32 total_cwsr_size; ++ u64 total_cwsr_size; + int err; + + topo_dev = kfd_topology_device_by_id(pdd->dev->id); +@@ -305,8 +306,14 @@ int kfd_queue_acquire_buffers(struct kfd + goto out_err_unreserve; + } + +- total_cwsr_size = (properties->ctx_save_restore_area_size + +- topo_dev->node_props.debug_memory_size) * NUM_XCC(pdd->dev->xcc_mask); ++ total_cwsr_size = (u64)properties->ctx_save_restore_area_size + ++ topo_dev->node_props.debug_memory_size; ++ if (check_mul_overflow(total_cwsr_size, ++ NUM_XCC(pdd->dev->xcc_mask), ++ &total_cwsr_size)) { ++ err = -EINVAL; ++ goto out_err_unreserve; ++ } + total_cwsr_size = ALIGN(total_cwsr_size, PAGE_SIZE); + + err = kfd_queue_buffer_get(vm, (void *)properties->ctx_save_restore_area_address, +@@ -341,7 +348,7 @@ out_err_release: + int kfd_queue_release_buffers(struct kfd_process_device *pdd, struct queue_properties *properties) + { + struct kfd_topology_device *topo_dev; +- u32 total_cwsr_size; ++ u64 total_cwsr_size; + + kfd_queue_buffer_put(&properties->wptr_bo); + kfd_queue_buffer_put(&properties->rptr_bo); +@@ -352,8 +359,12 @@ int kfd_queue_release_buffers(struct kfd + topo_dev = kfd_topology_device_by_id(pdd->dev->id); + if (!topo_dev) + return -EINVAL; +- total_cwsr_size = (properties->ctx_save_restore_area_size + +- topo_dev->node_props.debug_memory_size) * NUM_XCC(pdd->dev->xcc_mask); ++ total_cwsr_size = (u64)properties->ctx_save_restore_area_size + ++ topo_dev->node_props.debug_memory_size; ++ if (check_mul_overflow(total_cwsr_size, ++ NUM_XCC(pdd->dev->xcc_mask), ++ &total_cwsr_size)) ++ return -EINVAL; + total_cwsr_size = ALIGN(total_cwsr_size, PAGE_SIZE); + + kfd_queue_buffer_svm_put(pdd, properties->ctx_save_restore_area_address, total_cwsr_size); diff --git a/queue-6.18/drm-amdkfd-use-kvcalloc-to-allocate-arrays.patch b/queue-6.18/drm-amdkfd-use-kvcalloc-to-allocate-arrays.patch new file mode 100644 index 0000000000..65ebe64535 --- /dev/null +++ b/queue-6.18/drm-amdkfd-use-kvcalloc-to-allocate-arrays.patch @@ -0,0 +1,74 @@ +From 9c8b85f95c1d4736b967e17b8eb4a463c055bea3 Mon Sep 17 00:00:00 2001 +From: David Francis +Date: Thu, 25 Jun 2026 10:09:13 -0400 +Subject: drm/amdkfd: Use kvcalloc to allocate arrays + +From: David Francis + +commit 9c8b85f95c1d4736b967e17b8eb4a463c055bea3 upstream. + +There were a few instances in kfd_chardev.c of kvzalloc being +used to allocate memory for an array. + +Switch those to kvcalloc, which +- is the standard way of allocating a zero-initialized array +- does a check for the mul overflowing + +Signed-off-by: David Francis +Reviewed-by: Alex Deucher +Signed-off-by: Alex Deucher +(cherry picked from commit 60b048c93f7a3add39757ad65fe2bb6e58eeae23) +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c ++++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +@@ -1790,13 +1790,13 @@ static int criu_checkpoint_devices(struc + struct kfd_criu_device_bucket *device_buckets = NULL; + int ret = 0, i; + +- device_buckets = kvzalloc(num_devices * sizeof(*device_buckets), GFP_KERNEL); ++ device_buckets = kvcalloc(num_devices, sizeof(*device_buckets), GFP_KERNEL); + if (!device_buckets) { + ret = -ENOMEM; + goto exit; + } + +- device_priv = kvzalloc(num_devices * sizeof(*device_priv), GFP_KERNEL); ++ device_priv = kvcalloc(num_devices, sizeof(*device_priv), GFP_KERNEL); + if (!device_priv) { + ret = -ENOMEM; + goto exit; +@@ -1916,17 +1916,17 @@ static int criu_checkpoint_bos(struct kf + int ret = 0, pdd_index, bo_index = 0, id; + void *mem; + +- bo_buckets = kvzalloc(num_bos * sizeof(*bo_buckets), GFP_KERNEL); ++ bo_buckets = kvcalloc(num_bos, sizeof(*bo_buckets), GFP_KERNEL); + if (!bo_buckets) + return -ENOMEM; + +- bo_privs = kvzalloc(num_bos * sizeof(*bo_privs), GFP_KERNEL); ++ bo_privs = kvcalloc(num_bos, sizeof(*bo_privs), GFP_KERNEL); + if (!bo_privs) { + ret = -ENOMEM; + goto exit; + } + +- files = kvzalloc(num_bos * sizeof(struct file *), GFP_KERNEL); ++ files = kvcalloc(num_bos, sizeof(struct file *), GFP_KERNEL); + if (!files) { + ret = -ENOMEM; + goto exit; +@@ -2463,7 +2463,7 @@ static int criu_restore_bos(struct kfd_p + if (!bo_buckets) + return -ENOMEM; + +- files = kvzalloc(args->num_bos * sizeof(struct file *), GFP_KERNEL); ++ files = kvcalloc(args->num_bos, sizeof(struct file *), GFP_KERNEL); + if (!files) { + ret = -ENOMEM; + goto exit; diff --git a/queue-6.18/drm-imagination-acquire-vm_ctx-lock-before-mapping-memory-to-gpu-vm.patch b/queue-6.18/drm-imagination-acquire-vm_ctx-lock-before-mapping-memory-to-gpu-vm.patch new file mode 100644 index 0000000000..fc124036ad --- /dev/null +++ b/queue-6.18/drm-imagination-acquire-vm_ctx-lock-before-mapping-memory-to-gpu-vm.patch @@ -0,0 +1,67 @@ +From 17e2030f37600994440f875dc410615d5c66ee6d Mon Sep 17 00:00:00 2001 +From: Icenowy Zheng +Date: Tue, 14 Jul 2026 15:36:41 +0800 +Subject: drm/imagination: acquire vm_ctx->lock before mapping memory to GPU VM + +From: Icenowy Zheng + +commit 17e2030f37600994440f875dc410615d5c66ee6d upstream. + +The drm gpuvm code doesn't protect find operation against map operation, +and the driver needs to ensure a map operation shouldn't happen when a +find operation is in progress. + +In some cases a find operation will be in progress when doing map/unmap +operations, and the find operation will do a NULL pointer dereference. + +An example of the stack trace of such NULL dereference is shown below: + +``` +Unable to handle kernel access to user memory without uaccess routines at +virtual address 0000000000000010 + +[] drm_gpuva_find+0x28/0x6c [drm_gpuvm] +[] pvr_vm_unmap+0x34/0x68 [powervr] +[] pvr_ioctl_vm_unmap+0x2e/0x50 [powervr] +[] drm_ioctl_kernel+0x8e/0xdc +[] drm_ioctl+0x1be/0x3e0 +[] __riscv_sys_ioctl+0xba/0xc4 +[] do_trap_ecall_u+0x23e/0x3f4 +[] handle_exception+0x168/0x174 +``` + +As all occurences of drm_gpuva_find*() are already guarded by +vm_ctx->lock, make pvr_vm_map() to acquire this lock to prevent +disturbing any find operation. This fixes the NULL deference problem in +drm_gpuva_find*(). + +Cc: stable@vger.kernel.org +Fixes: ff5f643de0bf ("drm/imagination: Add GEM and VM related code") +Fixes: 4bc736f890ce ("drm/imagination: vm: make use of GPUVM's drm_exec helper") +Signed-off-by: Icenowy Zheng +Reviewed-by: Alessio Belle +Link: https://patch.msgid.link/20260714073641.1935075-1-zhengxingda@iscas.ac.cn +Signed-off-by: Alessio Belle +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/imagination/pvr_vm.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/gpu/drm/imagination/pvr_vm.c ++++ b/drivers/gpu/drm/imagination/pvr_vm.c +@@ -746,6 +746,7 @@ pvr_vm_map(struct pvr_vm_context *vm_ctx + + pvr_gem_object_get(pvr_obj); + ++ mutex_lock(&vm_ctx->lock); + err = drm_gpuvm_exec_lock(&vm_exec); + if (err) + goto err_cleanup; +@@ -755,6 +756,7 @@ pvr_vm_map(struct pvr_vm_context *vm_ctx + drm_gpuvm_exec_unlock(&vm_exec); + + err_cleanup: ++ mutex_unlock(&vm_ctx->lock); + pvr_vm_bind_op_fini(&bind_op); + + return err; diff --git a/queue-6.18/drm-imagination-fix-double-call-to-drm_sched_entity_fini.patch b/queue-6.18/drm-imagination-fix-double-call-to-drm_sched_entity_fini.patch new file mode 100644 index 0000000000..d05253d06e --- /dev/null +++ b/queue-6.18/drm-imagination-fix-double-call-to-drm_sched_entity_fini.patch @@ -0,0 +1,180 @@ +From 4af24c27a39ba147a613a09e10b9e0f7294524c0 Mon Sep 17 00:00:00 2001 +From: Brajesh Gupta +Date: Tue, 30 Jun 2026 21:10:07 +0530 +Subject: drm/imagination: Fix double call to drm_sched_entity_fini() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Brajesh Gupta + +commit 4af24c27a39ba147a613a09e10b9e0f7294524c0 upstream. + +Call sequence of double call: +pvr_context_destroy +  pvr_context_kill_queues +    pvr_queue_kill +      drm_sched_entity_destroy +        drm_sched_entity_fini // here +  pvr_context_put +    kref_put(..., pvr_context_release) +      pvr_context_destroy_queues +        pvr_queue_destroy +          drm_sched_entity_fini // here + +Call to drm_sched_entity_destroy() from pvr_context_kill_queues() calls +drm_sched_entity_flush() + drm_sched_entity_fini(). +drm_sched_entity_flush() ensures all pending jobs are completed and +drm_sched_entity_fini() ensures no further submission is allowed as +per expectation from pvr_context_kill_queues(). Double call to +drm_sched_entity_fini() is misuse of the API so keep call only in +pvr_context_create() failure path. + +Stack trace for issue with addition of refcounting for DRM entity +stats in commit fd177135f0e6 ("drm/sched: Account entity GPU time"): + +[ 789.490527] ------------[ cut here ]------------ +[ 789.490559] refcount_t: underflow; use-after-free. +[ 789.490657] WARNING: lib/refcount.c:28 at refcount_warn_saturate+0xf4/0x144, CPU#0: kworker/u16:1/440 +[ 789.490695] Modules linked in: powervr drm_gpuvm drm_exec gpu_sched drm_shmem_helper xhci_plat_hcd xhci_hcd dwc3 usbcore usb_common snd_soc_simple_card snd_soc_simple_card_utils sa2ul sha512 sha256 dwc3_am62 sha1 authenc rti_wdt libsha512 at24 sch_fq_codel fuse dm_mod ipv6 +[ 789.490798] CPU: 0 UID: 0 PID: 440 Comm: kworker/u16:1 Not tainted 7.0.0-rc7-02049-g5e2c0700091b #22 PREEMPT +[ 789.490809] Hardware name: Texas Instruments AM625 SK (DT) +[ 789.490815] Workqueue: powervr-sched pvr_queue_fence_release_work [powervr] +[ 789.490868] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 789.490876] pc : refcount_warn_saturate+0xf4/0x144 +[ 789.490884] lr : refcount_warn_saturate+0xf4/0x144 +[ 789.490892] sp : ffff8000822cbcc0 +[ 789.490895] x29: ffff8000822cbcc0 x28: 0000000000000000 x27: 0000000000000000 +[ 789.490909] x26: 0000000000000000 x25: ffff800081b1e338 x24: ffff000004541405 +[ 789.490922] x23: ffff000004bea950 x22: ffff00000042e400 x21: ffff000007123e30 +[ 789.490935] x20: ffff000007123000 x19: ffff000007a80d50 x18: fffffffffffe7768 +[ 789.490948] x17: 74736574202c6e6f x16: 697461746e656d65 x15: ffff800081b269f0 +[ 789.490962] x14: 0000000000000030 x13: ffff800081b26a70 x12: 0000000000000211 +[ 789.490975] x11: 00000000000000c0 x10: 0000000000000b50 x9 : ffff8000822cbb30 +[ 789.490988] x8 : ffff0000014e7bb0 x7 : ffff00007725e780 x6 : 0000000372a05f49 +[ 789.491001] x5 : 0000000000000000 x4 : 0000000000000001 x3 : 0000000000000010 +[ 789.491013] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffff0000014e7000 +[ 789.491027] Call trace: +[ 789.491032] refcount_warn_saturate+0xf4/0x144 (P) +[ 789.491043] drm_sched_entity_fini+0x164/0x18c [gpu_sched] +[ 789.491081] pvr_queue_destroy+0x64/0x134 [powervr] +[ 789.491110] pvr_context_destroy_queues+0x34/0x64 [powervr] +[ 789.491138] pvr_context_release+0x70/0xac [powervr] +[ 789.491166] pvr_context_put.part.0+0x5c/0x7c [powervr] +[ 789.491193] pvr_context_put+0x14/0x24 [powervr] +[ 789.491221] pvr_queue_fence_release_work+0x20/0x38 [powervr] +[ 789.491249] process_one_work+0x160/0x4c4 +[ 789.491264] worker_thread+0x188/0x310 +[ 789.491276] kthread+0x130/0x13c +[ 789.491287] ret_from_fork+0x10/0x20 +[ 789.491300] ---[ end trace 0000000000000000 ]--- + +Fixes: eaf01ee5ba28 ("drm/imagination: Implement job submission and scheduling") +Cc: stable@vger.kernel.org +Signed-off-by: Brajesh Gupta +Reviewed-by: Alessio Belle +Link: https://patch.msgid.link/20260630-b4-sched_fix-v7-1-71aa39c62627@imgtec.com +Signed-off-by: Alessio Belle +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/imagination/pvr_context.c | 18 ++++++++++-------- + drivers/gpu/drm/imagination/pvr_queue.c | 6 ++++-- + drivers/gpu/drm/imagination/pvr_queue.h | 2 +- + 3 files changed, 15 insertions(+), 11 deletions(-) + +--- a/drivers/gpu/drm/imagination/pvr_context.c ++++ b/drivers/gpu/drm/imagination/pvr_context.c +@@ -161,22 +161,24 @@ ctx_fw_data_init(void *cpu_ptr, void *pr + /** + * pvr_context_destroy_queues() - Destroy all queues attached to a context. + * @ctx: Context to destroy queues on. ++ * @cleanup_queue_entity: Whether to cleanup the queue entity e.g. context ++ * creation failure path. + * + * Should be called when the last reference to a context object is dropped. + * It releases all resources attached to the queues bound to this context. + */ +-static void pvr_context_destroy_queues(struct pvr_context *ctx) ++static void pvr_context_destroy_queues(struct pvr_context *ctx, bool cleanup_queue_entity) + { + switch (ctx->type) { + case DRM_PVR_CTX_TYPE_RENDER: +- pvr_queue_destroy(ctx->queues.fragment); +- pvr_queue_destroy(ctx->queues.geometry); ++ pvr_queue_destroy(ctx->queues.fragment, cleanup_queue_entity); ++ pvr_queue_destroy(ctx->queues.geometry, cleanup_queue_entity); + break; + case DRM_PVR_CTX_TYPE_COMPUTE: +- pvr_queue_destroy(ctx->queues.compute); ++ pvr_queue_destroy(ctx->queues.compute, cleanup_queue_entity); + break; + case DRM_PVR_CTX_TYPE_TRANSFER_FRAG: +- pvr_queue_destroy(ctx->queues.transfer); ++ pvr_queue_destroy(ctx->queues.transfer, cleanup_queue_entity); + break; + } + } +@@ -240,7 +242,7 @@ static int pvr_context_create_queues(str + return -EINVAL; + + err_destroy_queues: +- pvr_context_destroy_queues(ctx); ++ pvr_context_destroy_queues(ctx, true); + return err; + } + +@@ -356,7 +358,7 @@ err_destroy_fw_obj: + pvr_fw_object_destroy(ctx->fw_obj); + + err_destroy_queues: +- pvr_context_destroy_queues(ctx); ++ pvr_context_destroy_queues(ctx, true); + + err_free_ctx_data: + kfree(ctx->data); +@@ -382,7 +384,7 @@ pvr_context_release(struct kref *ref_cou + spin_unlock(&pvr_dev->ctx_list_lock); + + xa_erase(&pvr_dev->ctx_ids, ctx->ctx_id); +- pvr_context_destroy_queues(ctx); ++ pvr_context_destroy_queues(ctx, false); + pvr_fw_object_destroy(ctx->fw_obj); + kfree(ctx->data); + pvr_vm_context_put(ctx->vm_ctx); +--- a/drivers/gpu/drm/imagination/pvr_queue.c ++++ b/drivers/gpu/drm/imagination/pvr_queue.c +@@ -1401,11 +1401,12 @@ void pvr_queue_kill(struct pvr_queue *qu + /** + * pvr_queue_destroy() - Destroy a queue. + * @queue: The queue to destroy. ++ * @cleanup_queue_entity: Whether to cleanup the queue entity. + * + * Cleanup the queue and free the resources attached to it. Should be + * called from the context release function. + */ +-void pvr_queue_destroy(struct pvr_queue *queue) ++void pvr_queue_destroy(struct pvr_queue *queue, bool cleanup_queue_entity) + { + if (!queue) + return; +@@ -1415,7 +1416,8 @@ void pvr_queue_destroy(struct pvr_queue + mutex_unlock(&queue->ctx->pvr_dev->queues.lock); + + drm_sched_fini(&queue->scheduler); +- drm_sched_entity_fini(&queue->entity); ++ if (cleanup_queue_entity) ++ drm_sched_entity_fini(&queue->entity); + + if (WARN_ON(queue->last_queued_job_scheduled_fence)) + dma_fence_put(queue->last_queued_job_scheduled_fence); +--- a/drivers/gpu/drm/imagination/pvr_queue.h ++++ b/drivers/gpu/drm/imagination/pvr_queue.h +@@ -158,7 +158,7 @@ struct pvr_queue *pvr_queue_create(struc + + void pvr_queue_kill(struct pvr_queue *queue); + +-void pvr_queue_destroy(struct pvr_queue *queue); ++void pvr_queue_destroy(struct pvr_queue *queue, bool cleanup_queue_entity); + + void pvr_queue_process(struct pvr_queue *queue); + diff --git a/queue-6.18/drm-imagination-fix-error-checking-of-pvr_vm_context_lookup.patch b/queue-6.18/drm-imagination-fix-error-checking-of-pvr_vm_context_lookup.patch new file mode 100644 index 0000000000..d7c4a21c27 --- /dev/null +++ b/queue-6.18/drm-imagination-fix-error-checking-of-pvr_vm_context_lookup.patch @@ -0,0 +1,87 @@ +From cf385cf6e713eba0720651174dac0b2d2f5bb8f8 Mon Sep 17 00:00:00 2001 +From: Luigi Santivetti +Date: Tue, 7 Jul 2026 16:17:16 +0100 +Subject: drm/imagination: fix error checking of pvr_vm_context_lookup() + +From: Luigi Santivetti + +commit cf385cf6e713eba0720651174dac0b2d2f5bb8f8 upstream. + +Since pvr_vm_context_lookup() returns either NULL or a pointer, then stop +using IS_ERR() for checking the return value. + +Using IS_ERR() leads to the kernel oops reported below. It can be +reproduced by passing an invalid VM context handle from userspace to the +DRM_IOCTL_PVR_CREATE_CONTEXT ioctl. + +[ 92.733119] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000148 +[ 92.742042] Mem abort info: +[ 92.744890] ESR = 0x0000000096000004 +[ 92.748686] EC = 0x25: DABT (current EL), IL = 32 bits +[ 92.754020] SET = 0, FnV = 0 +[ 92.757154] EA = 0, S1PTW = 0 +[ 92.760337] FSC = 0x04: level 0 translation fault +[ 92.765243] Data abort info: +[ 92.768129] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 +[ 92.773626] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 +[ 92.778763] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 +[ 92.784098] user pgtable: 4k pages, 48-bit VAs, pgdp=000000088ed23000 +[ 92.790550] [0000000000000148] pgd=0000000000000000, p4d=0000000000000000 +[ 92.797381] Internal error: Oops: 0000000096000004 [#1] SMP +[ 92.803027] Modules linked in: powervr +[ 92.852533] CPU: 0 UID: 0 PID: 409 Comm: triangle Not tainted 7.1.0-rc5-g98b46e693b91 #1 PREEMPT +[ 92.861385] Hardware name: Texas Instruments AM68 SK (DT) +[ 92.866766] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) +[ 92.873709] pc : pvr_vm_get_fw_mem_context+0x0/0xc [powervr] +[ 92.879376] lr : pvr_queue_create+0x26c/0x440 [powervr] +[ 92.884595] sp : ffff8000837fbb00 +[ 92.887895] x29: ffff8000837fbb60 x28: 0000000000000000 x27: ffff8000837fbce8 +[ 92.895015] x26: ffff000807f61a40 x25: ffff000807f61a00 x24: ffff000807f64400 +[ 92.902135] x23: ffff00080a5ab000 x22: ffff800079b24730 x21: ffff000807f61800 +[ 92.909254] x20: ffff00080999e680 x19: 0000000000000000 x18: 0000000000000000 +[ 92.916373] x17: 0000000000000000 x16: 0000000000000000 x15: 0000000000000001 +[ 92.923492] x14: 0000000000000000 x13: 0000000000000002 x12: ffff80008145b298 +[ 92.930611] x11: ffff8000844e5000 x10: ffff80008165a130 x9 : 0000000000000100 +[ 92.937730] x8 : 0000000000000001 x7 : ffff0008076b27e0 x6 : ffff00080ec43b7c +[ 92.944850] x5 : ffff00080ec43b78 x4 : 0000000000000000 x3 : ffff00080999e680 +[ 92.951968] x2 : 0000000000000000 x1 : 0000000000000000 x0 : 0000000000000000 +[ 92.959088] Call trace: +[ 92.961521] pvr_vm_get_fw_mem_context+0x0/0xc [powervr] (P) +[ 92.967173] pvr_context_create+0x190/0x410 [powervr] +[ 92.972218] pvr_ioctl_create_context+0x44/0x8c [powervr] +[ 92.977608] drm_ioctl_kernel+0xbc/0x124 [drm] +[ 92.982127] drm_ioctl+0x1f8/0x4dc [drm] +[ 92.986098] __arm64_sys_ioctl+0xac/0x104 +[ 92.990102] invoke_syscall+0x54/0x10c +[ 92.993842] el0_svc_common.constprop.0+0x40/0xe0 +[ 92.998532] do_el0_svc+0x1c/0x28 +[ 93.001835] el0_svc+0x38/0x11c +[ 93.004969] el0t_64_sync_handler+0xa0/0xe4 +[ 93.009139] el0t_64_sync+0x198/0x19c +[ 93.012792] Code: aa1703e0 d2800014 95cb0ba4 17ffffe8 (f940a400) +[ 93.018869] ---[ end trace 0000000000000000 ]--- + +Fixes: d2d79d29bb98 ("drm/imagination: Implement context creation/destruction ioctls") +Cc: stable@vger.kernel.org +Signed-off-by: Luigi Santivetti +Reviewed-by: Alessio Belle +Link: https://patch.msgid.link/20260707-staging-ddkopsrc-2435-v1-1-24e160d44476@imgtec.com +Signed-off-by: Alessio Belle +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/imagination/pvr_context.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/imagination/pvr_context.c ++++ b/drivers/gpu/drm/imagination/pvr_context.c +@@ -309,8 +309,8 @@ int pvr_context_create(struct pvr_file * + goto err_free_ctx; + + ctx->vm_ctx = pvr_vm_context_lookup(pvr_file, args->vm_context_handle); +- if (IS_ERR(ctx->vm_ctx)) { +- err = PTR_ERR(ctx->vm_ctx); ++ if (!ctx->vm_ctx) { ++ err = -EINVAL; + goto err_free_ctx; + } + diff --git a/queue-6.18/drm-imagination-fix-user-array-stride-in-pvr_set_uobj_array.patch b/queue-6.18/drm-imagination-fix-user-array-stride-in-pvr_set_uobj_array.patch new file mode 100644 index 0000000000..1ce18f8017 --- /dev/null +++ b/queue-6.18/drm-imagination-fix-user-array-stride-in-pvr_set_uobj_array.patch @@ -0,0 +1,59 @@ +From 8dc8f3f4c2382fb7d1b1986ba8f33a2466cd3d7a Mon Sep 17 00:00:00 2001 +From: Shuvam Pandey +Date: Wed, 1 Jul 2026 11:44:34 -0700 +Subject: drm/imagination: Fix user array stride in pvr_set_uobj_array() + +From: Shuvam Pandey + +commit 8dc8f3f4c2382fb7d1b1986ba8f33a2466cd3d7a upstream. + +pvr_set_uobj_array() copies an array of kernel objects to a userspace +array whose element size is described by out->stride. When out->stride +is different from the kernel object size, the slow path advances the +userspace pointer by the kernel object size and the kernel pointer by the +userspace stride. + +This reverses the intended layout. For larger userspace strides, later +copies read from the wrong kernel addresses. For smaller userspace +strides, later copies are written at the wrong userspace offsets. The +padding clear is also done only for the first element instead of the +padding area for each element. + +Advance the userspace pointer by out->stride and the kernel pointer by +obj_size, and clear per-element padding while the current userspace +pointer is still available. + +Fixes: f99f5f3ea7ef ("drm/imagination: Add GPU ID parsing and firmware loading") +Cc: stable@vger.kernel.org # v6.8+ +Reviewed-by: Alessio Belle +Signed-off-by: Shuvam Pandey +Link: https://patch.msgid.link/6a456012.eb165e5c.113c2a.b71d@mx.google.com +Signed-off-by: Alessio Belle +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/imagination/pvr_drv.c | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +--- a/drivers/gpu/drm/imagination/pvr_drv.c ++++ b/drivers/gpu/drm/imagination/pvr_drv.c +@@ -1252,14 +1252,13 @@ pvr_set_uobj_array(const struct drm_pvr_ + if (copy_to_user(out_ptr, in_ptr, cpy_elem_size)) + return -EFAULT; + +- out_ptr += obj_size; +- in_ptr += out->stride; +- } ++ if (out->stride > obj_size && ++ clear_user(out_ptr + cpy_elem_size, out->stride - obj_size)) { ++ return -EFAULT; ++ } + +- if (out->stride > obj_size && +- clear_user(u64_to_user_ptr(out->array + obj_size), +- out->stride - obj_size)) { +- return -EFAULT; ++ out_ptr += out->stride; ++ in_ptr += obj_size; + } + } + diff --git a/queue-6.18/drm-xe-hold-a-dma-buf-reference-for-imported-bos.patch b/queue-6.18/drm-xe-hold-a-dma-buf-reference-for-imported-bos.patch new file mode 100644 index 0000000000..ab36e420db --- /dev/null +++ b/queue-6.18/drm-xe-hold-a-dma-buf-reference-for-imported-bos.patch @@ -0,0 +1,213 @@ +From 62775525a27c3b0d56382e08ba81ee2d322058b6 Mon Sep 17 00:00:00 2001 +From: Nitin Gote +Date: Sat, 11 Jul 2026 00:40:28 +0530 +Subject: 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 + +From: Nitin Gote + +commit 62775525a27c3b0d56382e08ba81ee2d322058b6 upstream. + +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/0xc0 + +This 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) + +Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/work_items/8023 +Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") +Cc: stable@vger.kernel.org +Cc: Thomas Hellstrom +Cc: Christian Konig +Cc: Matthew Auld +Suggested-by: Thomas Hellstrom +Assisted-by: GitHub_Copilot:claude-sonnet-4.6 +Reviewed-by: Thomas Hellström +Signed-off-by: Nitin Gote +Signed-off-by: Matthew Auld +Link: https://patch.msgid.link/20260710191027.260160-2-nitin.r.gote@intel.com +(cherry picked from commit 3516f3fae6be35642f8f06f8a218da6425c0306a) +Signed-off-by: Thomas Hellström +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/xe/xe_bo.c | 24 ++++++++++++++++++++---- + drivers/gpu/drm/xe/xe_bo.h | 3 ++- + drivers/gpu/drm/xe/xe_bo_types.h | 2 ++ + drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- + 4 files changed, 25 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/xe/xe_bo.c ++++ b/drivers/gpu/drm/xe/xe_bo.c +@@ -1186,7 +1186,7 @@ int xe_bo_notifier_prepare_pinned(struct + 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); +@@ -1327,7 +1327,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); +@@ -1675,6 +1675,8 @@ static void xe_ttm_bo_destroy(struct ttm + + 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)); +@@ -2092,6 +2094,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 +@@ -2103,7 +2107,8 @@ struct xe_bo *xe_bo_init_locked(struct x + 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, +@@ -2189,6 +2194,17 @@ struct xe_bo *xe_bo_init_locked(struct x + 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); +@@ -2303,7 +2319,7 @@ __xe_bo_create_locked(struct xe_device * + 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; + +--- a/drivers/gpu/drm/xe/xe_bo.h ++++ b/drivers/gpu/drm/xe/xe_bo.h +@@ -93,7 +93,8 @@ struct xe_bo *xe_bo_init_locked(struct x + 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, +--- a/drivers/gpu/drm/xe/xe_bo_types.h ++++ b/drivers/gpu/drm/xe/xe_bo_types.h +@@ -35,6 +35,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 */ +--- a/drivers/gpu/drm/xe/xe_dma_buf.c ++++ b/drivers/gpu/drm/xe/xe_dma_buf.c +@@ -251,7 +251,7 @@ xe_dma_buf_create_obj(struct drm_device + + 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); diff --git a/queue-6.18/series b/queue-6.18/series index 425e07c54b..fa455e8f2f 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -353,3 +353,12 @@ drm-nouveau-acr-fix-missing-nvkm_done-in-error-path-of-nvkm_acr_oneinit.patch drm-radeon-fix-r100_copy_blit-for-large-bos.patch drm-xe-return-error-on-non-migratable-faults-requiring-devmem.patch drm-xe-fix-pte-index-in-xe_vm_populate_pgtable-for-chunked-binds.patch +drm-xe-hold-a-dma-buf-reference-for-imported-bos.patch +drm-imagination-fix-double-call-to-drm_sched_entity_fini.patch +drm-imagination-fix-user-array-stride-in-pvr_set_uobj_array.patch +drm-imagination-fix-error-checking-of-pvr_vm_context_lookup.patch +drm-imagination-acquire-vm_ctx-lock-before-mapping-memory-to-gpu-vm.patch +drm-amdkfd-use-kvcalloc-to-allocate-arrays.patch +drm-amdkfd-check-bounds-in-allocate_event_notification_slot.patch +drm-amdkfd-check-bounds-on-criu-restore-queue-type-and-mqd-size.patch +drm-amdkfd-fix-32-bit-overflow-in-cwsr-total-size-calculation.patch