Commit 256576ed authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Arunpravin Paneer Selvam
Browse files

drm/amdgpu: give each kernel job a unique id 



Userspace jobs have drm_file.client_id as a unique identifier
as job's owners. For kernel jobs, we can allocate arbitrary
values - the risk of overlap with userspace ids is small (given
that it's a u64 value).
In the unlikely case the overlap happens, it'll only impact
trace events.

Since this ID is traced in the gpu_scheduler trace events, this
allows to determine the source of each job sent to the hardware.

To make grepping easier, the IDs are defined as they will appear
in the trace output.

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarArunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Link: https://lore.kernel.org/r/20250604122827.2191-1-pierre-eric.pelloux-prayer@amd.com
parent f3e82936

drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c

+2 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,8 @@ static int amdgpu_gfx_run_cleaner_shader_job(struct amdgpu_ring *ring) 
	owner = (void *)(unsigned long)atomic_inc_return(&counter);



	r = amdgpu_job_alloc_with_ib(ring->adev, &entity, owner,

				     64, 0, &job);

				     64, 0, &job,

				     AMDGPU_KERNEL_JOB_ID_CLEANER_SHADER);

	if (r)

		goto err;

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ void amdgpu_gmc_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid, 
	r = amdgpu_job_alloc_with_ib(ring->adev, &adev->mman.high_pr,

				     AMDGPU_FENCE_OWNER_UNDEFINED,

				     16 * 4, AMDGPU_IB_POOL_IMMEDIATE,

				     &job);

				     &job, AMDGPU_KERNEL_JOB_ID_FLUSH_GPU_TLB);

	if (r)

		goto error_alloc;

drivers/gpu/drm/amd/amdgpu/amdgpu_job.c

+3 −2
Original line number Diff line number Diff line
@@ -209,11 +209,12 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev,

			     struct drm_sched_entity *entity, void *owner,

			     size_t size, enum amdgpu_ib_pool_type pool_type,

			     struct amdgpu_job **job)

			     struct amdgpu_job **job, u64 k_job_id)

{

	int r;



	r = amdgpu_job_alloc(adev, NULL, entity, owner, 1, job, 0);

	r = amdgpu_job_alloc(adev, NULL, entity, owner, 1, job,

			     k_job_id);

	if (r)

		return r;

drivers/gpu/drm/amd/amdgpu/amdgpu_job.h

+18 −1
Original line number Diff line number Diff line
@@ -44,6 +44,22 @@ 
struct amdgpu_fence;

enum amdgpu_ib_pool_type;



/* Internal kernel job ids. (decreasing values, starting from U64_MAX). */

#define AMDGPU_KERNEL_JOB_ID_VM_UPDATE              (18446744073709551615ULL)

#define AMDGPU_KERNEL_JOB_ID_VM_UPDATE_PDES         (18446744073709551614ULL)

#define AMDGPU_KERNEL_JOB_ID_VM_UPDATE_RANGE        (18446744073709551613ULL)

#define AMDGPU_KERNEL_JOB_ID_VM_PT_CLEAR            (18446744073709551612ULL)

#define AMDGPU_KERNEL_JOB_ID_TTM_MAP_BUFFER         (18446744073709551611ULL)

#define AMDGPU_KERNEL_JOB_ID_TTM_ACCESS_MEMORY_SDMA (18446744073709551610ULL)

#define AMDGPU_KERNEL_JOB_ID_TTM_COPY_BUFFER        (18446744073709551609ULL)

#define AMDGPU_KERNEL_JOB_ID_CLEAR_ON_RELEASE       (18446744073709551608ULL)

#define AMDGPU_KERNEL_JOB_ID_MOVE_BLIT              (18446744073709551607ULL)

#define AMDGPU_KERNEL_JOB_ID_TTM_CLEAR_BUFFER       (18446744073709551606ULL)

#define AMDGPU_KERNEL_JOB_ID_CLEANER_SHADER         (18446744073709551605ULL)

#define AMDGPU_KERNEL_JOB_ID_FLUSH_GPU_TLB          (18446744073709551604ULL)

#define AMDGPU_KERNEL_JOB_ID_KFD_GART_MAP           (18446744073709551603ULL)

#define AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST          (18446744073709551602ULL)



struct amdgpu_job {

	struct drm_sched_job    base;

	struct amdgpu_vm	*vm;
@@ -96,7 +112,8 @@ int amdgpu_job_alloc(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
int amdgpu_job_alloc_with_ib(struct amdgpu_device *adev,

			     struct drm_sched_entity *entity, void *owner,

			     size_t size, enum amdgpu_ib_pool_type pool_type,

			     struct amdgpu_job **job);

			     struct amdgpu_job **job,

			     u64 k_job_id);

void amdgpu_job_set_resources(struct amdgpu_job *job, struct amdgpu_bo *gds,

			      struct amdgpu_bo *gws, struct amdgpu_bo *oa);

void amdgpu_job_free_resources(struct amdgpu_job *job);

drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c

+2 −1
Original line number Diff line number Diff line
@@ -194,7 +194,8 @@ static int amdgpu_jpeg_dec_set_reg(struct amdgpu_ring *ring, uint32_t handle, 
	int i, r;



	r = amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, ib_size_dw * 4,

				     AMDGPU_IB_POOL_DIRECT, &job);

				     AMDGPU_IB_POOL_DIRECT, &job,

				     AMDGPU_KERNEL_JOB_ID_VCN_RING_TEST);

	if (r)

		return r;