Commit c147ddc6 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdkfd: Fix sparse __rcu annotation warnings 



Properly mark kfd_process->ef as __rcu and consistently use the right
accessor functions.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202312052245.yFpBSgNH-lkp@intel.com/


Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2a9de42e

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

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ void amdgpu_amdkfd_gpuvm_unmap_gtt_bo_from_kernel(struct kgd_mem *mem); 
int amdgpu_amdkfd_map_gtt_bo_to_gart(struct amdgpu_device *adev, struct amdgpu_bo *bo);



int amdgpu_amdkfd_gpuvm_restore_process_bos(void *process_info,

					    struct dma_fence **ef);

					    struct dma_fence __rcu **ef);

int amdgpu_amdkfd_gpuvm_get_vm_fault_info(struct amdgpu_device *adev,

					      struct kfd_vm_fault_info *info);

int amdgpu_amdkfd_gpuvm_import_dmabuf_fd(struct amdgpu_device *adev, int fd,

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

+2 −2
Original line number Diff line number Diff line
@@ -2802,7 +2802,7 @@ static void amdgpu_amdkfd_restore_userptr_worker(struct work_struct *work) 
	put_task_struct(usertask);

}



static void replace_eviction_fence(struct dma_fence **ef,

static void replace_eviction_fence(struct dma_fence __rcu **ef,

				   struct dma_fence *new_ef)

{

	struct dma_fence *old_ef = rcu_replace_pointer(*ef, new_ef, true
@@ -2837,7 +2837,7 @@ static void replace_eviction_fence(struct dma_fence **ef, 
 * 7.  Add fence to all PD and PT BOs.

 * 8.  Unreserve all BOs

 */

int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef)

int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence __rcu **ef)

{

	struct amdkfd_process_info *process_info = info;

	struct amdgpu_vm *peer_vm;

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ struct kfd_process { 
	 * fence will be triggered during eviction and new one will be created

	 * during restore

	 */

	struct dma_fence *ef;

	struct dma_fence __rcu *ef;



	/* Work items for evicting and restoring BOs */

	struct delayed_work eviction_work;

drivers/gpu/drm/amd/amdkfd/kfd_process.c

+5 −2
Original line number Diff line number Diff line
@@ -1110,6 +1110,7 @@ static void kfd_process_wq_release(struct work_struct *work) 
{

	struct kfd_process *p = container_of(work, struct kfd_process,

					     release_work);

	struct dma_fence *ef;



	kfd_process_dequeue_from_all_devices(p);

	pqm_uninit(&p->pqm);
@@ -1118,7 +1119,9 @@ static void kfd_process_wq_release(struct work_struct *work) 
	 * destroyed. This allows any BOs to be freed without

	 * triggering pointless evictions or waiting for fences.

	 */

	dma_fence_signal(p->ef);

	synchronize_rcu();

	ef = rcu_access_pointer(p->ef);

	dma_fence_signal(ef);



	kfd_process_remove_sysfs(p);
@@ -1127,7 +1130,7 @@ static void kfd_process_wq_release(struct work_struct *work) 
	svm_range_list_fini(p);



	kfd_process_destroy_pdds(p);

	dma_fence_put(p->ef);

	dma_fence_put(ef);



	kfd_event_free_process(p);