UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

habanalabs: re-init completion object upon retry 

In case user interrupt arrived but the completion value is less than
the target value, we want to retry the wait.

However, before the retry we must reinitialize the completion object,
under spin-lock, so the wait function won't exit immediately because
the completion object is already completed (from the previous
interrupt).

Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
This commit is contained in:
Oded Gabbay 2021-07-01 11:42:53 +03:00
parent 82629c71c2
commit d5546d78ad
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/misc/habanalabs/common/command_submission.c
View File

@ -2046,7 +2046,8 @@ static int _hl_interrupt_wait_ioctl(struct hl_device *hdev, struct hl_ctx *ctx,
goto unlock_and_free_fence;
}
if (copy_from_user(&completion_value, u64_to_user_ptr(user_address), 4)) {
if (copy_from_user(&completion_value, u64_to_user_ptr(user_address),
4)) {
dev_err(hdev->dev,
"Failed to copy completion value from user\n");
rc = -EFAULT;
@ -2077,18 +2078,28 @@ wait_again:
* If comparison fails, keep waiting until timeout expires
*/
if (completion_rc > 0) {
spin_lock(&interrupt->wait_list_lock);
if (copy_from_user(&completion_value,
u64_to_user_ptr(user_address), 4)) {
spin_unlock(&interrupt->wait_list_lock);
dev_err(hdev->dev,
"Failed to copy completion value from user\n");
rc = -EFAULT;
goto remove_pending_user_interrupt;
}
if (completion_value >= target_value) {
spin_unlock(&interrupt->wait_list_lock);
*status = CS_WAIT_STATUS_COMPLETED;
} else {
reinit_completion(&pend->fence.completion);
timeout = completion_rc;
spin_unlock(&interrupt->wait_list_lock);
goto wait_again;
}
} else {