drm/amdkfd: Fix NULL pointer dereference for set_scratch_backing_va()
Subsystems (3)
PATCH 1/2 drm/amdkfd: Fix NULL pointer dereference for set_scratch_backing_va()
Currently this function pointer is missing for GFX10. Considering it is a void function since GFX9, fix it by checking the function pointer before dereferencing it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 10 ---------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 2 -- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 +++-- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 5 +++++ 6 files changed, 9 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +0 -1
@@ -283,7 +283,6 @@ static const struct kfd2kgd_calls kfd2kgd = { kgd_gfx_v9_get_atc_vmid_pasid_mapping_pasid, .get_atc_vmid_pasid_mapping_valid = kgd_gfx_v9_get_atc_vmid_pasid_mapping_valid, - .set_scratch_backing_va = kgd_gfx_v9_set_scratch_backing_va, .get_tile_config = kgd_gfx_v9_get_tile_config, .set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base, .invalidate_tlbs = kgd_gfx_v9_invalidate_tlbs,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0 -10
@@ -775,15 +775,6 @@ uint32_t kgd_gfx_v9_address_watch_get_offset(struct kgd_dev *kgd,return 0 ; } -void kgd_gfx_v9_set_scratch_backing_va (struct kgd_dev *kgd, -uint64_t va,uint32_t vmid) -{ -/* No longer needed on GFXv9. The scratch base address is -* passed to the shader by the CP. It's the user mode driver's -* responsibility. -*/ -} -void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd,uint32_t vmid,uint64_t page_table_base) {
@@ -829,7 +820,6 @@ static const struct kfd2kgd_calls kfd2kgd = { kgd_gfx_v9_get_atc_vmid_pasid_mapping_pasid, .get_atc_vmid_pasid_mapping_valid = kgd_gfx_v9_get_atc_vmid_pasid_mapping_valid, - .set_scratch_backing_va = kgd_gfx_v9_set_scratch_backing_va, .get_tile_config = kgd_gfx_v9_get_tile_config, .set_vm_context_page_table_base = kgd_gfx_v9_set_vm_context_page_table_base, .invalidate_tlbs = kgd_gfx_v9_invalidate_tlbs,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h +0 -2
@@ -61,8 +61,6 @@ uint16_t kgd_gfx_v9_get_atc_vmid_pasid_mapping_pasid(struct kgd_dev *kgd, uint8_t vmid);void kgd_gfx_v9_set_vm_context_page_table_base (struct kgd_dev *kgd,uint32_t vmid,uint64_t page_table_base); -void kgd_gfx_v9_set_scratch_backing_va (struct kgd_dev *kgd, -uint64_t va,uint32_t vmid);int kgd_gfx_v9_invalidate_tlbs (struct kgd_dev *kgd,uint16_t pasid);int kgd_gfx_v9_invalidate_tlbs_vmid (struct kgd_dev *kgd,uint16_t vmid); int kgd_gfx_v9_get_tile_config(struct kgd_dev *kgd,
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +1 -1
@@ -1128,7 +1128,7 @@ static int kfd_ioctl_set_scratch_backing_va(struct file *filep,mutex_unlock (&p->mutex);if (dev->dqm->sched_policy ==KFD_SCHED_POLICY_NO_HWS && - pdd->qpd.vmid !=0 ) + pdd->qpd.vmid !=0 && dev->kfd2kgd->set_scratch_backing_va) dev->kfd2kgd->set_scratch_backing_va ( dev->kgd, args->va_addr, pdd->qpd.vmid);
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +3 -2
@@ -220,8 +220,9 @@ static int allocate_vmid(struct device_queue_manager *dqm,/* invalidate the VM context after pasid and vmid mapping is set up */ kfd_flush_tlb (qpd_to_pdd (qpd)); - dqm->dev->kfd2kgd->set_scratch_backing_va ( - dqm->dev->kgd, qpd->sh_hidden_private_base, qpd->vmid); +if (dqm->dev->kfd2kgd->set_scratch_backing_va) + dqm->dev->kfd2kgd->set_scratch_backing_va (dqm->dev->kgd, + qpd->sh_hidden_private_base, qpd->vmid);return 0 ; }
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +5 -0
@@ -298,8 +298,13 @@ struct kfd2kgd_calls {struct kgd_dev *kgd, uint8_t vmid); +/* No longer needed from GFXv9 onward. The scratch base address is +* passed to the shader by the CP. It's the user mode driver's +* responsibility. +*/ void (*set_scratch_backing_va)(struct kgd_dev *kgd,uint64_t va,uint32_t vmid); +int (*get_tile_config)(struct kgd_dev *kgd,struct tile_config *config); void (*set_vm_context_page_table_base)(struct kgd_dev *kgd,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/amdkfd: Sync gfx10 kfd2kgd_calls function pointers
get_hive_id was not set. Also, adjust the function setting sequence.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +3 -2
@@ -160,10 +160,11 @@ static const struct kfd2kgd_calls kfd2kgd = { get_atc_vmid_pasid_mapping_pasid, .get_atc_vmid_pasid_mapping_valid = get_atc_vmid_pasid_mapping_valid, + .get_tile_config = amdgpu_amdkfd_get_tile_config, + .set_vm_context_page_table_base = set_vm_context_page_table_base, .invalidate_tlbs = invalidate_tlbs, .invalidate_tlbs_vmid = invalidate_tlbs_vmid, - .set_vm_context_page_table_base = set_vm_context_page_table_base, - .get_tile_config = amdgpu_amdkfd_get_tile_config, + .get_hive_id = amdgpu_amdkfd_get_hive_id, };struct kfd2kgd_calls *amdgpu_amdkfd_gfx_10_0_get_functions ()
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Deucher, Alexander
Reviewed-byRe: [PATCH 2/2] drm/amdkfd: Sync gfx10 kfd2kgd_calls function pointers
Series is:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Zhao, Yong <[email protected]>
Sent: Monday, September 23, 2019 4:00 PM
To: [email protected] <[email protected]>
Cc: Zhao, Yong <[email protected]>
Subject: [PATCH 2/2] drm/amdkfd: Sync gfx10 kfd2kgd_calls function pointers
get_hive_id was not set. Also, adjust the function setting sequence.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +3 -2
@@ -160,10 +160,11 @@ static const struct kfd2kgd_calls kfd2kgd = { get_atc_vmid_pasid_mapping_pasid, .get_atc_vmid_pasid_mapping_valid = get_atc_vmid_pasid_mapping_valid, + .get_tile_config = amdgpu_amdkfd_get_tile_config, + .set_vm_context_page_table_base = set_vm_context_page_table_base, .invalidate_tlbs = invalidate_tlbs, .invalidate_tlbs_vmid = invalidate_tlbs_vmid, - .set_vm_context_page_table_base = set_vm_context_page_table_base, - .get_tile_config = amdgpu_amdkfd_get_tile_config, + .get_hive_id = amdgpu_amdkfd_get_hive_id, };struct kfd2kgd_calls *amdgpu_amdkfd_gfx_10_0_get_functions ()
--
2.17.1
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx