tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe/exec_queue: Rename xe_exec_queue::compute to xe_exec_queue::lr

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2084225

[ Upstream commit 731e46c032281601756f08cfa7d8505fe41166a9 ]

The properties of this struct are used in long running context so
make that clear by renaming it to lr, in alignment with the rest
of the code.

Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240613170348.723245-1-francois.dugast@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Stable-dep-of: 730b72480e29 ("drm/xe: prevent UAF around preempt fence")
Signed-off-by: Sasha Levin <sashal@kernel.org>
[koichiroden: Adjusted context due to missing commit:
6240c2c43fd0 ("drm/xe: Document nested struct members according to guidelines")]
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Francois Dugast
2024-06-13 19:03:48 +02:00
committed by Mehmet Basaran
parent ee64e3eaa3
commit 7540cd4932
4 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/xe/xe_exec_queue.c
+3 -3
View File
@@ -60,7 +60,7 @@ static struct xe_exec_queue *__xe_exec_queue_create(struct xe_device *xe,
q->fence_irq = &gt->fence_irq[hwe->class];
q->ring_ops = gt->ring_ops[hwe->class];
q->ops = gt->exec_queue_ops;
INIT_LIST_HEAD(&q->compute.link);
INIT_LIST_HEAD(&q->lr.link);
INIT_LIST_HEAD(&q->multi_gt_link);
q->sched_props.timeslice_us = hwe->eclass->sched_props.timeslice_us;
@@ -615,8 +615,8 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data,
return PTR_ERR(q);
if (xe_vm_in_preempt_fence_mode(vm)) {
q->compute.context = dma_fence_context_alloc(1);
spin_lock_init(&q->compute.lock);
q->lr.context = dma_fence_context_alloc(1);
spin_lock_init(&q->lr.lock);
err = xe_vm_add_compute_exec_queue(vm, q);
if (XE_IOCTL_DBG(xe, err))
drivers/gpu/drm/xe/xe_exec_queue_types.h
+2 -2
View File
@@ -138,7 +138,7 @@ struct xe_exec_queue {
enum xe_exec_queue_priority priority;
} sched_props;
/** @compute: compute exec queue state */
/** @lr: long-running exec queue state */
struct {
/** @pfence: preemption fence */
struct dma_fence *pfence;
@@ -150,7 +150,7 @@ struct xe_exec_queue {
struct list_head link;
/** @lock: preemption fences lock */
spinlock_t lock;
} compute;
} lr;
/** @ops: submission backend exec queue operations */
const struct xe_exec_queue_ops *ops;
drivers/gpu/drm/xe/xe_preempt_fence.c
+1 -1
View File
@@ -129,7 +129,7 @@ xe_preempt_fence_arm(struct xe_preempt_fence *pfence, struct xe_exec_queue *q,
list_del_init(&pfence->link);
pfence->q = xe_exec_queue_get(q);
dma_fence_init(&pfence->base, &preempt_fence_ops,
&q->compute.lock, context, seqno);
&q->lr.lock, context, seqno);
return &pfence->base;
}
drivers/gpu/drm/xe/xe_vm.c
+29 -29
View File
@@ -179,10 +179,10 @@ static bool preempt_fences_waiting(struct xe_vm *vm)
lockdep_assert_held(&vm->lock);
xe_vm_assert_held(vm);
list_for_each_entry(q, &vm->preempt.exec_queues, compute.link) {
if (!q->compute.pfence ||
list_for_each_entry(q, &vm->preempt.exec_queues, lr.link) {
if (!q->lr.pfence ||
test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,
&q->compute.pfence->flags)) {
&q->lr.pfence->flags)) {
return true;
}
}
@@ -225,14 +225,14 @@ static int wait_for_existing_preempt_fences(struct xe_vm *vm)
xe_vm_assert_held(vm);
list_for_each_entry(q, &vm->preempt.exec_queues, compute.link) {
if (q->compute.pfence) {
long timeout = dma_fence_wait(q->compute.pfence, false);
list_for_each_entry(q, &vm->preempt.exec_queues, lr.link) {
if (q->lr.pfence) {
long timeout = dma_fence_wait(q->lr.pfence, false);
if (timeout < 0)
return -ETIME;
dma_fence_put(q->compute.pfence);
q->compute.pfence = NULL;
dma_fence_put(q->lr.pfence);
q->lr.pfence = NULL;
}
}
@@ -244,7 +244,7 @@ static bool xe_vm_is_idle(struct xe_vm *vm)
struct xe_exec_queue *q;
xe_vm_assert_held(vm);
list_for_each_entry(q, &vm->preempt.exec_queues, compute.link) {
list_for_each_entry(q, &vm->preempt.exec_queues, lr.link) {
if (!xe_exec_queue_is_idle(q))
return false;
}
@@ -257,17 +257,17 @@ static void arm_preempt_fences(struct xe_vm *vm, struct list_head *list)
struct list_head *link;
struct xe_exec_queue *q;
list_for_each_entry(q, &vm->preempt.exec_queues, compute.link) {
list_for_each_entry(q, &vm->preempt.exec_queues, lr.link) {
struct dma_fence *fence;
link = list->next;
xe_assert(vm->xe, link != list);
fence = xe_preempt_fence_arm(to_preempt_fence_from_link(link),
q, q->compute.context,
++q->compute.seqno);
dma_fence_put(q->compute.pfence);
q->compute.pfence = fence;
q, q->lr.context,
++q->lr.seqno);
dma_fence_put(q->lr.pfence);
q->lr.pfence = fence;
}
}
@@ -287,10 +287,10 @@ static int add_preempt_fences(struct xe_vm *vm, struct xe_bo *bo)
if (err)
goto out_unlock;
list_for_each_entry(q, &vm->preempt.exec_queues, compute.link)
if (q->compute.pfence) {
list_for_each_entry(q, &vm->preempt.exec_queues, lr.link)
if (q->lr.pfence) {
dma_resv_add_fence(bo->ttm.base.resv,
q->compute.pfence,
q->lr.pfence,
DMA_RESV_USAGE_BOOKKEEP);
}
@@ -307,10 +307,10 @@ static void resume_and_reinstall_preempt_fences(struct xe_vm *vm,
lockdep_assert_held(&vm->lock);
xe_vm_assert_held(vm);
list_for_each_entry(q, &vm->preempt.exec_queues, compute.link) {
list_for_each_entry(q, &vm->preempt.exec_queues, lr.link) {
q->ops->resume(q);
drm_gpuvm_resv_add_fence(&vm->gpuvm, exec, q->compute.pfence,
drm_gpuvm_resv_add_fence(&vm->gpuvm, exec, q->lr.pfence,
DMA_RESV_USAGE_BOOKKEEP, DMA_RESV_USAGE_BOOKKEEP);
}
}
@@ -334,16 +334,16 @@ int xe_vm_add_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
if (err)
goto out_up_write;
pfence = xe_preempt_fence_create(q, q->compute.context,
++q->compute.seqno);
pfence = xe_preempt_fence_create(q, q->lr.context,
++q->lr.seqno);
if (!pfence) {
err = -ENOMEM;
goto out_fini;
}
list_add(&q->compute.link, &vm->preempt.exec_queues);
list_add(&q->lr.link, &vm->preempt.exec_queues);
++vm->preempt.num_exec_queues;
q->compute.pfence = pfence;
q->lr.pfence = pfence;
down_read(&vm->userptr.notifier_lock);
@@ -380,12 +380,12 @@ void xe_vm_remove_compute_exec_queue(struct xe_vm *vm, struct xe_exec_queue *q)
return;
down_write(&vm->lock);
list_del(&q->compute.link);
list_del(&q->lr.link);
--vm->preempt.num_exec_queues;
if (q->compute.pfence) {
dma_fence_enable_sw_signaling(q->compute.pfence);
dma_fence_put(q->compute.pfence);
q->compute.pfence = NULL;
if (q->lr.pfence) {
dma_fence_enable_sw_signaling(q->lr.pfence);
dma_fence_put(q->lr.pfence);
q->lr.pfence = NULL;
}
up_write(&vm->lock);
}
@@ -421,7 +421,7 @@ static void xe_vm_kill(struct xe_vm *vm)
vm->flags |= XE_VM_FLAG_BANNED;
trace_xe_vm_kill(vm);
list_for_each_entry(q, &vm->preempt.exec_queues, compute.link)
list_for_each_entry(q, &vm->preempt.exec_queues, lr.link)
q->ops->kill(q);
xe_vm_unlock(vm);