summary refs log tree commit diff
diff options
context:
space:
mode:
authorOfir Bitton <obitton@habana.ai>2022-08-28 12:46:27 +0300
committerOded Gabbay <ogabbay@kernel.org>2022-09-19 15:08:37 +0300
commitf5ec364c9ecd1113492e15ceaafd4447f5836528 (patch)
tree0c2ae548cb8b68cb9404eb58eb9cb5f4560e5253
parent4745b2f0d0d4b291ec69619c815f53fd8a968d9a (diff)
downloadlinux-f5ec364c9ecd1113492e15ceaafd4447f5836528.tar.gz
habanalabs: send device activity in a proper context
'Device activity open packet' should be sent outside of mutex as
there is no real necessity for a lock.
In addition 'device activity close packet' should be sent upon an
actual release of the device.

Signed-off-by: Ofir Bitton <obitton@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
-rw-r--r--drivers/misc/habanalabs/common/device.c4
-rw-r--r--drivers/misc/habanalabs/common/habanalabs_drv.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c
index d6df0bd55e9f..5f6407ed3b04 100644
--- a/drivers/misc/habanalabs/common/device.c
+++ b/drivers/misc/habanalabs/common/device.c
@@ -363,6 +363,8 @@ static void hpriv_release(struct kref *ref)
 
 	hdev = hpriv->hdev;
 
+	hdev->asic_funcs->send_device_activity(hdev, false);
+
 	put_pid(hpriv->taskpid);
 
 	hl_debugfs_remove_file(hpriv);
@@ -470,8 +472,6 @@ static int hl_device_release(struct inode *inode, struct file *filp)
 	hdev->last_open_session_duration_jif =
 		jiffies - hdev->last_successful_open_jif;
 
-	hdev->asic_funcs->send_device_activity(hdev, false);
-
 	return 0;
 }
 
diff --git a/drivers/misc/habanalabs/common/habanalabs_drv.c b/drivers/misc/habanalabs/common/habanalabs_drv.c
index 849e54fe78a6..fd9c8680f954 100644
--- a/drivers/misc/habanalabs/common/habanalabs_drv.c
+++ b/drivers/misc/habanalabs/common/habanalabs_drv.c
@@ -204,11 +204,11 @@ int hl_device_open(struct inode *inode, struct file *filp)
 		goto out_err;
 	}
 
-	rc = hdev->asic_funcs->send_device_activity(hdev, true);
-
 	list_add(&hpriv->dev_node, &hdev->fpriv_list);
 	mutex_unlock(&hdev->fpriv_list_lock);
 
+	hdev->asic_funcs->send_device_activity(hdev, true);
+
 	hl_debugfs_add_file(hpriv);
 
 	atomic_set(&hdev->last_error.cs_timeout.write_enable, 1);