Commit 1e3f2536 authored by Ofir Bitton's avatar Ofir Bitton Committed by Oded Gabbay

habanalabs: increment ctx ref from within a cs allocation

A CS must increment the relevant context reference count.
We want to increment the reference inside the CS allocation function
as opposed for today where we increment it outside.
This is logical since we want to avoid explicitly incrementing
the context every time we call the CS allocate function.
Signed-off-by: default avatarOfir Bitton <obitton@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 8563e191
...@@ -479,6 +479,9 @@ static int allocate_cs(struct hl_device *hdev, struct hl_ctx *ctx, ...@@ -479,6 +479,9 @@ static int allocate_cs(struct hl_device *hdev, struct hl_ctx *ctx,
return -ENOMEM; return -ENOMEM;
} }
/* increment refcnt for context */
hl_ctx_get(hdev, ctx);
cs->ctx = ctx; cs->ctx = ctx;
cs->submitted = false; cs->submitted = false;
cs->completed = false; cs->completed = false;
...@@ -550,6 +553,7 @@ static int allocate_cs(struct hl_device *hdev, struct hl_ctx *ctx, ...@@ -550,6 +553,7 @@ static int allocate_cs(struct hl_device *hdev, struct hl_ctx *ctx,
kfree(cs_cmpl); kfree(cs_cmpl);
free_cs: free_cs:
kfree(cs); kfree(cs);
hl_ctx_put(ctx);
return rc; return rc;
} }
...@@ -827,14 +831,9 @@ static int cs_ioctl_default(struct hl_fpriv *hpriv, void __user *chunks, ...@@ -827,14 +831,9 @@ static int cs_ioctl_default(struct hl_fpriv *hpriv, void __user *chunks,
if (rc) if (rc)
goto out; goto out;
/* increment refcnt for context */
hl_ctx_get(hdev, hpriv->ctx);
rc = allocate_cs(hdev, hpriv->ctx, CS_TYPE_DEFAULT, &cs); rc = allocate_cs(hdev, hpriv->ctx, CS_TYPE_DEFAULT, &cs);
if (rc) { if (rc)
hl_ctx_put(hpriv->ctx);
goto free_cs_chunk_array; goto free_cs_chunk_array;
}
cs->timestamp = !!(flags & HL_CS_FLAGS_TIMESTAMP); cs->timestamp = !!(flags & HL_CS_FLAGS_TIMESTAMP);
*cs_seq = cs->sequence; *cs_seq = cs->sequence;
...@@ -1276,15 +1275,11 @@ static int cs_ioctl_signal_wait(struct hl_fpriv *hpriv, enum hl_cs_type cs_type, ...@@ -1276,15 +1275,11 @@ static int cs_ioctl_signal_wait(struct hl_fpriv *hpriv, enum hl_cs_type cs_type,
} }
} }
/* increment refcnt for context */
hl_ctx_get(hdev, ctx);
rc = allocate_cs(hdev, ctx, cs_type, &cs); rc = allocate_cs(hdev, ctx, cs_type, &cs);
if (rc) { if (rc) {
if (cs_type == CS_TYPE_WAIT || if (cs_type == CS_TYPE_WAIT ||
cs_type == CS_TYPE_COLLECTIVE_WAIT) cs_type == CS_TYPE_COLLECTIVE_WAIT)
hl_fence_put(sig_fence); hl_fence_put(sig_fence);
hl_ctx_put(ctx);
goto free_cs_chunk_array; goto free_cs_chunk_array;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment