From: "Huang, Sean Z" <sean.z.huang@xxxxxxxxx>
Enable the PXP ioctl action to allow ring3 PXP to terminate the
hardware session and cleanup its software session state.
Ring0 PXP sends the session termination command to GPU once
receves this ioctl action.
Signed-off-by: Huang, Sean Z <sean.z.huang@xxxxxxxxx>
---
drivers/gpu/drm/i915/pxp/intel_pxp.c | 7 +
drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 205 ++++++++++++++++++++++++
drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 5 +
3 files changed, 217 insertions(+)
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c
index baa61a3a70ff..72a2237b504b 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c
@@ -65,6 +65,13 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf
ret = pxp_sm_mark_protected_session_in_play(i915, params->session_type,
params->pxp_tag);
+ } else if (params->req_session_state == PXP_SM_REQ_SESSION_TERMINATE) {
+ ret = pxp_sm_terminate_protected_session_safe(i915, 0,
+ params->session_type,
+ params->pxp_tag);
+
+ if (!intel_pxp_sm_is_any_type0_session_in_play(i915, PROTECTION_MODE_ALL))
+ intel_pxp_destroy_r3ctx_list(i915);
} else {
ret = -EINVAL;
goto end;
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c
index 0e1ce75f9ccd..b1adfa735d4f 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c
@@ -893,6 +893,189 @@ static int issue_hw_terminate_for_session(struct drm_i915_private *i915, int ses
return ret;
}
+/**
+ * terminate_protected_session - To terminate an active HW session and free its entry.
+ * @i915: i915 device handle.
+ * @context_id: context identifier of the requestor. only relevant if do_safety_check is true.
+ * @session_type: type of the session to be terminated. One of enum pxp_session_types.
+ * @session_index: session index of the session to be terminated.
+ * @do_safety_check: if enabled the context Id sent by the caller is
+ * matched with the one associated with the terminated
+ * session entry.
+ *
+ * Return: status. 0 means terminate is successful.
+ */
+static int terminate_protected_session(struct drm_i915_private *i915, int context_id,
+ int session_type, int session_index,
+ bool do_safety_check)
+{
+ int ret;
+ struct pxp_protected_session *current_session, *n;
+
+ drm_dbg(&i915->drm, ">>> %s conext_id=[%d] session_type=[%d] session_index=[0x%08x] do_safety_check=[%d]\n",
+ __func__, context_id, session_type, session_index, do_safety_check);
+
+ lockdep_assert_held(&i915->pxp.r0ctx->ctx_mutex);
+
+ switch (session_type) {
+ case SESSION_TYPE_TYPE0:
+ list_for_each_entry_safe(current_session, n, &i915->pxp.r0ctx->active_pxp_type0_sessions, session_list) {
+ if (current_session->session_index == session_index) {
+ if (do_safety_check && current_session->context_id != context_id) {
+ ret = -EPERM;
+ drm_dbg(&i915->drm, "Failed to %s due to invalid context_id=[%d]\n", __func__, context_id);
+ goto end;
+ }
+
+ ret = issue_hw_terminate_for_session(i915, session_type, session_index);
+ if (ret) {
+ drm_dbg(&i915->drm, "Failed to issue_hw_terminate_for_session()\n");
+ goto end;
+ }
+
+ ret = pxp_set_pxp_tag(i915, session_type, session_index, PROTECTION_MODE_NONE);
+ if (ret) {
+ drm_dbg(&i915->drm, "Failed to pxp_set_pxp_tag()\n");
+ goto end;
+ }
+
+ /* delete the current session entry from the linked list */
+ list_del(¤t_session->session_list);
+
+ /* free the memory associated with the current context entry */
+ kfree(current_session);
+
+ /* TODO: special arbitrator session checks? */
+
+ ret = 0;
+ goto end;
+ }
+ }
+
+ drm_dbg(&i915->drm, "Warning - Couldn't find the type0 session_index=[0x%08x]\n", session_index);
+ ret = 0;
+ break;
+
+ case SESSION_TYPE_TYPE1:
+ list_for_each_entry_safe(current_session, n, &i915->pxp.r0ctx->active_pxp_type1_sessions, session_list) {
+ if (current_session->session_index == session_index) {
+ if (do_safety_check && current_session->context_id != context_id) {
+ ret = -EPERM;
+ drm_dbg(&i915->drm, "Failed to %s due to invalid context_id=[%d]\n", __func__, context_id);
+ goto end;
+ }
+
+ ret = issue_hw_terminate_for_session(i915, session_type, session_index);
+ if (ret) {
+ drm_dbg(&i915->drm, "Failed to issue_hw_terminate_for_session()\n");
+ goto end;
+ }
+
+ ret = pxp_set_pxp_tag(i915, session_type, session_index, PROTECTION_MODE_NONE);
+ if (ret) {
+ drm_dbg(&i915->drm, "Failed to pxp_set_pxp_tag()\n");
+ goto end;
+ }
+
+ /* delete the current session entry from the linked list */
+ list_del(¤t_session->session_list);
+
+ /* free the memory associated with the current context entry */
+ kfree(current_session);
+
+ ret = 0;
+ goto end;
+ }
+ }
+
+ drm_dbg(&i915->drm, "Warning - Couldn't find the type1 session_index=[0x%08x]\n", session_index);
+ ret = 0;
+ break;
+
+ default:
+ /* invalid session type */
+ ret = -EINVAL;
+ break;
+ }
+end:
+ drm_dbg(&i915->drm, "<<< %s ret=[%d]\n", __func__, ret);
+ return ret;
+}
+
+/**
+ * pxp_sm_terminate_protected_session_safe - to terminate an active HW session and free its entry.
+ * @i915: i915 device handle.
+ * @context_id: context identifier of the requestor.
+ * @session_type: type of the session to be terminated. One of enum pxp_session_types.
+ * @session_id: session id identifier of the session to be terminated.
+ *
+ * For safety, the context Id sent by the caller is matched with the
+ * one associated with the terminated session entry. * Terminate is
+ * only issued if context Ids match. Rejected otherwise This function
+ * is intended to be called from the ioctl.
+ *
+ * Return: status. 0 means terminate is successful.
+ */
+int pxp_sm_terminate_protected_session_safe(struct drm_i915_private *i915, int context_id,
+ int session_type, int session_id)
+{
+ int ret;
+ int session_type_in_id;
+ int session_idx;
+
+ ret = pxp_get_session_index(i915, session_id, &session_idx, &session_type_in_id);
+ if (ret) {
+ drm_dbg(&i915->drm, "Failed to pxp_get_session_index\n");
+ return ret;
+ }
+
+ if (session_type != session_type_in_id) {
+ ret = -EINVAL;
+ drm_dbg(&i915->drm, "Failed to session_type and session_type_in_id don't match\n");
+ return ret;
+ }
+
+ ret = terminate_protected_session(i915, context_id, session_type, session_idx, true);
+
+ return ret;
+}
+
+/**
+ * pxp_sm_terminate_protected_session_unsafe - To terminate an active HW session and free its entry.
+ * @i915: i915 device handle.
+ * @session_type: type of the session to be terminated. One of enum pxp_session_types.
+ * @session_id: session id identifier of the session to be terminated.
+ *
+ * No safety; the context Id sent by the caller is not matched with
+ * the one associated with the terminated session entry. This function
+ * is NOT intended to be called from the ioctl. Kernel administration
+ * purposes only.
+ *
+ * Return: status. 0 means terminate is successful.
+ */
+int pxp_sm_terminate_protected_session_unsafe(struct drm_i915_private *i915, int session_type, int session_id)
+{
+ int ret;
+ int session_idx;
+ int session_type_in_id;
+
+ ret = pxp_get_session_index(i915, session_id, &session_idx, &session_type_in_id);
+ if (ret) {
+ drm_dbg(&i915->drm, "Failed to pxp_get_session_index\n");
+ return ret;
+ }
+
+ if (session_type != session_type_in_id) {
+ ret = -EINVAL;
+ drm_dbg(&i915->drm, "Failed to session_type and session_type_in_id don't match\n");
+ return ret;
+ }
+
+ ret = terminate_protected_session(i915, -1, session_type, session_idx, false);
+
+ return ret;
+}
+
int pxp_sm_set_kcr_init_reg(struct drm_i915_private *i915)
{
int ret;
@@ -909,3 +1092,25 @@ int pxp_sm_set_kcr_init_reg(struct drm_i915_private *i915)
drm_dbg(&i915->drm, "<<< %s ret=[%d]\n", __func__, ret);
return ret;
}
+
+/**
+ * intel_pxp_sm_is_any_type0_session_in_play - To check if there is a type0 "in play" session.
+ * @i915: i915 device handle.
+ * @protection_mode: check for specified protection mode of the session
+ *
+ * Return: True if at least one alive session in "session in play" state, false otherwise.
+ */
+bool intel_pxp_sm_is_any_type0_session_in_play(struct drm_i915_private *i915, int protection_mode)
+{
+ struct pxp_protected_session *session, *n;
+
+ list_for_each_entry_safe(session, n, pxp_session_list(i915, SESSION_TYPE_TYPE0),
+ session_list) {
+ if (protection_mode == PROTECTION_MODE_ALL)
+ return true;
+ else if (protection_mode == session->protection_mode)
+ return true;
+ }
+
+ return false;
+}
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h
index 2a6fbf40da04..26597b1d18e1 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h
@@ -104,6 +104,11 @@ int intel_pxp_sm_reserve_session(struct drm_i915_private *i915, struct drm_file
u32 *pxp_tag);
int pxp_sm_mark_protected_session_in_play(struct drm_i915_private *i915, int session_type,
u32 session_id);
+int pxp_sm_terminate_protected_session_safe(struct drm_i915_private *i915, int context_id,
+ int session_type, int session_id);
+int pxp_sm_terminate_protected_session_unsafe(struct drm_i915_private *i915, int session_type,
+ int session_id);
int pxp_sm_set_kcr_init_reg(struct drm_i915_private *i915);
+bool intel_pxp_sm_is_any_type0_session_in_play(struct drm_i915_private *i915, int protection_mode);
#endif /* __INTEL_PXP_SM_H__ */
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
