[PATCH 1/2] Revert "drm/amdkfd: flush TLB after updating GPU page table"

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/2] Revert "drm/amdkfd: flush TLB after updating GPU page table"
@ 2021-05-13 16:58 Philip Yang
  2021-05-13 16:58 ` [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap Philip Yang
  0 siblings, 1 reply; 7+ messages in thread
From: Philip Yang @ 2021-05-13 16:58 UTC (permalink / raw)
  To: amd-gfx; +Cc: Philip Yang

This reverts commit bcbc99676607d4ff9fd15f27481cb1794a567d65.

After "drm/amdgpu: flush TLB if valid PDE turns into PTE" is checked
in, this workaround is not needed.
---
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index a518ad26ceec..50da0d1fb9c1 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1240,9 +1240,6 @@ static int svm_range_map_to_gpus(struct svm_range *prange,
 				break;
 			}
 		}
-
-		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
-						  p->pasid);
 	}
 
 	return r;
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap
  2021-05-13 16:58 [PATCH 1/2] Revert "drm/amdkfd: flush TLB after updating GPU page table" Philip Yang
@ 2021-05-13 16:58 ` Philip Yang
  2021-05-13 17:18   ` Felix Kuehling
                     ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Philip Yang @ 2021-05-13 16:58 UTC (permalink / raw)
  To: amd-gfx; +Cc: Philip Yang

Need do a heavy-weight TLB flush to make sure we have no more dirty data
in the cache for the unmapped pages.

Add flush_type parameter to amdgpu_amdkfd_flush_gpu_tlb_pasid.

Signed-off-by: Philip Yang <Philip.Yang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c       | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 5f6696a3c778..0be9a6695b2e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -670,10 +670,10 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid)
 	return 0;
 }
 
-int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid)
+int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
+				      uint32_t flush_type)
 {
 	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
-	const uint32_t flush_type = 0;
 	bool all_hub = false;
 
 	if (adev->family == AMDGPU_FAMILY_AI)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 313ee49b9f17..e8ce851c6f29 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -135,7 +135,8 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
 void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);
 bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);
 int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid);
-int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid);
+int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
+				      uint32_t flush_type);
 
 bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 9d4f527bda7c..1d8a593edd3f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1853,7 +1853,7 @@ void kfd_flush_tlb(struct kfd_process_device *pdd)
 							pdd->qpd.vmid);
 	} else {
 		amdgpu_amdkfd_flush_gpu_tlb_pasid(dev->kgd,
-						pdd->process->pasid);
+						pdd->process->pasid, 0);
 	}
 }
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index 50da0d1fb9c1..e57a8e405efd 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1125,7 +1125,7 @@ svm_range_unmap_from_gpus(struct svm_range *prange, unsigned long start,
 				break;
 		}
 		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
-						  p->pasid);
+						  p->pasid, 2);
 	}
 
 	return r;
@@ -1182,7 +1182,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 
 		p = container_of(prange->svms, struct kfd_process, svms);
 		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
-						  p->pasid);
+						  p->pasid, 0);
 	}
 out:
 	prange->mapping.bo_va = NULL;
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap
  2021-05-13 16:58 ` [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap Philip Yang
@ 2021-05-13 17:18   ` Felix Kuehling
  2021-05-14  7:24   ` Christian König
  2021-05-14 14:42   ` [PATCH v2 " Philip Yang
  2 siblings, 0 replies; 7+ messages in thread
From: Felix Kuehling @ 2021-05-13 17:18 UTC (permalink / raw)
  To: Philip Yang, amd-gfx

Am 2021-05-13 um 12:58 p.m. schrieb Philip Yang:
> Need do a heavy-weight TLB flush to make sure we have no more dirty data
> in the cache for the unmapped pages.
>
> Add flush_type parameter to amdgpu_amdkfd_flush_gpu_tlb_pasid.
>
> Signed-off-by: Philip Yang <Philip.Yang@amd.com>

The series is

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++--
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 ++-
>  drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 2 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_svm.c       | 4 ++--
>  4 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 5f6696a3c778..0be9a6695b2e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -670,10 +670,10 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid)
>  	return 0;
>  }
>  
> -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid)
> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
> +				      uint32_t flush_type)
>  {
>  	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> -	const uint32_t flush_type = 0;
>  	bool all_hub = false;
>  
>  	if (adev->family == AMDGPU_FAMILY_AI)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 313ee49b9f17..e8ce851c6f29 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -135,7 +135,8 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
>  void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);
>  bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);
>  int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid);
> -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid);
> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
> +				      uint32_t flush_type);
>  
>  bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);
>  
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> index 9d4f527bda7c..1d8a593edd3f 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> @@ -1853,7 +1853,7 @@ void kfd_flush_tlb(struct kfd_process_device *pdd)
>  							pdd->qpd.vmid);
>  	} else {
>  		amdgpu_amdkfd_flush_gpu_tlb_pasid(dev->kgd,
> -						pdd->process->pasid);
> +						pdd->process->pasid, 0);
>  	}
>  }
>  
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> index 50da0d1fb9c1..e57a8e405efd 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> @@ -1125,7 +1125,7 @@ svm_range_unmap_from_gpus(struct svm_range *prange, unsigned long start,
>  				break;
>  		}
>  		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
> -						  p->pasid);
> +						  p->pasid, 2);
>  	}
>  
>  	return r;
> @@ -1182,7 +1182,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>  
>  		p = container_of(prange->svms, struct kfd_process, svms);
>  		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
> -						  p->pasid);
> +						  p->pasid, 0);
>  	}
>  out:
>  	prange->mapping.bo_va = NULL;
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap
  2021-05-13 16:58 ` [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap Philip Yang
  2021-05-13 17:18   ` Felix Kuehling
@ 2021-05-14  7:24   ` Christian König
  2021-05-14 14:42   ` [PATCH v2 " Philip Yang
  2 siblings, 0 replies; 7+ messages in thread
From: Christian König @ 2021-05-14  7:24 UTC (permalink / raw)
  To: Philip Yang, amd-gfx

Am 13.05.21 um 18:58 schrieb Philip Yang:
> Need do a heavy-weight TLB flush to make sure we have no more dirty data
> in the cache for the unmapped pages.
>
> Add flush_type parameter to amdgpu_amdkfd_flush_gpu_tlb_pasid.

Using a define for the flush type instead of magic numbers would be 
really nice to have here.

Apart from that I'm fine with the patch.

Christian.

>
> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 ++-
>   drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c       | 4 ++--
>   4 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 5f6696a3c778..0be9a6695b2e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -670,10 +670,10 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid)
>   	return 0;
>   }
>   
> -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid)
> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
> +				      uint32_t flush_type)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> -	const uint32_t flush_type = 0;
>   	bool all_hub = false;
>   
>   	if (adev->family == AMDGPU_FAMILY_AI)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 313ee49b9f17..e8ce851c6f29 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -135,7 +135,8 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
>   void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);
>   bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);
>   int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid);
> -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid);
> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
> +				      uint32_t flush_type);
>   
>   bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);
>   
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> index 9d4f527bda7c..1d8a593edd3f 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> @@ -1853,7 +1853,7 @@ void kfd_flush_tlb(struct kfd_process_device *pdd)
>   							pdd->qpd.vmid);
>   	} else {
>   		amdgpu_amdkfd_flush_gpu_tlb_pasid(dev->kgd,
> -						pdd->process->pasid);
> +						pdd->process->pasid, 0);
>   	}
>   }
>   
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> index 50da0d1fb9c1..e57a8e405efd 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> @@ -1125,7 +1125,7 @@ svm_range_unmap_from_gpus(struct svm_range *prange, unsigned long start,
>   				break;
>   		}
>   		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
> -						  p->pasid);
> +						  p->pasid, 2);
>   	}
>   
>   	return r;
> @@ -1182,7 +1182,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   
>   		p = container_of(prange->svms, struct kfd_process, svms);
>   		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
> -						  p->pasid);
> +						  p->pasid, 0);
>   	}
>   out:
>   	prange->mapping.bo_va = NULL;

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 2/2] drm/amdkfd: heavy-weight flush TLB after unmap
  2021-05-13 16:58 ` [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap Philip Yang
  2021-05-13 17:18   ` Felix Kuehling
  2021-05-14  7:24   ` Christian König
@ 2021-05-14 14:42   ` Philip Yang
  2021-05-14 15:14     ` Christian König
  2 siblings, 1 reply; 7+ messages in thread
From: Philip Yang @ 2021-05-14 14:42 UTC (permalink / raw)
  To: amd-gfx; +Cc: Philip Yang

Need do a heavy-weight TLB flush to make sure we have no more dirty data
in the cache for the unmapped pages.

Define enum TLB_FLUSH_TYPE, add flush_type parameter to
amdgpu_amdkfd_flush_gpu_tlb_pasid.

Signed-off-by: Philip Yang <Philip.Yang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 9 ++++++++-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c       | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
index 5f6696a3c778..bfab2f9fdd17 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
@@ -670,10 +670,10 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid)
 	return 0;
 }
 
-int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid)
+int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
+				      enum TLB_FLUSH_TYPE flush_type)
 {
 	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
-	const uint32_t flush_type = 0;
 	bool all_hub = false;
 
 	if (adev->family == AMDGPU_FAMILY_AI)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
index 313ee49b9f17..f4de50de359b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
@@ -36,6 +36,12 @@
 
 extern uint64_t amdgpu_amdkfd_total_mem_size;
 
+enum TLB_FLUSH_TYPE {
+	TLB_FLUSH_LEGACY = 0,
+	TLB_FLUSH_LIGHTWEIGHT,
+	TLB_FLUSH_HEAVYWEIGHT
+};
+
 struct amdgpu_device;
 
 struct kfd_bo_va_list {
@@ -135,7 +141,8 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
 void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);
 bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);
 int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid);
-int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid);
+int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
+				      enum TLB_FLUSH_TYPE flush_type);
 
 bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 9d4f527bda7c..5b6c5669c03d 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -1853,7 +1853,7 @@ void kfd_flush_tlb(struct kfd_process_device *pdd)
 							pdd->qpd.vmid);
 	} else {
 		amdgpu_amdkfd_flush_gpu_tlb_pasid(dev->kgd,
-						pdd->process->pasid);
+					pdd->process->pasid, TLB_FLUSH_LEGACY);
 	}
 }
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index a52e4594785f..f2901e7a993e 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1127,7 +1127,7 @@ svm_range_unmap_from_gpus(struct svm_range *prange, unsigned long start,
 				break;
 		}
 		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
-						  p->pasid);
+					p->pasid, TLB_FLUSH_HEAVYWEIGHT);
 	}
 
 	return r;
@@ -1183,7 +1183,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,
 
 		p = container_of(prange->svms, struct kfd_process, svms);
 		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
-						  p->pasid);
+						p->pasid, TLB_FLUSH_LEGACY);
 	}
 out:
 	prange->mapping.bo_va = NULL;
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 2/2] drm/amdkfd: heavy-weight flush TLB after unmap
  2021-05-14 14:42   ` [PATCH v2 " Philip Yang
@ 2021-05-14 15:14     ` Christian König
  2021-05-14 16:12       ` Felix Kuehling
  0 siblings, 1 reply; 7+ messages in thread
From: Christian König @ 2021-05-14 15:14 UTC (permalink / raw)
  To: Philip Yang, amd-gfx

Am 14.05.21 um 16:42 schrieb Philip Yang:
> Need do a heavy-weight TLB flush to make sure we have no more dirty data
> in the cache for the unmapped pages.
>
> Define enum TLB_FLUSH_TYPE, add flush_type parameter to
> amdgpu_amdkfd_flush_gpu_tlb_pasid.
>
> Signed-off-by: Philip Yang <Philip.Yang@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 9 ++++++++-
>   drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 2 +-
>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c       | 4 ++--
>   4 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> index 5f6696a3c778..bfab2f9fdd17 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
> @@ -670,10 +670,10 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid)
>   	return 0;
>   }
>   
> -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid)
> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
> +				      enum TLB_FLUSH_TYPE flush_type)
>   {
>   	struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
> -	const uint32_t flush_type = 0;
>   	bool all_hub = false;
>   
>   	if (adev->family == AMDGPU_FAMILY_AI)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 313ee49b9f17..f4de50de359b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -36,6 +36,12 @@
>   
>   extern uint64_t amdgpu_amdkfd_total_mem_size;
>   
> +enum TLB_FLUSH_TYPE {
> +	TLB_FLUSH_LEGACY = 0,
> +	TLB_FLUSH_LIGHTWEIGHT,
> +	TLB_FLUSH_HEAVYWEIGHT
> +};
> +
>   struct amdgpu_device;
>   
>   struct kfd_bo_va_list {
> @@ -135,7 +141,8 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd, enum kgd_engine_type engine,
>   void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);
>   bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);
>   int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t vmid);
> -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid);
> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t pasid,
> +				      enum TLB_FLUSH_TYPE flush_type);
>   
>   bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);
>   
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> index 9d4f527bda7c..5b6c5669c03d 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
> @@ -1853,7 +1853,7 @@ void kfd_flush_tlb(struct kfd_process_device *pdd)
>   							pdd->qpd.vmid);
>   	} else {
>   		amdgpu_amdkfd_flush_gpu_tlb_pasid(dev->kgd,
> -						pdd->process->pasid);
> +					pdd->process->pasid, TLB_FLUSH_LEGACY);
>   	}
>   }
>   
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> index a52e4594785f..f2901e7a993e 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> @@ -1127,7 +1127,7 @@ svm_range_unmap_from_gpus(struct svm_range *prange, unsigned long start,
>   				break;
>   		}
>   		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
> -						  p->pasid);
> +					p->pasid, TLB_FLUSH_HEAVYWEIGHT);
>   	}
>   
>   	return r;
> @@ -1183,7 +1183,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>   
>   		p = container_of(prange->svms, struct kfd_process, svms);
>   		amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
> -						  p->pasid);
> +						p->pasid, TLB_FLUSH_LEGACY);
>   	}
>   out:
>   	prange->mapping.bo_va = NULL;

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 2/2] drm/amdkfd: heavy-weight flush TLB after unmap
  2021-05-14 15:14     ` Christian König
@ 2021-05-14 16:12       ` Felix Kuehling
  0 siblings, 0 replies; 7+ messages in thread
From: Felix Kuehling @ 2021-05-14 16:12 UTC (permalink / raw)
  To: Christian König, Philip Yang, amd-gfx

Am 2021-05-14 um 11:14 a.m. schrieb Christian König:
> Am 14.05.21 um 16:42 schrieb Philip Yang:
>> Need do a heavy-weight TLB flush to make sure we have no more dirty data
>> in the cache for the unmapped pages.
>>
>> Define enum TLB_FLUSH_TYPE, add flush_type parameter to
>> amdgpu_amdkfd_flush_gpu_tlb_pasid.
>>
>> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
>
> Reviewed-by: Christian König <christian.koenig@amd.com>

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>


>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++--
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 9 ++++++++-
>>   drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 2 +-
>>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c       | 4 ++--
>>   4 files changed, 13 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
>> index 5f6696a3c778..bfab2f9fdd17 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
>> @@ -670,10 +670,10 @@ int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct
>> kgd_dev *kgd, uint16_t vmid)
>>       return 0;
>>   }
>>   -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd,
>> uint16_t pasid)
>> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t
>> pasid,
>> +                      enum TLB_FLUSH_TYPE flush_type)
>>   {
>>       struct amdgpu_device *adev = (struct amdgpu_device *)kgd;
>> -    const uint32_t flush_type = 0;
>>       bool all_hub = false;
>>         if (adev->family == AMDGPU_FAMILY_AI)
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
>> index 313ee49b9f17..f4de50de359b 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
>> @@ -36,6 +36,12 @@
>>     extern uint64_t amdgpu_amdkfd_total_mem_size;
>>   +enum TLB_FLUSH_TYPE {
>> +    TLB_FLUSH_LEGACY = 0,
>> +    TLB_FLUSH_LIGHTWEIGHT,
>> +    TLB_FLUSH_HEAVYWEIGHT
>> +};
>> +
>>   struct amdgpu_device;
>>     struct kfd_bo_va_list {
>> @@ -135,7 +141,8 @@ int amdgpu_amdkfd_submit_ib(struct kgd_dev *kgd,
>> enum kgd_engine_type engine,
>>   void amdgpu_amdkfd_set_compute_idle(struct kgd_dev *kgd, bool idle);
>>   bool amdgpu_amdkfd_have_atomics_support(struct kgd_dev *kgd);
>>   int amdgpu_amdkfd_flush_gpu_tlb_vmid(struct kgd_dev *kgd, uint16_t
>> vmid);
>> -int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t
>> pasid);
>> +int amdgpu_amdkfd_flush_gpu_tlb_pasid(struct kgd_dev *kgd, uint16_t
>> pasid,
>> +                      enum TLB_FLUSH_TYPE flush_type);
>>     bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32
>> vmid);
>>   diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
>> b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
>> index 9d4f527bda7c..5b6c5669c03d 100644
>> --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
>> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
>> @@ -1853,7 +1853,7 @@ void kfd_flush_tlb(struct kfd_process_device *pdd)
>>                               pdd->qpd.vmid);
>>       } else {
>>           amdgpu_amdkfd_flush_gpu_tlb_pasid(dev->kgd,
>> -                        pdd->process->pasid);
>> +                    pdd->process->pasid, TLB_FLUSH_LEGACY);
>>       }
>>   }
>>   diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
>> b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
>> index a52e4594785f..f2901e7a993e 100644
>> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
>> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
>> @@ -1127,7 +1127,7 @@ svm_range_unmap_from_gpus(struct svm_range
>> *prange, unsigned long start,
>>                   break;
>>           }
>>           amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
>> -                          p->pasid);
>> +                    p->pasid, TLB_FLUSH_HEAVYWEIGHT);
>>       }
>>         return r;
>> @@ -1183,7 +1183,7 @@ svm_range_map_to_gpu(struct amdgpu_device
>> *adev, struct amdgpu_vm *vm,
>>             p = container_of(prange->svms, struct kfd_process, svms);
>>           amdgpu_amdkfd_flush_gpu_tlb_pasid((struct kgd_dev *)adev,
>> -                          p->pasid);
>> +                        p->pasid, TLB_FLUSH_LEGACY);
>>       }
>>   out:
>>       prange->mapping.bo_va = NULL;
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-05-14 16:13 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-13 16:58 [PATCH 1/2] Revert "drm/amdkfd: flush TLB after updating GPU page table" Philip Yang
2021-05-13 16:58 ` [PATCH 2/2] drm/amdkfd: heavy-weight flush TLB after unmap Philip Yang
2021-05-13 17:18   ` Felix Kuehling
2021-05-14  7:24   ` Christian König
2021-05-14 14:42   ` [PATCH v2 " Philip Yang
2021-05-14 15:14     ` Christian König
2021-05-14 16:12       ` Felix Kuehling

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.