From: Akash Goel <akash.g...@intel.com>

GuC firmware sends an interrupt to flush the log buffer when it
becomes half full. GuC firmware also tracks how many times the
buffer overflowed.
It would be useful to maintain a statistics of how many flush
interrupts were received and for which type of log buffer,
along with the overflow count of each buffer type.
Augmented i915_log_info debugfs to report back these statistics.

v2:
- Update the logic to detect multiple overflows between the 2
  flush interrupts and also log a message for overflow (Tvrtko)
- Track the number of times there was no free sub buffer to capture
  the GuC log buffer. (Tvrtko)

v3:
- Fix the printf field width for overflow counter, set it to 10 as per the
  max value of u32, which takes 10 digits in decimal form. (Tvrtko)

v4:
- Move the log buffer overflow handling to a new function for better
  readability. (Tvrtko)

Signed-off-by: Akash Goel <akash.g...@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursu...@intel.com>
---
 drivers/gpu/drm/i915/i915_debugfs.c        | 28 +++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_guc_submission.c | 31 +++++++++++++++++++++++++++++-
 drivers/gpu/drm/i915/i915_irq.c            |  2 ++
 drivers/gpu/drm/i915/intel_guc.h           |  7 +++++++
 4 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 0fb9938..e04329b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2408,6 +2408,32 @@ static int i915_guc_load_status_info(struct seq_file *m, 
void *data)
        return 0;
 }
 
+static void i915_guc_log_info(struct seq_file *m,
+                             struct drm_i915_private *dev_priv)
+{
+       struct intel_guc *guc = &dev_priv->guc;
+
+       seq_puts(m, "\nGuC logging stats:\n");
+
+       seq_printf(m, "\tISR:   flush count %10u, overflow count %10u\n",
+                  guc->log.flush_count[GUC_ISR_LOG_BUFFER],
+                  guc->log.total_overflow_count[GUC_ISR_LOG_BUFFER]);
+
+       seq_printf(m, "\tDPC:   flush count %10u, overflow count %10u\n",
+                  guc->log.flush_count[GUC_DPC_LOG_BUFFER],
+                  guc->log.total_overflow_count[GUC_DPC_LOG_BUFFER]);
+
+       seq_printf(m, "\tCRASH: flush count %10u, overflow count %10u\n",
+                  guc->log.flush_count[GUC_CRASH_DUMP_LOG_BUFFER],
+                  guc->log.total_overflow_count[GUC_CRASH_DUMP_LOG_BUFFER]);
+
+       seq_printf(m, "\tTotal flush interrupt count: %u\n",
+                  guc->log.flush_interrupt_count);
+
+       seq_printf(m, "\tCapture miss count: %u\n",
+                  guc->log.capture_miss_count);
+}
+
 static void i915_guc_client_info(struct seq_file *m,
                                 struct drm_i915_private *dev_priv,
                                 struct i915_guc_client *client)
@@ -2481,6 +2507,8 @@ static int i915_guc_info(struct seq_file *m, void *data)
        seq_printf(m, "\nGuC execbuf client @ %p:\n", guc.execbuf_client);
        i915_guc_client_info(m, dev_priv, &client);
 
+       i915_guc_log_info(m, dev_priv);
+
        /* Add more as required ... */
 
        return 0;
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c 
b/drivers/gpu/drm/i915/i915_guc_submission.c
index 04b2e87..e6239d3 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -1016,6 +1016,29 @@ static void *guc_get_write_buffer(struct intel_guc *guc)
        return relay_reserve(guc->log.relay_chan, 0);
 }
 
+static bool
+guc_check_log_buf_overflow(struct intel_guc *guc,
+                          enum guc_log_buffer_type type, unsigned int full_cnt)
+{
+       unsigned int prev_full_cnt = guc->log.prev_overflow_count[type];
+       bool overflow = false;
+
+       if (full_cnt != prev_full_cnt) {
+               overflow = true;
+
+               guc->log.prev_overflow_count[type] = full_cnt;
+               guc->log.total_overflow_count[type] += full_cnt - prev_full_cnt;
+
+               if (full_cnt < prev_full_cnt) {
+                       /* buffer_full_cnt is a 4 bit counter */
+                       guc->log.total_overflow_count[type] += 16;
+               }
+               DRM_ERROR_RATELIMITED("GuC log buffer overflow\n");
+       }
+
+       return overflow;
+}
+
 static unsigned int guc_get_log_buffer_size(enum guc_log_buffer_type type)
 {
        switch (type) {
@@ -1036,7 +1059,7 @@ static void guc_read_update_log_buffer(struct intel_guc 
*guc)
 {
        struct guc_log_buffer_state *log_buf_state, *log_buf_snapshot_state;
        struct guc_log_buffer_state log_buf_state_local;
-       unsigned int buffer_size, write_offset;
+       unsigned int buffer_size, write_offset, full_cnt;
        enum guc_log_buffer_type type;
        void *src_data, *dst_data;
 
@@ -1062,6 +1085,11 @@ static void guc_read_update_log_buffer(struct intel_guc 
*guc)
                       sizeof(struct guc_log_buffer_state));
                buffer_size = guc_get_log_buffer_size(type);
                write_offset = log_buf_state_local.sampled_write_ptr;
+               full_cnt = log_buf_state_local.buffer_full_cnt;
+
+               /* Bookkeeping stuff */
+               guc->log.flush_count[type] += log_buf_state_local.flush_to_file;
+               guc_check_log_buf_overflow(guc, type, full_cnt);
 
                /* Update the state of shared log buffer */
                log_buf_state->read_ptr = write_offset;
@@ -1099,6 +1127,7 @@ static void guc_read_update_log_buffer(struct intel_guc 
*guc)
                 * getting consumed by User at a slow rate.
                 */
                DRM_ERROR_RATELIMITED("no sub-buffer to capture logs\n");
+               guc->log.capture_miss_count++;
        }
 }
 
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 60c28b2..5538b40 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1690,6 +1690,8 @@ static void gen9_guc_irq_handler(struct drm_i915_private 
*dev_priv, u32 gt_iir)
                        /* Handle flush interrupt in bottom half */
                        queue_work(dev_priv->guc.log.flush_wq,
                                   &dev_priv->guc.log.flush_work);
+
+                       dev_priv->guc.log.flush_interrupt_count++;
                } else {
                        /* Not clearing of unhandled event bits won't result in
                         * re-triggering of the interrupt.
diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
index 907d13a..d034c98 100644
--- a/drivers/gpu/drm/i915/intel_guc.h
+++ b/drivers/gpu/drm/i915/intel_guc.h
@@ -130,6 +130,13 @@ struct intel_guc_log {
        struct workqueue_struct *flush_wq;
        struct work_struct flush_work;
        struct rchan *relay_chan;
+
+       /* logging related stats */
+       u32 capture_miss_count;
+       u32 flush_interrupt_count;
+       u32 prev_overflow_count[GUC_MAX_LOG_BUFFER];
+       u32 total_overflow_count[GUC_MAX_LOG_BUFFER];
+       u32 flush_count[GUC_MAX_LOG_BUFFER];
 };
 
 struct intel_guc {
-- 
1.9.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to