drm/i915/guc: Don't print out relay statistics when relay is disabled

If nobody has enabled the relay, we're not comunicating with GuC, which
means that the stats don't have any meaning. Let's also remove interrupt
counter and tidy the debugfs formatting.

v2: Correct stats accounting (Sagar)
v3: Corrected one more error in stats accounting, move relay_enabled (Sagar)

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180319095348.9716-9-michal.winiarski@intel.com

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 5584736a42935f436a207731c2fcaf38cfd05bb4..964ea1a1235706baf5dad8e42cf70eb806a617e0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2325,30 +2325,45 @@ 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)
+static const char *
+stringify_guc_log_type(enum guc_log_buffer_type type)
 {
-       struct intel_guc *guc = &dev_priv->guc;
-
-       seq_puts(m, "GuC logging stats:\n");
+       switch (type) {
+       case GUC_ISR_LOG_BUFFER:
+               return "ISR";
+       case GUC_DPC_LOG_BUFFER:
+               return "DPC";
+       case GUC_CRASH_DUMP_LOG_BUFFER:
+               return "CRASH";
+       default:
+               MISSING_CASE(type);
+       }
 
-       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]);
+       return "";
+}
 
-       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]);
+static void i915_guc_log_info(struct seq_file *m,
+                             struct drm_i915_private *dev_priv)
+{
+       struct intel_guc_log *log = &dev_priv->guc.log;
+       enum guc_log_buffer_type type;
 
-       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]);
+       if (!intel_guc_log_relay_enabled(log)) {
+               seq_puts(m, "GuC log relay disabled\n");
+               return;
+       }
 
-       seq_printf(m, "\tTotal flush interrupt count: %u\n",
-                  guc->log.flush_interrupt_count);
+       seq_puts(m, "GuC logging stats:\n");
 
        seq_printf(m, "\tRelay full count: %u\n",
-                  guc->log.relay.full_count);
+                  log->relay.full_count);
+
+       for (type = GUC_ISR_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
+               seq_printf(m, "\t%s:\tflush count %10u, overflow count %10u\n",
+                          stringify_guc_log_type(type),
+                          log->stats[type].flush,
+                          log->stats[type].sampled_overflow);
+       }
 }
 
 static void i915_guc_client_info(struct seq_file *m,

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index 70d118bb0a1a78a87aa5fd26d0cac291c94f3e01..eeda1aa2afe612d9b9036eac6d842c676d02c31f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -390,12 +390,9 @@ void intel_guc_to_host_event_handler(struct intel_guc *guc)
        spin_unlock(&guc->irq_lock);
 
        if (msg & (INTEL_GUC_RECV_MSG_FLUSH_LOG_BUFFER |
-                  INTEL_GUC_RECV_MSG_CRASH_DUMP_POSTED)) {
+                  INTEL_GUC_RECV_MSG_CRASH_DUMP_POSTED))
                queue_work(guc->log.relay.flush_wq,
                           &guc->log.relay.flush_work);
-
-               guc->log.flush_interrupt_count++;
-       }
 }
 
 int intel_guc_sample_forcewake(struct intel_guc *guc)

diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
index c220c2893d2c6f84a61e10071373151c94514ede..3180645b9642e0678defad8e0c7ce026043e074c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_log.c
+++ b/drivers/gpu/drm/i915/intel_guc_log.c
@@ -195,18 +195,18 @@ static bool guc_check_log_buf_overflow(struct intel_guc_log *log,
                                       enum guc_log_buffer_type type,
                                       unsigned int full_cnt)
 {
-       unsigned int prev_full_cnt = log->prev_overflow_count[type];
+       unsigned int prev_full_cnt = log->stats[type].sampled_overflow;
        bool overflow = false;
 
        if (full_cnt != prev_full_cnt) {
                overflow = true;
 
-               log->prev_overflow_count[type] = full_cnt;
-               log->total_overflow_count[type] += full_cnt - prev_full_cnt;
+               log->stats[type].overflow = full_cnt;
+               log->stats[type].sampled_overflow += full_cnt - prev_full_cnt;
 
                if (full_cnt < prev_full_cnt) {
                        /* buffer_full_cnt is a 4 bit counter */
-                       log->total_overflow_count[type] += 16;
+                       log->stats[type].sampled_overflow += 16;
                }
                DRM_ERROR_RATELIMITED("GuC log buffer overflow\n");
        }
@@ -241,7 +241,7 @@ static void guc_read_update_log_buffer(struct intel_guc_log *log)
 
        mutex_lock(&log->relay.lock);
 
-       if (WARN_ON(!log->relay.buf_addr))
+       if (WARN_ON(!intel_guc_log_relay_enabled(log)))
                goto out_unlock;
 
        /* Get the pointer to shared GuC log buffer */
@@ -279,7 +279,7 @@ static void guc_read_update_log_buffer(struct intel_guc_log *log)
                full_cnt = log_buf_state_local.buffer_full_cnt;
 
                /* Bookkeeping stuff */
-               log->flush_count[type] += log_buf_state_local.flush_to_file;
+               log->stats[type].flush += log_buf_state_local.flush_to_file;
                new_overflow = guc_check_log_buf_overflow(log, type, full_cnt);
 
                /* Update the state of shared log buffer */
@@ -341,11 +341,6 @@ static void capture_logs_work(struct work_struct *work)
        guc_log_capture_logs(log);
 }
 
-static bool guc_log_relay_enabled(struct intel_guc_log *log)
-{
-       return log->relay.buf_addr;
-}
-
 static int guc_log_map(struct intel_guc_log *log)
 {
        struct intel_guc *guc = log_to_guc(log);
@@ -553,13 +548,18 @@ out_unlock:
        return ret;
 }
 
+bool intel_guc_log_relay_enabled(const struct intel_guc_log *log)
+{
+       return log->relay.buf_addr;
+}
+
 int intel_guc_log_relay_open(struct intel_guc_log *log)
 {
        int ret;
 
        mutex_lock(&log->relay.lock);
 
-       if (guc_log_relay_enabled(log)) {
+       if (intel_guc_log_relay_enabled(log)) {
                ret = -EEXIST;
                goto out_unlock;
        }
@@ -628,7 +628,7 @@ void intel_guc_log_relay_close(struct intel_guc_log *log)
        flush_work(&log->relay.flush_work);
 
        mutex_lock(&log->relay.lock);
-       GEM_BUG_ON(!guc_log_relay_enabled(log));
+       GEM_BUG_ON(!intel_guc_log_relay_enabled(log));
        guc_log_unmap(log);
        guc_log_relay_destroy(log);
        mutex_unlock(&log->relay.lock);

diff --git a/drivers/gpu/drm/i915/intel_guc_log.h b/drivers/gpu/drm/i915/intel_guc_log.h
index db35e548d2ede7ad6028a034ed5a38a1834c5a64..9ec5703d712c4f60ba4e62119ff7364af26681b0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_guc_log.h
+++ b/drivers/gpu/drm/i915/intel_guc_log.h
@@ -52,10 +52,11 @@ struct intel_guc_log {
                u32 full_count;
        } relay;
        /* logging related stats */
-       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 {
+               u32 sampled_overflow;
+               u32 overflow;
+               u32 flush;
+       } stats[GUC_MAX_LOG_BUFFER];
 };
 
 void intel_guc_log_init_early(struct intel_guc_log *log);
@@ -64,6 +65,7 @@ void intel_guc_log_destroy(struct intel_guc_log *log);
 
 int intel_guc_log_level_get(struct intel_guc_log *log);
 int intel_guc_log_level_set(struct intel_guc_log *log, u64 control_val);
+bool intel_guc_log_relay_enabled(const struct intel_guc_log *log);
 int intel_guc_log_relay_open(struct intel_guc_log *log);
 void intel_guc_log_relay_flush(struct intel_guc_log *log);
 void intel_guc_log_relay_close(struct intel_guc_log *log);