[PATCH] drm/amdkfd: map gpu hive id to xgmi connected cpu

[Felix Kuehling]

On 2021-10-15 11:11 a.m., Jonathan Kim wrote:
> ROCr needs to be able to identify all devices that have direct access to
> fine grain memory, which should include CPUs that are connected to GPUs
> over xGMI. The GPU hive ID can be mapped onto the CPU hive ID since the
> CPU is part of the hive.
>
> v3: avoid quadratic search by doing linear list read instead querying per
> proximity id
>
> v2: fixup to ensure all numa nodes get the hive id mapped
>
> Signed-off-by: Jonathan Kim <jonathan.kim at amd.com>

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


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 19 ++++++++++++++++++-
>   1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> index 98cca5f2b27f..dd593ad0614a 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
> @@ -1296,6 +1296,24 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
>   
>   	proximity_domain = atomic_inc_return(&topology_crat_proximity_domain);
>   
> +	adev = (struct amdgpu_device *)(gpu->kgd);
> +
> +	/* Include the CPU in xGMI hive if xGMI connected by assigning it the hive ID. */
> +	if (gpu->hive_id && adev->gmc.xgmi.connected_to_cpu) {
> +		struct kfd_topology_device *top_dev;
> +
> +		down_read(&topology_lock);
> +
> +		list_for_each_entry(top_dev, &topology_device_list, list) {
> +			if (top_dev->gpu)
> +				break;
> +
> +			top_dev->node_props.hive_id = gpu->hive_id;
> +		}
> +
> +		up_read(&topology_lock);
> +	}
> +
>   	/* Check to see if this gpu device exists in the topology_device_list.
>   	 * If so, assign the gpu to that device,
>   	 * else create a Virtual CRAT for this gpu device and then parse that
> @@ -1457,7 +1475,6 @@ int kfd_topology_add_device(struct kfd_dev *gpu)
>   		dev->node_props.max_waves_per_simd = 10;
>   	}
>   
> -	adev = (struct amdgpu_device *)(dev->gpu->kgd);
>   	/* kfd only concerns sram ecc on GFX and HBM ecc on UMC */
>   	dev->node_props.capability |=
>   		((adev->ras_enabled & BIT(AMDGPU_RAS_BLOCK__GFX)) != 0) ?