Unverified Commit f428bab7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11718 CVE-2024-41008 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongqiang Liu <liuyongqiang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YNLQREY37TSW65CZB2KA5XBPQPYJYT3Y/ 
Shashank Sharma (1):
  drm/amdgpu: change vm->task_info handling


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IADDFV 
 
Link:https://gitee.com/openeuler/kernel/pulls/11718

 

Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents f648601a 4a00d781

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

+7 −2
Original line number Diff line number Diff line
@@ -1775,9 +1775,14 @@ static int amdgpu_debugfs_vm_info_show(struct seq_file *m, void *unused) 
	list_for_each_entry(file, &dev->filelist, lhead) {

		struct amdgpu_fpriv *fpriv = file->driver_priv;

		struct amdgpu_vm *vm = &fpriv->vm;

		struct amdgpu_task_info *ti;



		ti = amdgpu_vm_get_task_info_vm(vm);

		if (ti) {

			seq_printf(m, "pid:%d\tProcess:%s ----------\n", ti->pid, ti->process_name);

			amdgpu_vm_put_task_info(ti);

		}



		seq_printf(m, "pid:%d\tProcess:%s ----------\n",

				vm->task_info.pid, vm->task_info.process_name);

		r = amdgpu_bo_reserve(vm->root.bo, true);

		if (r)

			break;

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

+10 −3
Original line number Diff line number Diff line
@@ -4980,9 +4980,16 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle, 
				tmp_adev->reset_vram_lost = vram_lost;

				memset(&tmp_adev->reset_task_info, 0,

						sizeof(tmp_adev->reset_task_info));

				if (reset_context->job && reset_context->job->vm)

					tmp_adev->reset_task_info =

						reset_context->job->vm->task_info;

				if (reset_context->job && reset_context->job->vm) {

					struct amdgpu_task_info *ti;

					struct amdgpu_vm *vm = reset_context->job->vm;



					ti = amdgpu_vm_get_task_info_vm(vm);

					if (ti) {

						tmp_adev->reset_task_info = *ti;

						amdgpu_vm_put_task_info(ti);

					}

				}

				amdgpu_reset_capture_coredumpm(tmp_adev);

#endif

				if (vram_lost) {

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

+11 −7
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
{

	struct amdgpu_ring *ring = to_amdgpu_ring(s_job->sched);

	struct amdgpu_job *job = to_amdgpu_job(s_job);

	struct amdgpu_task_info ti;

	struct amdgpu_task_info *ti;

	struct amdgpu_device *adev = ring->adev;

	int idx;

	int r;
@@ -48,7 +48,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
		return DRM_GPU_SCHED_STAT_ENODEV;

	}



	memset(&ti, 0, sizeof(struct amdgpu_task_info));



	adev->job_hang = true;



	if (amdgpu_gpu_recovery &&
@@ -58,12 +58,16 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
		goto exit;

	}



	amdgpu_vm_get_task_info(ring->adev, job->pasid, &ti);

	DRM_ERROR("ring %s timeout, signaled seq=%u, emitted seq=%u\n",

		   job->base.sched->name, atomic_read(&ring->fence_drv.last_seq),

		   ring->fence_drv.sync_seq);



	ti = amdgpu_vm_get_task_info_pasid(ring->adev, job->pasid);

	if (ti) {

		DRM_ERROR("Process information: process %s pid %d thread %s pid %d\n",

		  ti.process_name, ti.tgid, ti.task_name, ti.pid);

			  ti->process_name, ti->tgid, ti->task_name, ti->pid);

		amdgpu_vm_put_task_info(ti);

	}



	dma_fence_set_error(&s_job->s_fence->finished, -ETIME);

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

+107 −42
Original line number Diff line number Diff line
@@ -2135,6 +2135,108 @@ long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout) 
	return dma_fence_wait_timeout(vm->last_unlocked, true, timeout);

}



static void amdgpu_vm_destroy_task_info(struct kref *kref)

{

	struct amdgpu_task_info *ti = container_of(kref, struct amdgpu_task_info, refcount);



	kfree(ti);

}



static inline struct amdgpu_vm *

amdgpu_vm_get_vm_from_pasid(struct amdgpu_device *adev, u32 pasid)

{

	struct amdgpu_vm *vm;

	unsigned long flags;



	xa_lock_irqsave(&adev->vm_manager.pasids, flags);

	vm = xa_load(&adev->vm_manager.pasids, pasid);

	xa_unlock_irqrestore(&adev->vm_manager.pasids, flags);



	return vm;

}



/**

 * amdgpu_vm_put_task_info - reference down the vm task_info ptr

 *

 * @task_info: task_info struct under discussion.

 *

 * frees the vm task_info ptr at the last put

 */

void amdgpu_vm_put_task_info(struct amdgpu_task_info *task_info)

{

	kref_put(&task_info->refcount, amdgpu_vm_destroy_task_info);

}



/**

 * amdgpu_vm_get_task_info_vm - Extracts task info for a vm.

 *

 * @vm: VM to get info from

 *

 * Returns the reference counted task_info structure, which must be

 * referenced down with amdgpu_vm_put_task_info.

 */

struct amdgpu_task_info *

amdgpu_vm_get_task_info_vm(struct amdgpu_vm *vm)

{

	struct amdgpu_task_info *ti = NULL;



	if (vm) {

		ti = vm->task_info;

		kref_get(&vm->task_info->refcount);

	}



	return ti;

}



/**

 * amdgpu_vm_get_task_info_pasid - Extracts task info for a PASID.

 *

 * @adev: drm device pointer

 * @pasid: PASID identifier for VM

 *

 * Returns the reference counted task_info structure, which must be

 * referenced down with amdgpu_vm_put_task_info.

 */

struct amdgpu_task_info *

amdgpu_vm_get_task_info_pasid(struct amdgpu_device *adev, u32 pasid)

{

	return amdgpu_vm_get_task_info_vm(

			amdgpu_vm_get_vm_from_pasid(adev, pasid));

}



static int amdgpu_vm_create_task_info(struct amdgpu_vm *vm)

{

	vm->task_info = kzalloc(sizeof(struct amdgpu_task_info), GFP_KERNEL);

	if (!vm->task_info)

		return -ENOMEM;



	kref_init(&vm->task_info->refcount);

	return 0;

}



/**

 * amdgpu_vm_set_task_info - Sets VMs task info.

 *

 * @vm: vm for which to set the info

 */

void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)

{

	if (!vm->task_info)

		return;



	if (vm->task_info->pid == current->pid)

		return;



	vm->task_info->pid = current->pid;

	get_task_comm(vm->task_info->task_name, current);



	if (current->group_leader->mm != current->mm)

		return;



	vm->task_info->tgid = current->group_leader->pid;

	get_task_comm(vm->task_info->process_name, current->group_leader);

}



/**

 * amdgpu_vm_init - initialize a vm instance

 *
@@ -2220,6 +2322,10 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	if (r)

		goto error_free_root;



	r = amdgpu_vm_create_task_info(vm);

	if (r)

		DRM_DEBUG("Failed to create task info for VM\n");



	amdgpu_bo_unreserve(vm->root.bo);

	amdgpu_bo_unref(&root_bo);
@@ -2359,6 +2465,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm) 


	root = amdgpu_bo_ref(vm->root.bo);

	amdgpu_bo_reserve(root, true);

	amdgpu_vm_put_task_info(vm->task_info);

	amdgpu_vm_set_pasid(adev, vm, 0);

	dma_fence_wait(vm->last_unlocked, false);

	dma_fence_put(vm->last_unlocked);
@@ -2515,48 +2622,6 @@ int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
	return 0;

}



/**

 * amdgpu_vm_get_task_info - Extracts task info for a PASID.

 *

 * @adev: drm device pointer

 * @pasid: PASID identifier for VM

 * @task_info: task_info to fill.

 */

void amdgpu_vm_get_task_info(struct amdgpu_device *adev, u32 pasid,

			 struct amdgpu_task_info *task_info)

{

	struct amdgpu_vm *vm;

	unsigned long flags;



	xa_lock_irqsave(&adev->vm_manager.pasids, flags);



	vm = xa_load(&adev->vm_manager.pasids, pasid);

	if (vm)

		*task_info = vm->task_info;



	xa_unlock_irqrestore(&adev->vm_manager.pasids, flags);

}



/**

 * amdgpu_vm_set_task_info - Sets VMs task info.

 *

 * @vm: vm for which to set the info

 */

void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)

{

	if (vm->task_info.pid)

		return;



	vm->task_info.pid = current->pid;

	get_task_comm(vm->task_info.task_name, current);



	if (current->group_leader->mm != current->mm)

		return;



	vm->task_info.tgid = current->group_leader->pid;

	get_task_comm(vm->task_info.process_name, current->group_leader);

}



/**

 * amdgpu_vm_handle_fault - graceful handling of VM faults.

 * @adev: amdgpu device pointer

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

+14 −7
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ struct amdgpu_task_info { 
	char		task_name[TASK_COMM_LEN];

	pid_t		pid;

	pid_t		tgid;

	struct kref	refcount;

};



/**
@@ -334,7 +335,7 @@ struct amdgpu_vm { 
	uint64_t		pd_phys_addr;



	/* Some basic info about the task */

	struct amdgpu_task_info task_info;

	struct amdgpu_task_info *task_info;



	/* Store positions of group of BOs */

	struct ttm_lru_bulk_move lru_bulk_move;
@@ -466,8 +467,14 @@ bool amdgpu_vm_need_pipeline_sync(struct amdgpu_ring *ring, 
				  struct amdgpu_job *job);

void amdgpu_vm_check_compute_bug(struct amdgpu_device *adev);



void amdgpu_vm_get_task_info(struct amdgpu_device *adev, u32 pasid,

			     struct amdgpu_task_info *task_info);

struct amdgpu_task_info *

amdgpu_vm_get_task_info_pasid(struct amdgpu_device *adev, u32 pasid);



struct amdgpu_task_info *

amdgpu_vm_get_task_info_vm(struct amdgpu_vm *vm);



void amdgpu_vm_put_task_info(struct amdgpu_task_info *task_info);



bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid,

			    u32 vmid, u32 node_id, uint64_t addr,

			    bool write_fault);