drm/amdkfd: move kfd_flush_tlb_after_unmap into kfd_priv.h
Subsystems (3)
PATCH 1/2 drm/amdkfd: move kfd_flush_tlb_after_unmap into kfd_priv.h
To make kfd_flush_tlb_after_unmap visible in kfd_svm.c, move it into kfd_priv.h. And change it to an inline function.
Signed-off-by Lang Yu <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 8 -------- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +0 -8
@@ -1128,14 +1128,6 @@ static int kfd_ioctl_free_memory_of_gpu(struct file *filep,return ret; } -static bool kfd_flush_tlb_after_unmap (struct kfd_dev *dev) -{ -return KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,2 ) || - (KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,1 ) && - dev->adev->sdma.instance[0 ].fw_version >=18 ) || -KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,0 ); -} -static int kfd_ioctl_map_memory_to_gpu (struct file *filep,struct kfd_process *p,void *data) {
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +8 -0
@@ -1328,6 +1328,14 @@ void kfd_signal_poison_consumed_event(struct kfd_dev *dev, u32 pasid);void kfd_flush_tlb (struct kfd_process_device *pdd,enum TLB_FLUSH_TYPE type); +static inline bool kfd_flush_tlb_after_unmap (struct kfd_dev *dev) +{ +return KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,2 ) || + (KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,1 ) && + dev->adev->sdma.instance[0 ].fw_version >=18 ) || +KFD_GC_VERSION (dev) ==IP_VERSION (9 ,4 ,0 ); +} +bool kfd_is_locked (void );/* Compute profile */
Signature · 1 line
2.25.1
PATCH 2/2 drm/amdkfd: only allow heavy-weight TLB flush on some ASICs for SVM too
The idea is from commit a50fe7078035 ("drm/amdkfd: Only apply heavy-weight TLB flush on Aldebaran") and commit f61c40c0757a ("drm/amdkfd: enable heavy-weight TLB flush on Arcturus").
At the moment, heavy-weight TLB could cause problems on ASICs except Aldebaran and Arcturus.
A simple hipMallocManaged/hipFree program could trigger this issue.
[ 97.787657] amdgpu 0000:01:00.0: amdgpu: wait for kiq fence error: 0. [ 106.868758] amdgpu: qcm fence wait loop timeout expired [ 106.868966] amdgpu: The cp might be in an unrecoverable state due to an unsuccessful queues preemption [ 106.869203] amdgpu: Failed to evict process queues [ 106.869261] amdgpu: Failed to quiesce KFD
Signed-off-by Lang Yu <[email protected]>
Reviewed-by Felix Kuehling <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +3 -1
@@ -1229,7 +1229,9 @@ svm_range_unmap_from_gpus(struct svm_range *prange, unsigned long start,if (r)break ; } -kfd_flush_tlb (pdd,TLB_FLUSH_HEAVYWEIGHT ); + +if (kfd_flush_tlb_after_unmap (pdd->dev)) +kfd_flush_tlb (pdd,TLB_FLUSH_HEAVYWEIGHT ); }return r;
Signature · 1 line
2.25.1