* [PATCH 1/2] drm/amdgpu: add some lockdep checks to the VM code
@ 2022-02-01 15:28 Christian König
2022-02-01 15:28 ` [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del Christian König
0 siblings, 1 reply; 6+ messages in thread
From: Christian König @ 2022-02-01 15:28 UTC (permalink / raw)
To: daniel, felix.kuehling; +Cc: amd-gfx
Whenever a bo_va structure is added or removed the VM and eventually
added BO should be locked.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index b23cb463b106..7910046fe11a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2260,6 +2260,8 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
{
struct amdgpu_bo_va *bo_va;
+ dma_resv_assert_held(vm->root.bo->tbo.base.resv);
+
bo_va = kzalloc(sizeof(struct amdgpu_bo_va), GFP_KERNEL);
if (bo_va == NULL) {
return NULL;
@@ -2273,6 +2275,7 @@ struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
if (!bo)
return bo_va;
+ dma_resv_assert_held(bo->tbo.base.resv);
if (amdgpu_dmabuf_is_xgmi_accessible(adev, bo)) {
bo_va->is_xgmi = true;
/* Power up XGMI if it can be potentially used */
@@ -2667,7 +2670,10 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
struct amdgpu_vm *vm = bo_va->base.vm;
struct amdgpu_vm_bo_base **base;
+ dma_resv_assert_held(vm->root.bo->tbo.base.resv);
+
if (bo) {
+ dma_resv_assert_held(bo->tbo.base.resv);
if (bo->tbo.base.resv == vm->root.bo->tbo.base.resv)
vm->bulk_moveable = false;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del
2022-02-01 15:28 [PATCH 1/2] drm/amdgpu: add some lockdep checks to the VM code Christian König
@ 2022-02-01 15:28 ` Christian König
2022-02-01 15:31 ` Alex Deucher
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Christian König @ 2022-02-01 15:28 UTC (permalink / raw)
To: daniel, felix.kuehling; +Cc: amd-gfx
Some people complained about the name and this matches much
more Linux naming conventions for object functions.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 5df387c4d7fb..5d00a6878ef2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -778,7 +778,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem,
continue;
if (attachment[i]->bo_va) {
amdgpu_bo_reserve(bo[i], true);
- amdgpu_vm_bo_rmv(adev, attachment[i]->bo_va);
+ amdgpu_vm_bo_del(adev, attachment[i]->bo_va);
amdgpu_bo_unreserve(bo[i]);
list_del(&attachment[i]->list);
}
@@ -795,7 +795,7 @@ static void kfd_mem_detach(struct kfd_mem_attachment *attachment)
pr_debug("\t remove VA 0x%llx in entry %p\n",
attachment->va, attachment);
- amdgpu_vm_bo_rmv(attachment->adev, attachment->bo_va);
+ amdgpu_vm_bo_del(attachment->adev, attachment->bo_va);
drm_gem_object_put(&bo->tbo.base);
list_del(&attachment->list);
kfree(attachment);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
index da21e60bb827..c6d4d41c4393 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
@@ -98,7 +98,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
if (r) {
DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);
- amdgpu_vm_bo_rmv(adev, *bo_va);
+ amdgpu_vm_bo_del(adev, *bo_va);
ttm_eu_backoff_reservation(&ticket, &list);
return r;
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 7c1f1b8ca77d..b4c0a4e77525 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -221,7 +221,7 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
if (!bo_va || --bo_va->ref_count)
goto out_unlock;
- amdgpu_vm_bo_rmv(adev, bo_va);
+ amdgpu_vm_bo_del(adev, bo_va);
if (!amdgpu_vm_ready(vm))
goto out_unlock;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index ee3c17bd02fc..efd13898c83e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -1194,12 +1194,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCE) != NULL)
amdgpu_vce_free_handles(adev, file_priv);
- amdgpu_vm_bo_rmv(adev, fpriv->prt_va);
+ amdgpu_vm_bo_del(adev, fpriv->prt_va);
if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
/* TODO: how to handle reserve failure */
BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));
- amdgpu_vm_bo_rmv(adev, fpriv->csa_va);
+ amdgpu_vm_bo_del(adev, fpriv->csa_va);
fpriv->csa_va = NULL;
amdgpu_bo_unreserve(adev->virt.csa_obj);
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 7910046fe11a..8174d71764d7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -2653,7 +2653,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
}
/**
- * amdgpu_vm_bo_rmv - remove a bo to a specific vm
+ * amdgpu_vm_bo_del - remove a bo to a specific vm
*
* @adev: amdgpu_device pointer
* @bo_va: requested bo_va
@@ -2662,7 +2662,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
*
* Object have to be reserved!
*/
-void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
+void amdgpu_vm_bo_del(struct amdgpu_device *adev,
struct amdgpu_bo_va *bo_va)
{
struct amdgpu_bo_va_mapping *mapping, *next;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index 85fcfb8c5efd..a40a6a993bb0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -435,7 +435,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
uint64_t addr);
void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket);
-void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
+void amdgpu_vm_bo_del(struct amdgpu_device *adev,
struct amdgpu_bo_va *bo_va);
void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
uint32_t fragment_size_default, unsigned max_level,
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del
2022-02-01 15:28 ` [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del Christian König
@ 2022-02-01 15:31 ` Alex Deucher
2022-02-01 16:22 ` Felix Kuehling
2022-02-01 16:27 ` Daniel Vetter
2 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2022-02-01 15:31 UTC (permalink / raw)
To: Christian König; +Cc: Kuehling, Felix, amd-gfx list, Daniel Vetter
On Tue, Feb 1, 2022 at 10:28 AM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Some people complained about the name and this matches much
> more Linux naming conventions for object functions.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +-
> 6 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index 5df387c4d7fb..5d00a6878ef2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -778,7 +778,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem,
> continue;
> if (attachment[i]->bo_va) {
> amdgpu_bo_reserve(bo[i], true);
> - amdgpu_vm_bo_rmv(adev, attachment[i]->bo_va);
> + amdgpu_vm_bo_del(adev, attachment[i]->bo_va);
> amdgpu_bo_unreserve(bo[i]);
> list_del(&attachment[i]->list);
> }
> @@ -795,7 +795,7 @@ static void kfd_mem_detach(struct kfd_mem_attachment *attachment)
>
> pr_debug("\t remove VA 0x%llx in entry %p\n",
> attachment->va, attachment);
> - amdgpu_vm_bo_rmv(attachment->adev, attachment->bo_va);
> + amdgpu_vm_bo_del(attachment->adev, attachment->bo_va);
> drm_gem_object_put(&bo->tbo.base);
> list_del(&attachment->list);
> kfree(attachment);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> index da21e60bb827..c6d4d41c4393 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> @@ -98,7 +98,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>
> if (r) {
> DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);
> - amdgpu_vm_bo_rmv(adev, *bo_va);
> + amdgpu_vm_bo_del(adev, *bo_va);
> ttm_eu_backoff_reservation(&ticket, &list);
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 7c1f1b8ca77d..b4c0a4e77525 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -221,7 +221,7 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
> if (!bo_va || --bo_va->ref_count)
> goto out_unlock;
>
> - amdgpu_vm_bo_rmv(adev, bo_va);
> + amdgpu_vm_bo_del(adev, bo_va);
> if (!amdgpu_vm_ready(vm))
> goto out_unlock;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index ee3c17bd02fc..efd13898c83e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -1194,12 +1194,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
> if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCE) != NULL)
> amdgpu_vce_free_handles(adev, file_priv);
>
> - amdgpu_vm_bo_rmv(adev, fpriv->prt_va);
> + amdgpu_vm_bo_del(adev, fpriv->prt_va);
>
> if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
> /* TODO: how to handle reserve failure */
> BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));
> - amdgpu_vm_bo_rmv(adev, fpriv->csa_va);
> + amdgpu_vm_bo_del(adev, fpriv->csa_va);
> fpriv->csa_va = NULL;
> amdgpu_bo_unreserve(adev->virt.csa_obj);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 7910046fe11a..8174d71764d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -2653,7 +2653,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
> }
>
> /**
> - * amdgpu_vm_bo_rmv - remove a bo to a specific vm
> + * amdgpu_vm_bo_del - remove a bo to a specific vm
Maybe reword this to "remove a bo from a specific vm", with that
fixed, the series is:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> *
> * @adev: amdgpu_device pointer
> * @bo_va: requested bo_va
> @@ -2662,7 +2662,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
> *
> * Object have to be reserved!
> */
> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
> struct amdgpu_bo_va *bo_va)
> {
> struct amdgpu_bo_va_mapping *mapping, *next;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> index 85fcfb8c5efd..a40a6a993bb0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> @@ -435,7 +435,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
> struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
> uint64_t addr);
> void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket);
> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
> struct amdgpu_bo_va *bo_va);
> void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
> uint32_t fragment_size_default, unsigned max_level,
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del
2022-02-01 15:28 ` [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del Christian König
2022-02-01 15:31 ` Alex Deucher
@ 2022-02-01 16:22 ` Felix Kuehling
2022-02-01 16:27 ` Daniel Vetter
2 siblings, 0 replies; 6+ messages in thread
From: Felix Kuehling @ 2022-02-01 16:22 UTC (permalink / raw)
To: Christian König, daniel; +Cc: amd-gfx
Am 2022-02-01 um 10:28 schrieb Christian König:
> Some people complained about the name and this matches much
> more Linux naming conventions for object functions.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
The series is
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +-
> 6 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index 5df387c4d7fb..5d00a6878ef2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -778,7 +778,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem,
> continue;
> if (attachment[i]->bo_va) {
> amdgpu_bo_reserve(bo[i], true);
> - amdgpu_vm_bo_rmv(adev, attachment[i]->bo_va);
> + amdgpu_vm_bo_del(adev, attachment[i]->bo_va);
> amdgpu_bo_unreserve(bo[i]);
> list_del(&attachment[i]->list);
> }
> @@ -795,7 +795,7 @@ static void kfd_mem_detach(struct kfd_mem_attachment *attachment)
>
> pr_debug("\t remove VA 0x%llx in entry %p\n",
> attachment->va, attachment);
> - amdgpu_vm_bo_rmv(attachment->adev, attachment->bo_va);
> + amdgpu_vm_bo_del(attachment->adev, attachment->bo_va);
> drm_gem_object_put(&bo->tbo.base);
> list_del(&attachment->list);
> kfree(attachment);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> index da21e60bb827..c6d4d41c4393 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> @@ -98,7 +98,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>
> if (r) {
> DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);
> - amdgpu_vm_bo_rmv(adev, *bo_va);
> + amdgpu_vm_bo_del(adev, *bo_va);
> ttm_eu_backoff_reservation(&ticket, &list);
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 7c1f1b8ca77d..b4c0a4e77525 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -221,7 +221,7 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
> if (!bo_va || --bo_va->ref_count)
> goto out_unlock;
>
> - amdgpu_vm_bo_rmv(adev, bo_va);
> + amdgpu_vm_bo_del(adev, bo_va);
> if (!amdgpu_vm_ready(vm))
> goto out_unlock;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index ee3c17bd02fc..efd13898c83e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -1194,12 +1194,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
> if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCE) != NULL)
> amdgpu_vce_free_handles(adev, file_priv);
>
> - amdgpu_vm_bo_rmv(adev, fpriv->prt_va);
> + amdgpu_vm_bo_del(adev, fpriv->prt_va);
>
> if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
> /* TODO: how to handle reserve failure */
> BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));
> - amdgpu_vm_bo_rmv(adev, fpriv->csa_va);
> + amdgpu_vm_bo_del(adev, fpriv->csa_va);
> fpriv->csa_va = NULL;
> amdgpu_bo_unreserve(adev->virt.csa_obj);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 7910046fe11a..8174d71764d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -2653,7 +2653,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
> }
>
> /**
> - * amdgpu_vm_bo_rmv - remove a bo to a specific vm
> + * amdgpu_vm_bo_del - remove a bo to a specific vm
> *
> * @adev: amdgpu_device pointer
> * @bo_va: requested bo_va
> @@ -2662,7 +2662,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
> *
> * Object have to be reserved!
> */
> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
> struct amdgpu_bo_va *bo_va)
> {
> struct amdgpu_bo_va_mapping *mapping, *next;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> index 85fcfb8c5efd..a40a6a993bb0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> @@ -435,7 +435,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
> struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
> uint64_t addr);
> void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket);
> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
> struct amdgpu_bo_va *bo_va);
> void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
> uint32_t fragment_size_default, unsigned max_level,
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del
2022-02-01 15:28 ` [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del Christian König
2022-02-01 15:31 ` Alex Deucher
2022-02-01 16:22 ` Felix Kuehling
@ 2022-02-01 16:27 ` Daniel Vetter
2022-02-02 8:36 ` Christian König
2 siblings, 1 reply; 6+ messages in thread
From: Daniel Vetter @ 2022-02-01 16:27 UTC (permalink / raw)
To: Christian König; +Cc: Felix.Kuehling, amd-gfx
On Tue, Feb 1, 2022 at 4:28 PM Christian König
<ckoenig.leichtzumerken@gmail.com> wrote:
>
> Some people complained about the name and this matches much
> more Linux naming conventions for object functions.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
"some people" sounds mightily ominous :-)
On both patches: Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cheers, Daniel
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +-
> 6 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> index 5df387c4d7fb..5d00a6878ef2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
> @@ -778,7 +778,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem,
> continue;
> if (attachment[i]->bo_va) {
> amdgpu_bo_reserve(bo[i], true);
> - amdgpu_vm_bo_rmv(adev, attachment[i]->bo_va);
> + amdgpu_vm_bo_del(adev, attachment[i]->bo_va);
> amdgpu_bo_unreserve(bo[i]);
> list_del(&attachment[i]->list);
> }
> @@ -795,7 +795,7 @@ static void kfd_mem_detach(struct kfd_mem_attachment *attachment)
>
> pr_debug("\t remove VA 0x%llx in entry %p\n",
> attachment->va, attachment);
> - amdgpu_vm_bo_rmv(attachment->adev, attachment->bo_va);
> + amdgpu_vm_bo_del(attachment->adev, attachment->bo_va);
> drm_gem_object_put(&bo->tbo.base);
> list_del(&attachment->list);
> kfree(attachment);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> index da21e60bb827..c6d4d41c4393 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> @@ -98,7 +98,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>
> if (r) {
> DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);
> - amdgpu_vm_bo_rmv(adev, *bo_va);
> + amdgpu_vm_bo_del(adev, *bo_va);
> ttm_eu_backoff_reservation(&ticket, &list);
> return r;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index 7c1f1b8ca77d..b4c0a4e77525 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -221,7 +221,7 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
> if (!bo_va || --bo_va->ref_count)
> goto out_unlock;
>
> - amdgpu_vm_bo_rmv(adev, bo_va);
> + amdgpu_vm_bo_del(adev, bo_va);
> if (!amdgpu_vm_ready(vm))
> goto out_unlock;
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index ee3c17bd02fc..efd13898c83e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -1194,12 +1194,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
> if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCE) != NULL)
> amdgpu_vce_free_handles(adev, file_priv);
>
> - amdgpu_vm_bo_rmv(adev, fpriv->prt_va);
> + amdgpu_vm_bo_del(adev, fpriv->prt_va);
>
> if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
> /* TODO: how to handle reserve failure */
> BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));
> - amdgpu_vm_bo_rmv(adev, fpriv->csa_va);
> + amdgpu_vm_bo_del(adev, fpriv->csa_va);
> fpriv->csa_va = NULL;
> amdgpu_bo_unreserve(adev->virt.csa_obj);
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 7910046fe11a..8174d71764d7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -2653,7 +2653,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
> }
>
> /**
> - * amdgpu_vm_bo_rmv - remove a bo to a specific vm
> + * amdgpu_vm_bo_del - remove a bo to a specific vm
> *
> * @adev: amdgpu_device pointer
> * @bo_va: requested bo_va
> @@ -2662,7 +2662,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
> *
> * Object have to be reserved!
> */
> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
> struct amdgpu_bo_va *bo_va)
> {
> struct amdgpu_bo_va_mapping *mapping, *next;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> index 85fcfb8c5efd..a40a6a993bb0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
> @@ -435,7 +435,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
> struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
> uint64_t addr);
> void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket);
> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
> struct amdgpu_bo_va *bo_va);
> void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
> uint32_t fragment_size_default, unsigned max_level,
> --
> 2.25.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del
2022-02-01 16:27 ` Daniel Vetter
@ 2022-02-02 8:36 ` Christian König
0 siblings, 0 replies; 6+ messages in thread
From: Christian König @ 2022-02-02 8:36 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Felix.Kuehling, amd-gfx
Am 01.02.22 um 17:27 schrieb Daniel Vetter:
> On Tue, Feb 1, 2022 at 4:28 PM Christian König
> <ckoenig.leichtzumerken@gmail.com> wrote:
>> Some people complained about the name and this matches much
>> more Linux naming conventions for object functions.
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
> "some people" sounds mightily ominous :-)
That's intentional, you were not the only one :)
Cheers,
Christian.
>
> On both patches: Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Cheers, Daniel
>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++--
>> drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
>> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +-
>> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++--
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 ++--
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +-
>> 6 files changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>> index 5df387c4d7fb..5d00a6878ef2 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
>> @@ -778,7 +778,7 @@ static int kfd_mem_attach(struct amdgpu_device *adev, struct kgd_mem *mem,
>> continue;
>> if (attachment[i]->bo_va) {
>> amdgpu_bo_reserve(bo[i], true);
>> - amdgpu_vm_bo_rmv(adev, attachment[i]->bo_va);
>> + amdgpu_vm_bo_del(adev, attachment[i]->bo_va);
>> amdgpu_bo_unreserve(bo[i]);
>> list_del(&attachment[i]->list);
>> }
>> @@ -795,7 +795,7 @@ static void kfd_mem_detach(struct kfd_mem_attachment *attachment)
>>
>> pr_debug("\t remove VA 0x%llx in entry %p\n",
>> attachment->va, attachment);
>> - amdgpu_vm_bo_rmv(attachment->adev, attachment->bo_va);
>> + amdgpu_vm_bo_del(attachment->adev, attachment->bo_va);
>> drm_gem_object_put(&bo->tbo.base);
>> list_del(&attachment->list);
>> kfree(attachment);
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
>> index da21e60bb827..c6d4d41c4393 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
>> @@ -98,7 +98,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
>>
>> if (r) {
>> DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);
>> - amdgpu_vm_bo_rmv(adev, *bo_va);
>> + amdgpu_vm_bo_del(adev, *bo_va);
>> ttm_eu_backoff_reservation(&ticket, &list);
>> return r;
>> }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> index 7c1f1b8ca77d..b4c0a4e77525 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>> @@ -221,7 +221,7 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
>> if (!bo_va || --bo_va->ref_count)
>> goto out_unlock;
>>
>> - amdgpu_vm_bo_rmv(adev, bo_va);
>> + amdgpu_vm_bo_del(adev, bo_va);
>> if (!amdgpu_vm_ready(vm))
>> goto out_unlock;
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> index ee3c17bd02fc..efd13898c83e 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>> @@ -1194,12 +1194,12 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
>> if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_VCE) != NULL)
>> amdgpu_vce_free_handles(adev, file_priv);
>>
>> - amdgpu_vm_bo_rmv(adev, fpriv->prt_va);
>> + amdgpu_vm_bo_del(adev, fpriv->prt_va);
>>
>> if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {
>> /* TODO: how to handle reserve failure */
>> BUG_ON(amdgpu_bo_reserve(adev->virt.csa_obj, true));
>> - amdgpu_vm_bo_rmv(adev, fpriv->csa_va);
>> + amdgpu_vm_bo_del(adev, fpriv->csa_va);
>> fpriv->csa_va = NULL;
>> amdgpu_bo_unreserve(adev->virt.csa_obj);
>> }
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index 7910046fe11a..8174d71764d7 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> @@ -2653,7 +2653,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
>> }
>>
>> /**
>> - * amdgpu_vm_bo_rmv - remove a bo to a specific vm
>> + * amdgpu_vm_bo_del - remove a bo to a specific vm
>> *
>> * @adev: amdgpu_device pointer
>> * @bo_va: requested bo_va
>> @@ -2662,7 +2662,7 @@ void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
>> *
>> * Object have to be reserved!
>> */
>> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
>> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
>> struct amdgpu_bo_va *bo_va)
>> {
>> struct amdgpu_bo_va_mapping *mapping, *next;
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
>> index 85fcfb8c5efd..a40a6a993bb0 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
>> @@ -435,7 +435,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
>> struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
>> uint64_t addr);
>> void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket);
>> -void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
>> +void amdgpu_vm_bo_del(struct amdgpu_device *adev,
>> struct amdgpu_bo_va *bo_va);
>> void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
>> uint32_t fragment_size_default, unsigned max_level,
>> --
>> 2.25.1
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-02 8:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-01 15:28 [PATCH 1/2] drm/amdgpu: add some lockdep checks to the VM code Christian König
2022-02-01 15:28 ` [PATCH 2/2] drm/amdgpu: rename amdgpu_vm_bo_rmv to _del Christian König
2022-02-01 15:31 ` Alex Deucher
2022-02-01 16:22 ` Felix Kuehling
2022-02-01 16:27 ` Daniel Vetter
2022-02-02 8:36 ` Christian König
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.