Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d75a30 authored by jimqu's avatar jimqu Committed by Alex Deucher
Browse files

drm/amdgpu: add spin lock to protect freed list in vm (v2) 



there is a protection fault about freed list when OCL test.
add a spin lock to protect it.

v2: drop changes in vm_fini

Signed-off-by: default avatarJimQu <jim.qu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 9c97b5ab

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

+2 −0
Original line number Diff line number Diff line
@@ -956,6 +956,8 @@ struct amdgpu_vm { 
	struct amdgpu_vm_id	ids[AMDGPU_MAX_RINGS];

	/* for interval tree */

	spinlock_t		it_lock;

	/* protecting freed */

	spinlock_t		freed_lock;

};



struct amdgpu_vm_manager {

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

+13 −3
Original line number Diff line number Diff line
@@ -885,17 +885,21 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, 
	struct amdgpu_bo_va_mapping *mapping;

	int r;



	spin_lock(&vm->freed_lock);

	while (!list_empty(&vm->freed)) {

		mapping = list_first_entry(&vm->freed,

			struct amdgpu_bo_va_mapping, list);

		list_del(&mapping->list);



		spin_unlock(&vm->freed_lock);

		r = amdgpu_vm_bo_update_mapping(adev, vm, mapping, 0, 0, NULL);

		kfree(mapping);

		if (r)

			return r;



		spin_lock(&vm->freed_lock);

	}

	spin_unlock(&vm->freed_lock);



	return 0;



}
@@ -1155,10 +1159,13 @@ int amdgpu_vm_bo_unmap(struct amdgpu_device *adev, 
	spin_unlock(&vm->it_lock);

	trace_amdgpu_vm_bo_unmap(bo_va, mapping);



	if (valid)

	if (valid) {

		spin_lock(&vm->freed_lock);

		list_add(&mapping->list, &vm->freed);

	else

		spin_unlock(&vm->freed_lock);

	} else {

		kfree(mapping);

	}



	return 0;

}
@@ -1191,7 +1198,9 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev, 
		interval_tree_remove(&mapping->it, &vm->va);

		spin_unlock(&vm->it_lock);

		trace_amdgpu_vm_bo_unmap(bo_va, mapping);

		spin_lock(&vm->freed_lock);

		list_add(&mapping->list, &vm->freed);

		spin_unlock(&vm->freed_lock);

	}

	list_for_each_entry_safe(mapping, next, &bo_va->invalids, list) {

		list_del(&mapping->list);
@@ -1252,6 +1261,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) 
	INIT_LIST_HEAD(&vm->cleared);

	INIT_LIST_HEAD(&vm->freed);

	spin_lock_init(&vm->it_lock);

	spin_lock_init(&vm->freed_lock);

	pd_size = amdgpu_vm_directory_size(adev);

	pd_entries = amdgpu_vm_num_pdes(adev);