nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: refcount ctrl node with tsg open and close

Browse Source 
Since tsg close refers to the ctrl node to revoke the share tokens, need
to ensure that ctrl node remains active until after contained tsgs are
released.

Bug 3946749

Change-Id: I3b514f6d2a041cbf3d517f846f202f956747d726
Signed-off-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2872115
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sagar Kamble
2023-03-15 11:49:16 +00:00
committed by mobile promotions
parent ac9a59075e
commit dc0dc2e96a
3 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/gpu/nvgpu/os/linux/ioctl_tsg.c
View File

@@ -696,7 +696,12 @@ int nvgpu_ioctl_tsg_open(struct gk20a *g, struct gk20a_ctrl_priv *ctrl_priv,
priv->g = g;
priv->tsg = tsg;
priv->cdev = cdev;
if (ctrl_priv != NULL) {
nvgpu_ref_get(&ctrl_priv->refcount);
}
priv->ctrl_priv = ctrl_priv;
filp->private_data = priv;
return 0;
@@ -766,25 +771,30 @@ int nvgpu_ioctl_tsg_dev_release(struct inode *inode, struct file *filp)
g = tsg->g;
#ifdef CONFIG_NVGPU_TSG_SHARING
nvgpu_mutex_acquire(&tsg->tsg_share_lock);
if (priv->ctrl_priv) {
nvgpu_mutex_acquire(&tsg->tsg_share_lock);
err = nvgpu_gpu_tsg_revoke_share_tokens(g,
nvgpu_gpu_get_device_instance_id(priv->ctrl_priv),
tsg, &count);
if (err != 0) {
nvgpu_err(g, "revoke token(%llu) failed %d",
nvgpu_gpu_get_device_instance_id(priv->ctrl_priv),
err);
err = nvgpu_gpu_tsg_revoke_share_tokens(g,
nvgpu_gpu_get_device_instance_id(priv->ctrl_priv),
tsg, &count);
if (err != 0) {
nvgpu_err(g, "revoke token(%llu) failed %d",
nvgpu_gpu_get_device_instance_id(priv->ctrl_priv),
err);
}
tsg->share_token_count -= count;
nvgpu_mutex_release(&tsg->tsg_share_lock);
nvgpu_tsg_remove_ctrl_dev_inst_id(tsg, priv->ctrl_priv);
}
tsg->share_token_count -= count;
nvgpu_mutex_release(&tsg->tsg_share_lock);
nvgpu_tsg_remove_ctrl_dev_inst_id(tsg, priv->ctrl_priv);
#endif
nvgpu_ref_put(&tsg->refcount, nvgpu_ioctl_tsg_release);
if (priv->ctrl_priv) {
nvgpu_ref_put(&priv->ctrl_priv->refcount, nvgpu_ioctl_ctrl_release);
}
nvgpu_kfree(g, priv);
nvgpu_put(g);