niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/xe: Take memory ref on kernel job creation

Browse source 
When a job is inflight we may access memory to read the hardware seqno.
All user jobs have VM open which has a ref but kernel jobs do not
require VM so it is possible to not have memory ref. To avoid this, take
a memory ref on kernel job creation.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Matthew Brost 2023-01-12 17:25:14 -05:00 • committed by Rodrigo Vivi
parent e9d285ff9d
commit 765b65e5bd
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/gpu/drm/xe/xe_sched_job.c
View file

@ -8,7 +8,7 @@
#include <linux/dma-fence-array.h> #include <linux/dma-fence-array.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "xe_device_types.h" #include "xe_device.h"
#include "xe_engine.h" #include "xe_engine.h"
#include "xe_gt.h" #include "xe_gt.h"
#include "xe_hw_engine_types.h" #include "xe_hw_engine_types.h"
@ -72,6 +72,11 @@ static void job_free(struct xe_sched_job *job)
xe_sched_job_parallel_slab : xe_sched_job_slab, job); xe_sched_job_parallel_slab : xe_sched_job_slab, job);
} }
static struct xe_device *job_to_xe(struct xe_sched_job *job)
{
return gt_to_xe(job->engine->gt);
}
struct xe_sched_job *xe_sched_job_create(struct xe_engine *e, struct xe_sched_job *xe_sched_job_create(struct xe_engine *e,
u64 *batch_addr) u64 *batch_addr)
{ {
@ -149,6 +154,11 @@ struct xe_sched_job *xe_sched_job_create(struct xe_engine *e,
for (i = 0; i < width; ++i) for (i = 0; i < width; ++i)
job->batch_addr[i] = batch_addr[i]; job->batch_addr[i] = batch_addr[i];
/* All other jobs require a VM to be open which has a ref */
if (unlikely(e->flags & ENGINE_FLAG_KERNEL))
xe_device_mem_access_get(job_to_xe(job));
xe_device_assert_mem_access(job_to_xe(job));
trace_xe_sched_job_create(job); trace_xe_sched_job_create(job);
return job; return job;
@ -178,6 +188,8 @@ void xe_sched_job_destroy(struct kref *ref)
struct xe_sched_job *job = struct xe_sched_job *job =
container_of(ref, struct xe_sched_job, refcount); container_of(ref, struct xe_sched_job, refcount);
if (unlikely(job->engine->flags & ENGINE_FLAG_KERNEL))
xe_device_mem_access_put(job_to_xe(job));
xe_engine_put(job->engine); xe_engine_put(job->engine);
dma_fence_put(job->fence); dma_fence_put(job->fence);
drm_sched_job_cleanup(&job->drm); drm_sched_job_cleanup(&job->drm);