]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
accel/habanalabs: minimize encapsulation signal mutex lock time
authorKoby Elbaz <kelbaz@habana.ai>
Mon, 17 Apr 2023 12:14:30 +0000 (15:14 +0300)
committerOded Gabbay <ogabbay@kernel.org>
Thu, 8 Jun 2023 09:35:54 +0000 (12:35 +0300)
Sync Stream Encapsulated Signal Handlers can be managed from different
contexts, and as such they are protected via a spin_lock.
However, spin_lock was unnecessarily protecting a larger code section
than really needed, covering a sleepable code section as well.
Since spin_lock disables preemption, it could lead to sleeping in
atomic context.

Signed-off-by: Koby Elbaz <kelbaz@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
drivers/accel/habanalabs/common/command_submission.c

index af9d2e22c6e7e08990a3cd4794a5a799203ff1ce..977cd2710686d0c60540b7291da7cac5dc28f467 100644 (file)
@@ -2152,7 +2152,7 @@ static int cs_ioctl_unreserve_signals(struct hl_fpriv *hpriv, u32 handle_id)
 
                        hdev->asic_funcs->hw_queues_unlock(hdev);
                        rc = -EINVAL;
-                       goto out;
+                       goto out_unlock;
                }
 
                /*
@@ -2167,15 +2167,21 @@ static int cs_ioctl_unreserve_signals(struct hl_fpriv *hpriv, u32 handle_id)
 
                /* Release the id and free allocated memory of the handle */
                idr_remove(&mgr->handles, handle_id);
+
+               /* unlock before calling ctx_put, where we might sleep */
+               spin_unlock(&mgr->lock);
                hl_ctx_put(encaps_sig_hdl->ctx);
                kfree(encaps_sig_hdl);
+               goto out;
        } else {
                rc = -EINVAL;
                dev_err(hdev->dev, "failed to unreserve signals, cannot find handler\n");
        }
-out:
+
+out_unlock:
        spin_unlock(&mgr->lock);
 
+out:
        return rc;
 }