[Intel-gfx] [PXP CLEAN PATCH v06 21/27] drm/i915/pxp: Add i915 trace logs for PXP operations

Sean Z Huang
2020-11-14T00:37:43Z

Add several i915 trace logs for PXP calls for debugging or
performance measurement, including:
(1) PXP ioctl
(2) PXP teardown callbacks

To trun on this feature, we need to set
"CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=y" in .config for compiling
the Linux kernel.

Signed-off-by: Huang, Sean Z <sean.z.huang@intel.com>
---
drivers/gpu/drm/i915/i915_trace.h | 44 ++++++++++++++++++++++++++++
drivers/gpu/drm/i915/pxp/intel_pxp.c | 5 ++++
2 files changed, 49 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h
index a4addcc64978..36470e20dc61 100644
--- a/drivers/gpu/drm/i915/i915_trace.h
+++ b/drivers/gpu/drm/i915/i915_trace.h
@@ -1031,6 +1031,50 @@ DEFINE_EVENT(i915_context, i915_context_free,
TP_ARGS(ctx)
);

+TRACE_EVENT(i915_pxp_ops_ioctl,
+ TP_PROTO(struct drm_device *dev, void *data, struct drm_file *file, u32 action),
+ TP_ARGS(dev, data, file, action),
+
+ TP_STRUCT__entry(
+ __field(struct drm_device *, dev)
+ __field(void *, data)
+ __field(struct drm_file *, file)
+ __field(u32, action)
+ ),
+
+ TP_fast_assign(
+ __entry->dev = dev;
+ __entry->data = data;
+ __entry->file = file;
+ __entry->action = action;
+ ),
+
+ TP_printk("dev=%p, data=%p, file=%p, action=%u",
+ __entry->dev, __entry->data, __entry->file, __entry->action)
+);
+
+TRACE_EVENT(i915_pxp_teardown_required_callback,
+ TP_PROTO(bool global_state_attacked),
+ TP_ARGS(global_state_attacked),
+
+ TP_STRUCT__entry(__field(bool, global_state_attacked)),
+
+ TP_fast_assign(__entry->global_state_attacked = global_state_attacked;),
+
+ TP_printk("global_state_attacked=%s", yesno(__entry->global_state_attacked))
+);
+
+TRACE_EVENT(i915_pxp_global_terminate_complete_callback,
+ TP_PROTO(bool global_state_attacked),
+ TP_ARGS(global_state_attacked),
+
+ TP_STRUCT__entry(__field(bool, global_state_attacked)),
+
+ TP_fast_assign(__entry->global_state_attacked = global_state_attacked;),
+
+ TP_printk("global_state_attacked=%s", yesno(__entry->global_state_attacked))
+);
+
#endif /* _I915_TRACE_H_ */

/* This part must be outside protection */
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c
index 80e632b614f5..23955d7a3c3d 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c
@@ -8,6 +8,7 @@
#include "intel_pxp_context.h"
#include "intel_pxp_sm.h"
#include "intel_pxp_tee.h"
+#include "i915_trace.h"

int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmfile)
{
@@ -30,6 +31,7 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf
}

drm_dbg(&i915->drm, "i915 pxp ioctl call with action=[%d]\n", pxp_info.action);
+ trace_i915_pxp_ops_ioctl(dev, data, drmfile, pxp_info.action);

mutex_lock(&i915->pxp.r0ctx->ctx_mutex);

@@ -219,6 +221,8 @@ static int intel_pxp_teardown_required_callback(struct drm_i915_private *i915)

mutex_unlock(&i915->pxp.r0ctx->ctx_mutex);

+ trace_i915_pxp_teardown_required_callback(i915->pxp.r0ctx->global_state_attacked);
+
return ret;
}

@@ -243,6 +247,7 @@ static int intel_pxp_global_terminate_complete_callback(struct drm_i915_private
end:
mutex_unlock(&i915->pxp.r0ctx->ctx_mutex);

+ trace_i915_pxp_global_terminate_complete_callback(i915->pxp.r0ctx->global_state_attacked);
drm_dbg(&i915->drm, "<<< %s ret=[%d]\n", __func__, ret);

return ret;