Commit edd11922 authored by Philip Yang's avatar Philip Yang Committed by Alex Deucher
Browse files

drm/amdkfd: Handle drain retry fault race with XNACK mode change 



Application could change XNACK enabled to disabled while KFD is draining
stale retry fault, therefore the check for whether to drain retry faults
must be before the check for whether xnack_enabled, to avoid report
incorrect vm fault after application changes XNACK mode.

Signed-off-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73bce7a4

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

+6 −5
Original line number Diff line number Diff line
@@ -2685,11 +2685,6 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid, 
		pr_debug("kfd process not founded pasid 0x%x\n", pasid);

		return 0;

	}

	if (!p->xnack_enabled) {

		pr_debug("XNACK not enabled for pasid 0x%x\n", pasid);

		r = -EFAULT;

		goto out;

	}

	svms = &p->svms;



	pr_debug("restoring svms 0x%p fault address 0x%llx\n", svms, addr);
@@ -2700,6 +2695,12 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid, 
		goto out;

	}



	if (!p->xnack_enabled) {

		pr_debug("XNACK not enabled for pasid 0x%x\n", pasid);

		r = -EFAULT;

		goto out;

	}



	/* p->lead_thread is available as kfd_process_wq_release flush the work

	 * before releasing task ref.

	 */