[PATCH v2] drm/amdgpu: refine create and release logic of hive info
Christian König
ckoenig.leichtzumerken at gmail.com
Tue Aug 18 11:50:23 UTC 2020
Am 18.08.20 um 13:42 schrieb Dennis Li:
> Change to dynamically create and release hive info object,
> which help driver support more hives in the future.
>
> v2:
> Change to save hive object pointer in adev, to avoid locking
> xgmi_mutex every time when calling amdgpu_get_xgmi_hive.
>
> Signed-off-by: Dennis Li <Dennis.Li at amd.com>
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 98d0c6e5ab3c..894886d6381b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -730,7 +730,7 @@ struct amdgpu_device {
> #ifdef CONFIG_DRM_AMD_ACP
> struct amdgpu_acp acp;
> #endif
> -
> + void *hive;
Any reason not to use the struct amdgpu_hive_info here?
> /* ASIC */
> enum amd_asic_type asic_type;
> uint32_t family;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index f323281c82b0..bc6ef0caf157 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2857,7 +2857,7 @@ static void amdgpu_device_xgmi_reset_func(struct work_struct *__work)
> {
> struct amdgpu_device *adev =
> container_of(__work, struct amdgpu_device, xgmi_reset_work);
> - struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev, 0);
> + struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev);
>
> /* It's a bug to not have a hive within this function */
> if (WARN_ON(!hive))
> @@ -2895,6 +2895,7 @@ static void amdgpu_device_xgmi_reset_func(struct work_struct *__work)
> if (adev->asic_reset_res)
> DRM_WARN("ASIC reset failed with error, %d for drm dev, %s",
> adev->asic_reset_res, adev->ddev->unique);
> + amdgpu_put_xgmi_hive(hive);
> }
>
> static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
> @@ -4315,7 +4316,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
> * We always reset all schedulers for device and all devices for XGMI
> * hive so that should take care of them too.
> */
> - hive = amdgpu_get_xgmi_hive(adev, false);
> + hive = amdgpu_get_xgmi_hive(adev);
> if (hive) {
> if (atomic_cmpxchg(&hive->in_reset, 0, 1) != 0) {
> DRM_INFO("Bailing on TDR for s_job:%llx, hive: %llx as another already in progress",
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index bf71f0a58786..18cdd259d568 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -1555,9 +1555,10 @@ static void amdgpu_ras_do_recovery(struct work_struct *work)
> struct amdgpu_device *remote_adev = NULL;
> struct amdgpu_device *adev = ras->adev;
> struct list_head device_list, *device_list_handle = NULL;
> - struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev, false);
>
> if (!ras->disable_ras_err_cnt_harvest) {
> + struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev);
> +
> /* Build list of devices to query RAS related errors */
> if (hive && adev->gmc.xgmi.num_physical_nodes > 1) {
> device_list_handle = &hive->device_list;
> @@ -1570,6 +1571,8 @@ static void amdgpu_ras_do_recovery(struct work_struct *work)
> list_for_each_entry(remote_adev,
> device_list_handle, gmc.xgmi.head)
> amdgpu_ras_log_on_err_counter(remote_adev);
> +
> + amdgpu_put_xgmi_hive(hive);
> }
>
> if (amdgpu_device_should_recover_gpu(ras->adev))
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> index 7a61dc6738eb..c6bd5f0c1339 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
> @@ -35,11 +35,9 @@
>
> static DEFINE_MUTEX(xgmi_mutex);
>
> -#define AMDGPU_MAX_XGMI_HIVE 8
> #define AMDGPU_MAX_XGMI_DEVICE_PER_HIVE 4
>
> -static struct amdgpu_hive_info xgmi_hives[AMDGPU_MAX_XGMI_HIVE];
> -static unsigned hive_count = 0;
> +static LIST_HEAD(xgmi_hive_list);
>
> static const int xgmi_pcs_err_status_reg_vg20[] = {
> smnXGMI0_PCS_GOPX16_PCS_ERROR_STATUS,
> @@ -171,59 +169,47 @@ static const struct amdgpu_pcs_ras_field wafl_pcs_ras_fields[] = {
> *
> */
>
> +static struct attribute amdgpu_xgmi_hive_id = {
> + .name = "xgmi_hive_id",
> + .mode = S_IRUGO
> +};
>
> -static ssize_t amdgpu_xgmi_show_hive_id(struct device *dev,
> - struct device_attribute *attr, char *buf)
> -{
> - struct amdgpu_hive_info *hive =
> - container_of(attr, struct amdgpu_hive_info, dev_attr);
> -
> - return snprintf(buf, PAGE_SIZE, "%llu\n", hive->hive_id);
> -}
> +static struct attribute *amdgpu_xgmi_hive_attrs[] = {
> + &amdgpu_xgmi_hive_id,
> + NULL
> +};
>
> -static int amdgpu_xgmi_sysfs_create(struct amdgpu_device *adev,
> - struct amdgpu_hive_info *hive)
> +static ssize_t amdgpu_xgmi_show_attrs(struct kobject *kobj,
> + struct attribute *attr, char *buf)
> {
> - int ret = 0;
> + struct amdgpu_hive_info *hive = container_of(
> + kobj, struct amdgpu_hive_info, kobj);
>
> - if (WARN_ON(hive->kobj))
> - return -EINVAL;
> -
> - hive->kobj = kobject_create_and_add("xgmi_hive_info", &adev->dev->kobj);
> - if (!hive->kobj) {
> - dev_err(adev->dev, "XGMI: Failed to allocate sysfs entry!\n");
> - return -EINVAL;
> - }
> -
> - hive->dev_attr = (struct device_attribute) {
> - .attr = {
> - .name = "xgmi_hive_id",
> - .mode = S_IRUGO,
> + if (attr == &amdgpu_xgmi_hive_id)
> + return snprintf(buf, PAGE_SIZE, "%llu\n", hive->hive_id);
>
> - },
> - .show = amdgpu_xgmi_show_hive_id,
> - };
> -
> - ret = sysfs_create_file(hive->kobj, &hive->dev_attr.attr);
> - if (ret) {
> - dev_err(adev->dev, "XGMI: Failed to create device file xgmi_hive_id\n");
> - kobject_del(hive->kobj);
> - kobject_put(hive->kobj);
> - hive->kobj = NULL;
> - }
> -
> - return ret;
> + return 0;
> }
>
> -static void amdgpu_xgmi_sysfs_destroy(struct amdgpu_device *adev,
> - struct amdgpu_hive_info *hive)
> +static void amdgpu_xgmi_hive_release(struct kobject *kobj)
> {
> - sysfs_remove_file(hive->kobj, &hive->dev_attr.attr);
> - kobject_del(hive->kobj);
> - kobject_put(hive->kobj);
> - hive->kobj = NULL;
> + struct amdgpu_hive_info *hive = container_of(
> + kobj, struct amdgpu_hive_info, kobj);
> +
> + mutex_destroy(&hive->hive_lock);
> + kfree(hive);
> }
>
> +static const struct sysfs_ops amdgpu_xgmi_hive_ops = {
> + .show = amdgpu_xgmi_show_attrs,
> +};
> +
> +struct kobj_type amdgpu_xgmi_hive_type = {
> + .release = amdgpu_xgmi_hive_release,
> + .sysfs_ops = &amdgpu_xgmi_hive_ops,
> + .default_attrs = amdgpu_xgmi_hive_attrs,
> +};
> +
> static ssize_t amdgpu_xgmi_show_device_id(struct device *dev,
> struct device_attribute *attr,
> char *buf)
> @@ -287,8 +273,8 @@ static int amdgpu_xgmi_sysfs_add_dev_info(struct amdgpu_device *adev,
>
>
> /* Create sysfs link to hive info folder on the first device */
> - if (adev != hive->adev) {
> - ret = sysfs_create_link(&adev->dev->kobj, hive->kobj,
> + if (hive->kobj.parent != (&adev->dev->kobj)) {
> + ret = sysfs_create_link(&adev->dev->kobj, &hive->kobj,
> "xgmi_hive_info");
> if (ret) {
> dev_err(adev->dev, "XGMI: Failed to create link to hive info");
> @@ -296,9 +282,9 @@ static int amdgpu_xgmi_sysfs_add_dev_info(struct amdgpu_device *adev,
> }
> }
>
> - sprintf(node, "node%d", hive->number_devices);
> + sprintf(node, "node%d", atomic_read(&hive->number_devices));
> /* Create sysfs link form the hive folder to yourself */
> - ret = sysfs_create_link(hive->kobj, &adev->dev->kobj, node);
> + ret = sysfs_create_link(&hive->kobj, &adev->dev->kobj, node);
> if (ret) {
> dev_err(adev->dev, "XGMI: Failed to create link from hive info");
> goto remove_link;
> @@ -326,78 +312,97 @@ static void amdgpu_xgmi_sysfs_rem_dev_info(struct amdgpu_device *adev,
> device_remove_file(adev->dev, &dev_attr_xgmi_device_id);
> device_remove_file(adev->dev, &dev_attr_xgmi_error);
>
> - if (adev != hive->adev)
> + if (hive->kobj.parent != (&adev->dev->kobj))
> sysfs_remove_link(&adev->dev->kobj,"xgmi_hive_info");
>
> - sprintf(node, "node%d", hive->number_devices);
> - sysfs_remove_link(hive->kobj, node);
> + sprintf(node, "node%d", atomic_read(&hive->number_devices));
> + sysfs_remove_link(&hive->kobj, node);
>
> }
>
>
>
> -struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct amdgpu_device *adev, int lock)
> +struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct amdgpu_device *adev)
> {
> - int i;
> - struct amdgpu_hive_info *tmp;
> + struct amdgpu_hive_info *hive = NULL, *tmp = NULL;
> + int ret = 0;
Please don't initialize ret here.
Apart from looks good on first glance, but somebody with more XGMI
background needs to take a look.
Christian.
>
> if (!adev->gmc.xgmi.hive_id)
> return NULL;
>
> + if (adev->hive) {
> + hive = (struct amdgpu_hive_info *)adev->hive;
> + kobject_get(&hive->kobj);
> + return hive;
> + }
> +
> mutex_lock(&xgmi_mutex);
>
> - for (i = 0 ; i < hive_count; ++i) {
> - tmp = &xgmi_hives[i];
> - if (tmp->hive_id == adev->gmc.xgmi.hive_id) {
> - if (lock)
> - mutex_lock(&tmp->hive_lock);
> - mutex_unlock(&xgmi_mutex);
> - return tmp;
> + if (!list_empty(&xgmi_hive_list)) {
> + list_for_each_entry_safe(hive, tmp, &xgmi_hive_list, node) {
> + if (hive->hive_id == adev->gmc.xgmi.hive_id)
> + goto pro_end;
> }
> }
> - if (i >= AMDGPU_MAX_XGMI_HIVE) {
> - mutex_unlock(&xgmi_mutex);
> - return NULL;
> +
> + hive = kzalloc(sizeof(*hive), GFP_KERNEL);
> + if (!hive) {
> + dev_err(adev->dev, "XGMI: allocation failed\n");
> + hive = NULL;
> + goto pro_end;
> }
>
> /* initialize new hive if not exist */
> - tmp = &xgmi_hives[hive_count++];
> -
> - if (amdgpu_xgmi_sysfs_create(adev, tmp)) {
> - mutex_unlock(&xgmi_mutex);
> - return NULL;
> + ret = kobject_init_and_add(&hive->kobj,
> + &amdgpu_xgmi_hive_type,
> + &adev->dev->kobj,
> + "%s", "xgmi_hive_info");
> + if (ret) {
> + dev_err(adev->dev, "XGMI: failed initializing kobject for xgmi hive\n");
> + kfree(hive);
> + hive = NULL;
> + goto pro_end;
> }
>
> - tmp->adev = adev;
> - tmp->hive_id = adev->gmc.xgmi.hive_id;
> - INIT_LIST_HEAD(&tmp->device_list);
> - mutex_init(&tmp->hive_lock);
> - atomic_set(&tmp->in_reset, 0);
> - task_barrier_init(&tmp->tb);
> -
> - if (lock)
> - mutex_lock(&tmp->hive_lock);
> - tmp->pstate = AMDGPU_XGMI_PSTATE_UNKNOWN;
> - tmp->hi_req_gpu = NULL;
> + hive->hive_id = adev->gmc.xgmi.hive_id;
> + INIT_LIST_HEAD(&hive->device_list);
> + INIT_LIST_HEAD(&hive->node);
> + mutex_init(&hive->hive_lock);
> + atomic_set(&hive->in_reset, 0);
> + atomic_set(&hive->number_devices, 0);
> + task_barrier_init(&hive->tb);
> + hive->pstate = AMDGPU_XGMI_PSTATE_UNKNOWN;
> + hive->hi_req_gpu = NULL;
> /*
> * hive pstate on boot is high in vega20 so we have to go to low
> * pstate on after boot.
> */
> - tmp->hi_req_count = AMDGPU_MAX_XGMI_DEVICE_PER_HIVE;
> + hive->hi_req_count = AMDGPU_MAX_XGMI_DEVICE_PER_HIVE;
> + list_add_tail(&hive->node, &xgmi_hive_list);
> +
> +pro_end:
> + if (hive)
> + kobject_get(&hive->kobj);
> mutex_unlock(&xgmi_mutex);
> + return hive;
> +}
>
> - return tmp;
> +void amdgpu_put_xgmi_hive(struct amdgpu_hive_info *hive)
> +{
> + if (hive)
> + kobject_put(&hive->kobj);
> }
>
> int amdgpu_xgmi_set_pstate(struct amdgpu_device *adev, int pstate)
> {
> int ret = 0;
> - struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev, 0);
> + struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev);
> struct amdgpu_device *request_adev = hive->hi_req_gpu ?
> hive->hi_req_gpu : adev;
> bool is_hi_req = pstate == AMDGPU_XGMI_PSTATE_MAX_VEGA20;
> bool init_low = hive->pstate == AMDGPU_XGMI_PSTATE_UNKNOWN;
>
> + amdgpu_put_xgmi_hive(hive);
> /* fw bug so temporarily disable pstate switching */
> return 0;
>
> @@ -449,7 +454,7 @@ int amdgpu_xgmi_update_topology(struct amdgpu_hive_info *hive, struct amdgpu_dev
>
> /* Each psp need to set the latest topology */
> ret = psp_xgmi_set_topology_info(&adev->psp,
> - hive->number_devices,
> + atomic_read(&hive->number_devices),
> &adev->psp.xgmi_context.top_info);
> if (ret)
> dev_err(adev->dev,
> @@ -511,7 +516,7 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev)
> adev->gmc.xgmi.node_id = adev->gmc.xgmi.physical_node_id + 16;
> }
>
> - hive = amdgpu_get_xgmi_hive(adev, 1);
> + hive = amdgpu_get_xgmi_hive(adev);
> if (!hive) {
> ret = -EINVAL;
> dev_err(adev->dev,
> @@ -519,6 +524,7 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev)
> adev->gmc.xgmi.node_id, adev->gmc.xgmi.hive_id);
> goto exit;
> }
> + mutex_lock(&hive->hive_lock);
>
> top_info = &adev->psp.xgmi_context.top_info;
>
> @@ -526,7 +532,7 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev)
> list_for_each_entry(entry, &hive->device_list, head)
> top_info->nodes[count++].node_id = entry->node_id;
> top_info->num_nodes = count;
> - hive->number_devices = count;
> + atomic_set(&hive->number_devices, count);
>
> task_barrier_add_task(&hive->tb);
>
> @@ -565,35 +571,49 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev)
> exit_unlock:
> mutex_unlock(&hive->hive_lock);
> exit:
> - if (!ret)
> + if (!ret) {
> + adev->hive = hive;
> dev_info(adev->dev, "XGMI: Add node %d, hive 0x%llx.\n",
> adev->gmc.xgmi.physical_node_id, adev->gmc.xgmi.hive_id);
> - else
> + } else {
> + amdgpu_put_xgmi_hive(hive);
> dev_err(adev->dev, "XGMI: Failed to add node %d, hive 0x%llx ret: %d\n",
> adev->gmc.xgmi.physical_node_id, adev->gmc.xgmi.hive_id,
> ret);
> + }
>
> return ret;
> }
>
> int amdgpu_xgmi_remove_device(struct amdgpu_device *adev)
> {
> - struct amdgpu_hive_info *hive;
> + struct amdgpu_hive_info *hive =
> + (struct amdgpu_hive_info *) adev->hive;
>
> if (!adev->gmc.xgmi.supported)
> return -EINVAL;
>
> - hive = amdgpu_get_xgmi_hive(adev, 1);
> if (!hive)
> return -EINVAL;
>
> + mutex_lock(&hive->hive_lock);
> task_barrier_rem_task(&hive->tb);
> amdgpu_xgmi_sysfs_rem_dev_info(adev, hive);
> + if (hive->hi_req_gpu == adev)
> + hive->hi_req_gpu = NULL;
> + list_del(&adev->gmc.xgmi.head);
> mutex_unlock(&hive->hive_lock);
>
> - if(!(--hive->number_devices)){
> - amdgpu_xgmi_sysfs_destroy(adev, hive);
> - mutex_destroy(&hive->hive_lock);
> + amdgpu_put_xgmi_hive(hive);
> + adev->hive = NULL;
> +
> + if (atomic_dec_return(&hive->number_devices) == 0) {
> + /* Remove the hive from global hive list */
> + mutex_lock(&xgmi_mutex);
> + list_del(&hive->node);
> + mutex_unlock(&xgmi_mutex);
> +
> + amdgpu_put_xgmi_hive(hive);
> }
>
> return psp_xgmi_terminate(&adev->psp);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h
> index 453336ca9675..148560d63554 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h
> @@ -27,13 +27,12 @@
>
>
> struct amdgpu_hive_info {
> - uint64_t hive_id;
> - struct list_head device_list;
> - int number_devices;
> + struct kobject kobj;
> + uint64_t hive_id;
> + struct list_head device_list;
> + struct list_head node;
> + atomic_t number_devices;
> struct mutex hive_lock;
> - struct kobject *kobj;
> - struct device_attribute dev_attr;
> - struct amdgpu_device *adev;
> atomic_t in_reset;
> int hi_req_count;
> struct amdgpu_device *hi_req_gpu;
> @@ -51,7 +50,8 @@ struct amdgpu_pcs_ras_field {
> uint32_t pcs_err_shift;
> };
>
> -struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct amdgpu_device *adev, int lock);
> +struct amdgpu_hive_info *amdgpu_get_xgmi_hive(struct amdgpu_device *adev);
> +void amdgpu_put_xgmi_hive(struct amdgpu_hive_info *hive);
> int amdgpu_xgmi_update_topology(struct amdgpu_hive_info *hive, struct amdgpu_device *adev);
> int amdgpu_xgmi_add_device(struct amdgpu_device *adev);
> int amdgpu_xgmi_remove_device(struct amdgpu_device *adev);
More information about the amd-gfx
mailing list