Mapping out a KFD device to a GPU can be done manually by looking at the domain and location properties. To make it easier to discover which KFD device goes with what GPU add a link to the GPU node.
Signed-off-by: Mario Limonciello (AMD) <[email protected]> --- Cc: [email protected]> v3: * Create link when topology created * Only call update topology when amdgpu is called --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 17 ++++++++++++++++- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 ++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index 67a01c4f38855..870a727d6e938 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -910,3 +910,11 @@ int amdgpu_amdkfd_config_sq_perfmon(struct amdgpu_device *adev, uint32_t xcp_id, return r; } + +int amdgpu_amdkfd_create_sysfs_links(struct amdgpu_device *adev) +{ + if (!adev->kfd.init_complete || !adev->kfd.dev) + return 0; + + return kfd_topology_update_sysfs(); +} diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h index 8bdfcde2029b5..07aa519b28d45 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h @@ -268,6 +268,7 @@ int amdgpu_amdkfd_stop_sched(struct amdgpu_device *adev, uint32_t node_id); int amdgpu_amdkfd_config_sq_perfmon(struct amdgpu_device *adev, uint32_t xcp_id, bool core_override_enable, bool reg_override_enable, bool perfmon_override_enable); bool amdgpu_amdkfd_compute_active(struct amdgpu_device *adev, uint32_t node_id); +int amdgpu_amdkfd_create_sysfs_links(struct amdgpu_device *adev); /* Read user wptr from a specified user address space with page fault diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 467326871a81e..d4c8b03b6bf57 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5123,6 +5123,10 @@ int amdgpu_device_init(struct amdgpu_device *adev, */ r = amdgpu_device_sys_interface_init(adev); + r = amdgpu_amdkfd_create_sysfs_links(adev); + if (r) + dev_err(adev->dev, "Failed to create KFD sysfs link: %d\n", r); + if (IS_ENABLED(CONFIG_PERF_EVENTS)) r = amdgpu_pmu_init(adev); if (r) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index a95be23fd0397..5f14c66902f9d 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -571,6 +571,9 @@ static void kfd_remove_sysfs_node_entry(struct kfd_topology_device *dev) struct kfd_mem_properties *mem; struct kfd_perf_properties *perf; + if (dev->gpu) + sysfs_remove_link(dev->kobj_node, "device"); + if (dev->kobj_iolink) { list_for_each_entry(iolink, &dev->io_link_props, list) if (iolink->kobj) { @@ -819,6 +822,18 @@ static int kfd_build_sysfs_node_entry(struct kfd_topology_device *dev, return ret; } + /* + * create a link to the GPU node, but don't do a reverse one since it might + * not match after spatial partitioning + */ + if (dev->gpu) { + struct kobject *amdgpu_kobj = &dev->gpu->adev->dev->kobj; + + ret = sysfs_create_link(dev->kobj_node, amdgpu_kobj, "device"); + if (ret) + return ret; + } + return 0; } @@ -848,7 +863,7 @@ static void kfd_remove_sysfs_node_tree(void) kfd_remove_sysfs_node_entry(dev); } -static int kfd_topology_update_sysfs(void) +int kfd_topology_update_sysfs(void) { int ret; diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h index 9aba8596faa7e..0ee1a7d3a73f5 100644 --- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h +++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h @@ -335,4 +335,6 @@ struct kfd2kgd_calls { int engine, int queue); }; +int kfd_topology_update_sysfs(void); + #endif /* KGD_KFD_INTERFACE_H_INCLUDED */ -- 2.43.0
