Add module oriented dmesg output
Subsystems (2)
v3 cover Add module oriented dmesg output
From: John Harrison <[email protected]>
When trying to analyse bug reports from CI, customers, etc. it can be difficult to work out exactly what is happening on which GT in a multi-GT system. So add GT oriented debug/error message wrappers. If used instead of the drm_ equivalents, you get the same output but with a GT# prefix on it.
This patch set updates the gt/intel_gt*.c files to use the new helpers as a first step. The intention would be to convert all output messages throughout the driver as long as they have access to a GT structure.
v2: Go back to using lower case names, add more wrapper sets (combined review feedback). Also, wrap up probe injection and WARN entries.
v3: Split definitions out to separate header files. Tweak some messages. Wrap a couple more functions. (review feedback from Jani and Michal W).
Convert all gt/intel_gt*.c but drop the GuC/HuC/CT files as too much bikeshedding about formatting.
John Harrison (1):
drm/i915/gt: Start adding module oriented dmesg output
drivers/gpu/drm/i915/gt/intel_gt.c | 96 +++++++++---------- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 8 +- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_print.h | 51 ++++++++++ drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 4 +- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 34 ++----- drivers/gpu/drm/i915/gt/intel_gtt.c | 7 +- 9 files changed, 129 insertions(+), 98 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_print.h
Signature · 1 line
2.39.0
PATCH v3 1/1 drm/i915/gt: Start adding module oriented dmesg output
From: John Harrison <[email protected]>
When trying to analyse bug reports from CI, customers, etc. it can be difficult to work out exactly what is happening on which GT in a multi-GT system. So add GT oriented debug/error message wrappers. If used instead of the drm_ equivalents, you get the same output but with a GT# prefix on it.
v2: Go back to using lower case names (combined review feedback). Convert intel_gt.c as a first step.
v3: Add gt_err_ratelimited() as well, undo one conversation that might not have a GT pointer in some scenarios (review feedback from Michal W). Split definitions into separate header (review feedback from Jani). Convert all intel_gt*.c files.
--- drivers/gpu/drm/i915/gt/intel_gt.c | 96 +++++++++---------- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 8 +- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_print.h | 51 ++++++++++ drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 4 +- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 34 ++----- drivers/gpu/drm/i915/gt/intel_gtt.c | 7 +- 9 files changed, 129 insertions(+), 98 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_print.h
drivers/gpu/drm/i915/gt/intel_gt.c +46 -50
@@ -22,6 +22,7 @@#include "intel_gt_debugfs.h" #include "intel_gt_mcr.h" #include "intel_gt_pm.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_gt_requests.h" #include "intel_migrate.h"
@@ -89,9 +90,8 @@ static int intel_gt_probe_lmem(struct intel_gt *gt)if (err == -ENODEV )return 0 ; -drm_err (&i915->drm, -"Failed to setup region(%d) type=%d\n" , - err,INTEL_MEMORY_LOCAL ); +gt_err (gt,"Failed to setup region(%d) type=%d\n" , + err,INTEL_MEMORY_LOCAL );return err; }
@@ -200,14 +200,14 @@ int intel_gt_init_hw(struct intel_gt *gt) ret =i915_ppgtt_init_hw (gt);if (ret) { -drm_err (&i915->drm,"Enabling PPGTT failed (%d)\n" , ret); +gt_err (gt,"Enabling PPGTT failed (%d)\n" , ret); goto out; }/* We can't enable contexts until all firmware is loaded */ ret =intel_uc_init_hw (>->uc);if (ret) { -i915_probe_error (i915,"Enabling uc failed (%d)\n" , ret); +gt_probe_error (gt,"Enabling uc failed (%d)\n" , ret); goto out; }
@@ -257,7 +257,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt,* some errors might have become stuck, * mask them. */ -drm_dbg (>->i915->drm,"EIR stuck: 0x%08x, masking\n" , eir); +gt_dbg (gt,"EIR stuck: 0x%08x, masking\n" , eir);intel_uncore_rmw (uncore,EMR ,0 , eir);intel_uncore_write (uncore,GEN2_IIR ,I915_MASTER_ERROR_INTERRUPT );
@@ -291,16 +291,16 @@ static void gen6_check_faults(struct intel_gt *gt)for_each_engine (engine, gt, id) { fault =GEN6_RING_FAULT_REG_READ (engine);if (fault &RING_FAULT_VALID ) { -drm_dbg (&engine->i915->drm,"Unexpected fault\n" -"\tAddr: 0x%08lx\n" -"\tAddress space: %s\n" -"\tSource ID: %d\n" -"\tType: %d\n" , - fault &PAGE_MASK , - fault &RING_FAULT_GTTSEL_MASK ? -"GGTT" :"PPGTT" , -RING_FAULT_SRCID (fault), -RING_FAULT_FAULT_TYPE (fault)); +gt_dbg (gt,"Unexpected fault\n" +"\tAddr: 0x%08lx\n" +"\tAddress space: %s\n" +"\tSource ID: %d\n" +"\tType: %d\n" , + fault &PAGE_MASK , + fault &RING_FAULT_GTTSEL_MASK ? +"GGTT" :"PPGTT" , +RING_FAULT_SRCID (fault), +RING_FAULT_FAULT_TYPE (fault)); } } }
@@ -327,17 +327,17 @@ static void xehp_check_faults(struct intel_gt *gt) fault_addr = ((u64)(fault_data1 &FAULT_VA_HIGH_BITS ) <<44 ) | ((u64 )fault_data0 <<12 ); -drm_dbg (>->i915->drm,"Unexpected fault\n" -"\tAddr: 0x%08x_%08x\n" -"\tAddress space: %s\n" -"\tEngine ID: %d\n" -"\tSource ID: %d\n" -"\tType: %d\n" , -upper_32_bits (fault_addr),lower_32_bits (fault_addr), - fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , -GEN8_RING_FAULT_ENGINE_ID (fault), -RING_FAULT_SRCID (fault), -RING_FAULT_FAULT_TYPE (fault)); +gt_dbg (gt,"Unexpected fault\n" +"\tAddr: 0x%08x_%08x\n" +"\tAddress space: %s\n" +"\tEngine ID: %d\n" +"\tSource ID: %d\n" +"\tType: %d\n" , +upper_32_bits (fault_addr),lower_32_bits (fault_addr), + fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , +GEN8_RING_FAULT_ENGINE_ID (fault), +RING_FAULT_SRCID (fault), +RING_FAULT_FAULT_TYPE (fault)); } }
@@ -368,17 +368,17 @@ static void gen8_check_faults(struct intel_gt *gt) fault_addr = ((u64)(fault_data1 &FAULT_VA_HIGH_BITS ) <<44 ) | ((u64 )fault_data0 <<12 ); -drm_dbg (&uncore->i915->drm,"Unexpected fault\n" -"\tAddr: 0x%08x_%08x\n" -"\tAddress space: %s\n" -"\tEngine ID: %d\n" -"\tSource ID: %d\n" -"\tType: %d\n" , -upper_32_bits (fault_addr),lower_32_bits (fault_addr), - fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , -GEN8_RING_FAULT_ENGINE_ID (fault), -RING_FAULT_SRCID (fault), -RING_FAULT_FAULT_TYPE (fault)); +gt_dbg (gt,"Unexpected fault\n" +"\tAddr: 0x%08x_%08x\n" +"\tAddress space: %s\n" +"\tEngine ID: %d\n" +"\tSource ID: %d\n" +"\tType: %d\n" , +upper_32_bits (fault_addr),lower_32_bits (fault_addr), + fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , +GEN8_RING_FAULT_ENGINE_ID (fault), +RING_FAULT_SRCID (fault), +RING_FAULT_FAULT_TYPE (fault)); } }
@@ -472,7 +472,7 @@ static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj)) { -drm_err (&i915->drm,"Failed to allocate scratch page\n" ); +gt_err (gt,"Failed to allocate scratch page\n" );return PTR_ERR (obj); }
@@ -727,8 +727,7 @@ int intel_gt_init(struct intel_gt *gt) err =intel_gt_init_hwconfig (gt);if (err) -drm_err (>->i915->drm,"Failed to retrieve hwconfig table: %pe\n" , -ERR_PTR (err)); +gt_err (gt,"Failed to retrieve hwconfig table: %pe\n" ,ERR_PTR (err)); err =__engines_record_defaults (gt);if (err)
@@ -885,7 +884,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915) gt->name ="Primary GT" ; gt->info.engine_mask =RUNTIME_INFO (i915)->platform_engine_mask; -drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); +gt_dbg (gt,"Setting up %s\n" , gt->name); ret =intel_gt_tile_setup (gt, phys_addr);if (ret)return ret;
@@ -910,7 +909,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915) gt->info.engine_mask = gtdef->engine_mask; gt->info.id = i; -drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); +gt_dbg (gt,"Setting up %s\n" , gt->name); if (GEM_WARN_ON(range_overflows_t(resource_size_t, gtdef->mapping_base, SZ_16M,
@@ -998,8 +997,7 @@ get_reg_and_bit(const struct intel_engine_cs *engine, const bool gen8,const unsigned int class = engine->class;struct reg_and_bit rb = { }; -if (drm_WARN_ON_ONCE (&engine->i915->drm, - class >= num || !regs[class].reg)) +if (gt_WARN_ON_ONCE (engine->gt, class >= num || !regs[class].reg))return rb; rb.reg = regs[class];
@@ -1083,8 +1081,7 @@ static void mmio_invalidate_full(struct intel_gt *gt)return ; } -if (drm_WARN_ONCE (&i915->drm, !num, -"Platform does not implement TLB invalidation!" )) +if (gt_WARN_ONCE (gt, !num,"Platform does not implement TLB invalidation!" ))return ;intel_uncore_forcewake_get (uncore,FORCEWAKE_ALL );
@@ -1149,9 +1146,8 @@ static void mmio_invalidate_full(struct intel_gt *gt) }if (wait_for_invalidate (gt, rb)) -drm_err_ratelimited (>->i915->drm, -"%s TLB invalidation did not complete in %ums!\n" , - engine->name,TLB_INVAL_TIMEOUT_MS ); +gt_err_ratelimited (gt,"%s TLB invalidation did not complete in %ums!\n" , + engine->name,TLB_INVAL_TIMEOUT_MS ); }/*
drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c +4 -4
@@ -7,6 +7,7 @@#include "i915_reg.h" #include "intel_gt.h" #include "intel_gt_clock_utils.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" static u32 read_reference_ts_freq (struct intel_uncore *uncore)
@@ -193,10 +194,9 @@ void intel_gt_init_clock_frequency(struct intel_gt *gt)void intel_gt_check_clock_frequency (const struct intel_gt *gt) {if (gt->clock_frequency !=read_clock_frequency (gt->uncore)) { -dev_err (gt->i915->drm.dev, -"GT clock frequency changed, was %uHz, now %uHz!\n" , - gt->clock_frequency, -read_clock_frequency (gt->uncore)); +gt_err (gt,"GT clock frequency changed, was %uHz, now %uHz!\n" , + gt->clock_frequency, +read_clock_frequency (gt->uncore)); } }#endif
drivers/gpu/drm/i915/gt/intel_gt_irq.c +4 -5
@@ -10,6 +10,7 @@#include "intel_breadcrumbs.h" #include "intel_gt.h" #include "intel_gt_irq.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_uncore.h" #include "intel_rps.h"
@@ -47,9 +48,8 @@ gen11_gt_engine_identity(struct intel_gt *gt, !time_after32(local_clock() >> 10, timeout_ts));if (unlikely (!(ident &GEN11_INTR_DATA_VALID ))) { -drm_err (>->i915->drm, -"INTR_IDENTITY_REG%u:%u 0x%08x not valid!\n" , - bank, bit, ident); +gt_err (gt,"INTR_IDENTITY_REG%u:%u 0x%08x not valid!\n" , + bank, bit, ident);return 0 ; }
@@ -378,8 +378,7 @@ void gen6_gt_irq_handler(struct intel_gt *gt, u32 gt_iir)if (gt_iir & (GT_BLT_CS_ERROR_INTERRUPT |GT_BSD_CS_ERROR_INTERRUPT |GT_CS_MASTER_ERROR_INTERRUPT )) -drm_dbg (>->i915->drm,"Command parser error, gt_iir 0x%08x\n" , - gt_iir); +gt_dbg (gt,"Command parser error, gt_iir 0x%08x\n" , gt_iir);if (gt_iir >_PARITY_ERROR (gt->i915))gen7_parity_error_irq_handler (gt, gt_iir);
drivers/gpu/drm/i915/gt/intel_gt_mcr.c +4 -5
@@ -6,6 +6,7 @@#include "i915_drv.h" #include "intel_gt_mcr.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" /**
@@ -158,7 +159,7 @@ void intel_gt_mcr_init(struct intel_gt *gt) GEN12_MEML3_EN_MASK);if (!gt->info.mslice_mask)/* should be impossible! */ -drm_warn (&i915->drm,"mslice mask all zero!\n" ); +gt_warn (gt,"mslice mask all zero!\n" ); }if (MEDIA_VER (i915) >=13 && gt->type ==GT_MEDIA ) {
@@ -205,7 +206,7 @@ void intel_gt_mcr_init(struct intel_gt *gt) ~intel_uncore_read (gt->uncore,GEN10_MIRROR_FUSE3 ) &GEN10_L3BANK_MASK ;if (!gt->info.l3bank_mask)/* should be impossible! */ -drm_warn (&i915->drm,"L3 bank mask is all zero!\n" ); +gt_warn (gt,"L3 bank mask is all zero!\n" ); }else if (GRAPHICS_VER (i915) >=11 ) {/* * We expect all modern platforms to have at least some
@@ -394,9 +395,7 @@ void intel_gt_mcr_lock(struct intel_gt *gt, unsigned long *flags)* releasing it properly. */ if (err == -ETIMEDOUT ) { -drm_err_ratelimited (>->i915->drm, -"GT%u hardware MCR steering semaphore timed out" , - gt->info.id); +gt_err_ratelimited (gt,"hardware MCR steering semaphore timed out" );add_taint_for_CI (gt->i915,TAINT_WARN );/* CI is now unreliable */ } }
drivers/gpu/drm/i915/gt/intel_gt_pm.c +4 -5
@@ -14,6 +14,7 @@#include "intel_gt.h" #include "intel_gt_clock_utils.h" #include "intel_gt_pm.h" +#include "intel_gt_print.h" #include "intel_gt_requests.h" #include "intel_llc.h" #include "intel_pm.h"
@@ -275,8 +276,7 @@ int intel_gt_resume(struct intel_gt *gt)/* Only when the HW is re-initialised, can we replay the requests */ err =intel_gt_init_hw (gt);if (err) { -i915_probe_error (gt->i915, -"Failed to initialize GPU, declaring it wedged!\n" ); +gt_probe_error (gt,"Failed to initialize GPU, declaring it wedged!\n" ); goto err_wedged; }
@@ -293,9 +293,8 @@ int intel_gt_resume(struct intel_gt *gt)intel_engine_pm_put (engine);if (err) { -drm_err (>->i915->drm, -"Failed to restart %s (%d)\n" , - engine->name, err); +gt_err (gt,"Failed to restart %s (%d)\n" , + engine->name, err); goto err_wedged; } }
drivers/gpu/drm/i915/gt/intel_gt_print.h new file +51 -0
51 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +2 -2
@@ -12,6 +12,7 @@#include "i915_drv.h" #include "i915_sysfs.h" #include "intel_gt.h" +#include "intel_gt_print.h" #include "intel_gt_sysfs.h" #include "intel_gt_sysfs_pm.h" #include "intel_gt_types.h"
@@ -105,8 +106,7 @@ void intel_gt_sysfs_register(struct intel_gt *gt) exit_fail:kobject_put (>->sysfs_gt); -drm_warn (>->i915->drm, -"failed to initialize gt%d sysfs root\n" , gt->info.id); +gt_warn (gt,"failed to initialize sysfs root\n" ); }void intel_gt_sysfs_unregister (struct intel_gt *gt)
drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +10 -24
@@ -11,6 +11,7 @@#include "i915_reg.h" #include "i915_sysfs.h" #include "intel_gt.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_gt_sysfs.h" #include "intel_gt_sysfs_pm.h"
@@ -304,9 +305,7 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) ret =__intel_gt_sysfs_create_group (kobj, rc6_attr_group);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u RC6 sysfs files (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create RC6 sysfs files (%pe)\n" ,ERR_PTR (ret));/* * cannot use the is_visible() attribute because
@@ -315,17 +314,13 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)if (HAS_RC6p (gt->i915)) { ret =__intel_gt_sysfs_create_group (kobj, rc6p_attr_group);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u RC6p sysfs files (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create RC6p sysfs files (%pe)\n" ,ERR_PTR (ret)); }if (IS_VALLEYVIEW (gt->i915) ||IS_CHERRYVIEW (gt->i915)) { ret =__intel_gt_sysfs_create_group (kobj, media_rc6_attr_group);if (ret) -drm_warn (>->i915->drm, -"failed to create media %u RC6 sysfs files (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create media RC6 sysfs files (%pe)\n" ,ERR_PTR (ret)); } }
@@ -739,9 +734,7 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj) ret =intel_sysfs_rps_init (gt, kobj);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u RPS sysfs files (%pe)" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create RPS sysfs files (%pe)" ,ERR_PTR (ret));/* end of the legacy interfaces */ if (!is_object_gt (kobj))
@@ -749,29 +742,22 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj) ret =sysfs_create_file (kobj, &attr_punit_req_freq_mhz.attr);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u punit_req_freq_mhz sysfs (%pe)" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create punit_req_freq_mhz sysfs (%pe)" ,ERR_PTR (ret));if (i915_mmio_reg_valid (intel_gt_perf_limit_reasons_reg (gt))) { ret =sysfs_create_files (kobj, throttle_reason_attrs);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u throttle sysfs files (%pe)" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create throttle sysfs files (%pe)" ,ERR_PTR (ret)); }if (HAS_MEDIA_RATIO_MODE (gt->i915) &&intel_uc_uses_guc_slpc (>->uc)) { ret =sysfs_create_files (kobj, media_perf_power_attrs);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u media_perf_power_attrs sysfs (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create media_perf_power_attrs sysfs (%pe)\n" , +ERR_PTR (ret)); } ret =sysfs_create_files (gt->sysfs_defaults, rps_defaults_attrs);if (ret) -drm_warn (>->i915->drm, -"failed to add gt%u rps defaults (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to add rps defaults (%pe)\n" ,ERR_PTR (ret)); }
drivers/gpu/drm/i915/gt/intel_gtt.c +4 -3
@@ -17,6 +17,7 @@#include "i915_utils.h" #include "intel_gt.h" #include "intel_gt_mcr.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_gtt.h"
@@ -461,9 +462,9 @@ void gtt_write_workarounds(struct intel_gt *gt)intel_uncore_write (uncore,HSW_GTT_CACHE_EN , can_use_gtt_cache ?GTT_CACHE_EN_ALL :0 ); -drm_WARN_ON_ONCE (&i915->drm, can_use_gtt_cache && -intel_uncore_read (uncore, -HSW_GTT_CACHE_EN ) ==0 ); +gt_WARN_ON_ONCE (gt, can_use_gtt_cache && +intel_uncore_read (uncore, +HSW_GTT_CACHE_EN ) ==0 ); } }
Signature · 1 line
2.39.0
Re: [Intel-gfx] [PATCH v3 1/1] drm/i915/gt: Start adding module oriented dmesg output
Hi John,
[...]
drivers/gpu/drm/i915/gt/intel_gt_print.h line 49
Quoted 11 lines
drivers/gpu/drm/i915/gt/intel_gt_print.h new file +11
-0+#define gt_WARN_ON (_gt, _condition) \ + gt_WARN(_gt, _condition, "%s", "gt_WARN_ON(" __stringify(_condition) ")") + +#define gt_WARN_ON_ONCE (_gt, _condition) \ + gt_WARN_ONCE(_gt, _condition, "%s", "gt_WARN_ONCE(" __stringify(_condition) ")") + +#define gt_WARN (_gt, _condition, _fmt, ...) \ + drm_WARN(&(_gt)->i915->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_WARN_ONCE (_gt, _condition, _fmt, ...) \ + drm_WARN_ONCE(&(_gt)->i915->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
do we need some order here? gt_WARN and gt_WARN_ONCE should go before respectively gt_WARN_ON and gt_WARN_ON_ONCE.
The rest looks good.
Andi
Re: [Intel-gfx] [PATCH v3 1/1] drm/i915/gt: Start adding module oriented dmesg output
In reply to [email protected]Quoted 374 lines · On 09/01/2023 23:48, [email protected] wrote:
From: John Harrison <[email protected]>
When trying to analyse bug reports from CI, customers, etc. it can be difficult to work out exactly what is happening on which GT in a multi-GT system. So add GT oriented debug/error message wrappers. If used instead of the
drm_equivalents, you get the same output but with a GT# prefix on it.v2: Go back to using lower case names (combined review feedback). Convert
intel_gt.cas a first step.
v3: Addgt_err_ratelimited()as well, undo one conversation that might not have a GT pointer in some scenarios (review feedback from Michal W). Split definitions into separate header (review feedback from Jani). Convert all intel_gt*.c files.Signed-off-by John Harrison <[email protected]>--- drivers/gpu/drm/i915/gt/intel_gt.c | 96 +++++++++---------- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 8 +- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 9 +- drivers/gpu/drm/i915/gt/intel_gt_print.h | 51 ++++++++++ drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 4 +- drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 34 ++----- drivers/gpu/drm/i915/gt/intel_gtt.c | 7 +- 9 files changed, 129 insertions(+), 98 deletions(-)create mode 100644
drivers/gpu/drm/i915/gt/intel_gt_print.hdrivers/gpu/drm/i915/gt/intel_gt.c +46
-50@@ -22,6 +22,7 @@#include "intel_gt_debugfs.h" #include "intel_gt_mcr.h" #include "intel_gt_pm.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_gt_requests.h" #include "intel_migrate.h" @@ -89,9 +90,8 @@ static int intel_gt_probe_lmem(struct intel_gt *gt)if (err == -ENODEV )return 0 ; -drm_err (&i915->drm, -"Failed to setup region(%d) type=%d\n" , - err,INTEL_MEMORY_LOCAL ); +gt_err (gt,"Failed to setup region(%d) type=%d\n" , + err,INTEL_MEMORY_LOCAL );return err; }@@ -200,14 +200,14 @@ int intel_gt_init_hw(struct intel_gt *gt) ret =i915_ppgtt_init_hw (gt);if (ret) { -drm_err (&i915->drm,"Enabling PPGTT failed (%d)\n" , ret); +gt_err (gt,"Enabling PPGTT failed (%d)\n" , ret); goto out; }/* We can't enable contexts until all firmware is loaded */ ret =intel_uc_init_hw (>->uc);if (ret) { -i915_probe_error (i915,"Enabling uc failed (%d)\n" , ret); +gt_probe_error (gt,"Enabling uc failed (%d)\n" , ret); goto out; }@@ -257,7 +257,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt,* some errors might have become stuck, * mask them. */ -drm_dbg (>->i915->drm,"EIR stuck: 0x%08x, masking\n" , eir); +gt_dbg (gt,"EIR stuck: 0x%08x, masking\n" , eir);intel_uncore_rmw (uncore,EMR ,0 , eir);intel_uncore_write (uncore,GEN2_IIR ,I915_MASTER_ERROR_INTERRUPT );@@ -291,16 +291,16 @@ static void gen6_check_faults(struct intel_gt *gt)for_each_engine (engine, gt, id) { fault =GEN6_RING_FAULT_REG_READ (engine);if (fault &RING_FAULT_VALID ) { -drm_dbg (&engine->i915->drm,"Unexpected fault\n" -"\tAddr: 0x%08lx\n" -"\tAddress space: %s\n" -"\tSource ID: %d\n" -"\tType: %d\n" , - fault &PAGE_MASK , - fault &RING_FAULT_GTTSEL_MASK ? -"GGTT" :"PPGTT" , -RING_FAULT_SRCID (fault), -RING_FAULT_FAULT_TYPE (fault)); +gt_dbg (gt,"Unexpected fault\n" +"\tAddr: 0x%08lx\n" +"\tAddress space: %s\n" +"\tSource ID: %d\n" +"\tType: %d\n" , + fault &PAGE_MASK , + fault &RING_FAULT_GTTSEL_MASK ? +"GGTT" :"PPGTT" , +RING_FAULT_SRCID (fault), +RING_FAULT_FAULT_TYPE (fault)); } } }@@ -327,17 +327,17 @@ static void xehp_check_faults(struct intel_gt *gt) fault_addr = ((u64)(fault_data1 &FAULT_VA_HIGH_BITS ) <<44 ) | ((u64 )fault_data0 <<12 ); -drm_dbg (>->i915->drm,"Unexpected fault\n" -"\tAddr: 0x%08x_%08x\n" -"\tAddress space: %s\n" -"\tEngine ID: %d\n" -"\tSource ID: %d\n" -"\tType: %d\n" , -upper_32_bits (fault_addr),lower_32_bits (fault_addr), - fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , -GEN8_RING_FAULT_ENGINE_ID (fault), -RING_FAULT_SRCID (fault), -RING_FAULT_FAULT_TYPE (fault)); +gt_dbg (gt,"Unexpected fault\n" +"\tAddr: 0x%08x_%08x\n" +"\tAddress space: %s\n" +"\tEngine ID: %d\n" +"\tSource ID: %d\n" +"\tType: %d\n" , +upper_32_bits (fault_addr),lower_32_bits (fault_addr), + fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , +GEN8_RING_FAULT_ENGINE_ID (fault), +RING_FAULT_SRCID (fault), +RING_FAULT_FAULT_TYPE (fault)); } }@@ -368,17 +368,17 @@ static void gen8_check_faults(struct intel_gt *gt) fault_addr = ((u64)(fault_data1 &FAULT_VA_HIGH_BITS ) <<44 ) | ((u64 )fault_data0 <<12 ); -drm_dbg (&uncore->i915->drm,"Unexpected fault\n" -"\tAddr: 0x%08x_%08x\n" -"\tAddress space: %s\n" -"\tEngine ID: %d\n" -"\tSource ID: %d\n" -"\tType: %d\n" , -upper_32_bits (fault_addr),lower_32_bits (fault_addr), - fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , -GEN8_RING_FAULT_ENGINE_ID (fault), -RING_FAULT_SRCID (fault), -RING_FAULT_FAULT_TYPE (fault)); +gt_dbg (gt,"Unexpected fault\n" +"\tAddr: 0x%08x_%08x\n" +"\tAddress space: %s\n" +"\tEngine ID: %d\n" +"\tSource ID: %d\n" +"\tType: %d\n" , +upper_32_bits (fault_addr),lower_32_bits (fault_addr), + fault_data1 &FAULT_GTT_SEL ?"GGTT" :"PPGTT" , +GEN8_RING_FAULT_ENGINE_ID (fault), +RING_FAULT_SRCID (fault), +RING_FAULT_FAULT_TYPE (fault)); } }@@ -472,7 +472,7 @@ static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size)if (IS_ERR (obj)) obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj)) { -drm_err (&i915->drm,"Failed to allocate scratch page\n" ); +gt_err (gt,"Failed to allocate scratch page\n" );return PTR_ERR (obj); }@@ -727,8 +727,7 @@ int intel_gt_init(struct intel_gt *gt) err =intel_gt_init_hwconfig (gt);if (err) -drm_err (>->i915->drm,"Failed to retrieve hwconfig table: %pe\n" , -ERR_PTR (err)); +gt_err (gt,"Failed to retrieve hwconfig table: %pe\n" ,ERR_PTR (err)); err =__engines_record_defaults (gt);if (err)@@ -885,7 +884,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915) gt->name ="Primary GT" ; gt->info.engine_mask =RUNTIME_INFO (i915)->platform_engine_mask; -drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); +gt_dbg (gt,"Setting up %s\n" , gt->name); ret =intel_gt_tile_setup (gt, phys_addr);if (ret)return ret;@@ -910,7 +909,7 @@ int intel_gt_probe_all(struct drm_i915_private *i915) gt->info.engine_mask = gtdef->engine_mask; gt->info.id = i; -drm_dbg (&i915->drm,"Setting up %s\n" , gt->name); +gt_dbg (gt,"Setting up %s\n" , gt->name); if (GEM_WARN_ON(range_overflows_t(resource_size_t, gtdef->mapping_base, SZ_16M,@@ -998,8 +997,7 @@ get_reg_and_bit(const struct intel_engine_cs *engine, const bool gen8,const unsigned int class = engine->class;struct reg_and_bit rb = { }; -if (drm_WARN_ON_ONCE (&engine->i915->drm, - class >= num || !regs[class].reg)) +if (gt_WARN_ON_ONCE (engine->gt, class >= num || !regs[class].reg))return rb; rb.reg = regs[class];@@ -1083,8 +1081,7 @@ static void mmio_invalidate_full(struct intel_gt *gt)return ; } -if (drm_WARN_ONCE (&i915->drm, !num, -"Platform does not implement TLB invalidation!" )) +if (gt_WARN_ONCE (gt, !num,"Platform does not implement TLB invalidation!" ))return ;intel_uncore_forcewake_get (uncore,FORCEWAKE_ALL );@@ -1149,9 +1146,8 @@ static void mmio_invalidate_full(struct intel_gt *gt) }if (wait_for_invalidate (gt, rb)) -drm_err_ratelimited (>->i915->drm, -"%s TLB invalidation did not complete in %ums!\n" , - engine->name,TLB_INVAL_TIMEOUT_MS ); +gt_err_ratelimited (gt,"%s TLB invalidation did not complete in %ums!\n" , + engine->name,TLB_INVAL_TIMEOUT_MS ); }/* drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c +4
-4@@ -7,6 +7,7 @@#include "i915_reg.h" #include "intel_gt.h" #include "intel_gt_clock_utils.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" static u32 read_reference_ts_freq (struct intel_uncore *uncore)@@ -193,10 +194,9 @@ void intel_gt_init_clock_frequency(struct intel_gt *gt)void intel_gt_check_clock_frequency (const struct intel_gt *gt) {if (gt->clock_frequency !=read_clock_frequency (gt->uncore)) { -dev_err (gt->i915->drm.dev, -"GT clock frequency changed, was %uHz, now %uHz!\n" , - gt->clock_frequency, -read_clock_frequency (gt->uncore)); +gt_err (gt,"GT clock frequency changed, was %uHz, now %uHz!\n" , + gt->clock_frequency, +read_clock_frequency (gt->uncore)); } }#endif drivers/gpu/drm/i915/gt/intel_gt_irq.c +4
-5@@ -10,6 +10,7 @@#include "intel_breadcrumbs.h" #include "intel_gt.h" #include "intel_gt_irq.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_uncore.h" #include "intel_rps.h" @@ -47,9 +48,8 @@ gen11_gt_engine_identity(struct intel_gt *gt, !time_after32(local_clock() >> 10, timeout_ts));if (unlikely (!(ident &GEN11_INTR_DATA_VALID ))) { -drm_err (>->i915->drm, -"INTR_IDENTITY_REG%u:%u 0x%08x not valid!\n" , - bank, bit, ident); +gt_err (gt,"INTR_IDENTITY_REG%u:%u 0x%08x not valid!\n" , + bank, bit, ident);return 0 ; }@@ -378,8 +378,7 @@ void gen6_gt_irq_handler(struct intel_gt *gt, u32 gt_iir)if (gt_iir & (GT_BLT_CS_ERROR_INTERRUPT |GT_BSD_CS_ERROR_INTERRUPT |GT_CS_MASTER_ERROR_INTERRUPT )) -drm_dbg (>->i915->drm,"Command parser error, gt_iir 0x%08x\n" , - gt_iir); +gt_dbg (gt,"Command parser error, gt_iir 0x%08x\n" , gt_iir);if (gt_iir >_PARITY_ERROR (gt->i915))gen7_parity_error_irq_handler (gt, gt_iir);drivers/gpu/drm/i915/gt/intel_gt_mcr.c +4
-5@@ -6,6 +6,7 @@#include "i915_drv.h" #include "intel_gt_mcr.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" /** @@ -158,7 +159,7 @@ void intel_gt_mcr_init(struct intel_gt *gt) GEN12_MEML3_EN_MASK);if (!gt->info.mslice_mask)/* should be impossible! */ -drm_warn (&i915->drm,"mslice mask all zero!\n" ); +gt_warn (gt,"mslice mask all zero!\n" ); }if (MEDIA_VER (i915) >=13 && gt->type ==GT_MEDIA ) {@@ -205,7 +206,7 @@ void intel_gt_mcr_init(struct intel_gt *gt) ~intel_uncore_read (gt->uncore,GEN10_MIRROR_FUSE3 ) &GEN10_L3BANK_MASK ;if (!gt->info.l3bank_mask)/* should be impossible! */ -drm_warn (&i915->drm,"L3 bank mask is all zero!\n" ); +gt_warn (gt,"L3 bank mask is all zero!\n" ); }else if (GRAPHICS_VER (i915) >=11 ) {/* * We expect all modern platforms to have at least some @@ -394,9 +395,7 @@ void intel_gt_mcr_lock(struct intel_gt *gt, unsigned long *flags)* releasing it properly. */ if (err == -ETIMEDOUT ) { -drm_err_ratelimited (>->i915->drm, -"GT%u hardware MCR steering semaphore timed out" , - gt->info.id); +gt_err_ratelimited (gt,"hardware MCR steering semaphore timed out" );add_taint_for_CI (gt->i915,TAINT_WARN );/* CI is now unreliable */ } }drivers/gpu/drm/i915/gt/intel_gt_pm.c +4
-5@@ -14,6 +14,7 @@#include "intel_gt.h" #include "intel_gt_clock_utils.h" #include "intel_gt_pm.h" +#include "intel_gt_print.h" #include "intel_gt_requests.h" #include "intel_llc.h" #include "intel_pm.h" @@ -275,8 +276,7 @@ int intel_gt_resume(struct intel_gt *gt)/* Only when the HW is re-initialised, can we replay the requests */ err =intel_gt_init_hw (gt);if (err) { -i915_probe_error (gt->i915, -"Failed to initialize GPU, declaring it wedged!\n" ); +gt_probe_error (gt,"Failed to initialize GPU, declaring it wedged!\n" ); goto err_wedged; }@@ -293,9 +293,8 @@ int intel_gt_resume(struct intel_gt *gt)intel_engine_pm_put (engine);if (err) { -drm_err (>->i915->drm, -"Failed to restart %s (%d)\n" , - engine->name, err); +gt_err (gt,"Failed to restart %s (%d)\n" , + engine->name, err); goto err_wedged; } }drivers/gpu/drm/i915/gt/intel_gt_print.h new file +0
-0
drivers/gpu/drm/i915/gt/intel_gt_print.h line 3
Quoted 3 lines
drivers/gpu/drm/i915/gt/intel_gt_print.h new file +3
-0@@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2022 Intel Corporation
2023
With that and ideally re-order Andi suggested:
Regards,
Tvrtko
Quoted 184 lines
drivers/gpu/drm/i915/gt/intel_gt_print.h new file +48
-0+*/ + +#ifndef __INTEL_GT_PRINT__ +#define __INTEL_GT_PRINT__ + +#include <drm/drm_print.h> +#include "intel_gt_types.h" +#include "i915_utils.h" + +#define gt_err (_gt, _fmt, ...) \ + drm_err(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_warn (_gt, _fmt, ...) \ + drm_warn(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_notice (_gt, _fmt, ...) \ + drm_notice(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_info (_gt, _fmt, ...) \ + drm_info(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_dbg (_gt, _fmt, ...) \ + drm_dbg(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_err_ratelimited (_gt, _fmt, ...) \ + drm_err_ratelimited(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_probe_error (_gt, _fmt, ...) \ + do { \ + if (i915_error_injected()) \ + gt_dbg(_gt, _fmt, ##__VA_ARGS__); \ + else \ + gt_err(_gt, _fmt, ##__VA_ARGS__); \ + } while (0) + +#define gt_WARN_ON (_gt, _condition) \ + gt_WARN(_gt, _condition, "%s", "gt_WARN_ON(" __stringify(_condition) ")") + +#define gt_WARN_ON_ONCE (_gt, _condition) \ + gt_WARN_ONCE(_gt, _condition, "%s", "gt_WARN_ONCE(" __stringify(_condition) ")") + +#define gt_WARN (_gt, _condition, _fmt, ...) \ + drm_WARN(&(_gt)->i915->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#define gt_WARN_ONCE (_gt, _condition, _fmt, ...) \ + drm_WARN_ONCE(&(_gt)->i915->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__) + +#endif /* __INTEL_GT_H__ */ drivers/gpu/drm/i915/gt/intel_gt_sysfs.c +2
-2@@ -12,6 +12,7 @@#include "i915_drv.h" #include "i915_sysfs.h" #include "intel_gt.h" +#include "intel_gt_print.h" #include "intel_gt_sysfs.h" #include "intel_gt_sysfs_pm.h" #include "intel_gt_types.h" @@ -105,8 +106,7 @@ void intel_gt_sysfs_register(struct intel_gt *gt) exit_fail:kobject_put (>->sysfs_gt); -drm_warn (>->i915->drm, -"failed to initialize gt%d sysfs root\n" , gt->info.id); +gt_warn (gt,"failed to initialize sysfs root\n" ); }void intel_gt_sysfs_unregister (struct intel_gt *gt)drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c +10
-24@@ -11,6 +11,7 @@#include "i915_reg.h" #include "i915_sysfs.h" #include "intel_gt.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_gt_sysfs.h" #include "intel_gt_sysfs_pm.h" @@ -304,9 +305,7 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj) ret =__intel_gt_sysfs_create_group (kobj, rc6_attr_group);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u RC6 sysfs files (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create RC6 sysfs files (%pe)\n" ,ERR_PTR (ret));/* * cannot use the is_visible() attribute because @@ -315,17 +314,13 @@ static void intel_sysfs_rc6_init(struct intel_gt *gt, struct kobject *kobj)if (HAS_RC6p (gt->i915)) { ret =__intel_gt_sysfs_create_group (kobj, rc6p_attr_group);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u RC6p sysfs files (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create RC6p sysfs files (%pe)\n" ,ERR_PTR (ret)); }if (IS_VALLEYVIEW (gt->i915) ||IS_CHERRYVIEW (gt->i915)) { ret =__intel_gt_sysfs_create_group (kobj, media_rc6_attr_group);if (ret) -drm_warn (>->i915->drm, -"failed to create media %u RC6 sysfs files (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create media RC6 sysfs files (%pe)\n" ,ERR_PTR (ret)); } }@@ -739,9 +734,7 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj) ret =intel_sysfs_rps_init (gt, kobj);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u RPS sysfs files (%pe)" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create RPS sysfs files (%pe)" ,ERR_PTR (ret));/* end of the legacy interfaces */ if (!is_object_gt (kobj))@@ -749,29 +742,22 @@ void intel_gt_sysfs_pm_init(struct intel_gt *gt, struct kobject *kobj) ret =sysfs_create_file (kobj, &attr_punit_req_freq_mhz.attr);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u punit_req_freq_mhz sysfs (%pe)" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create punit_req_freq_mhz sysfs (%pe)" ,ERR_PTR (ret));if (i915_mmio_reg_valid (intel_gt_perf_limit_reasons_reg (gt))) { ret =sysfs_create_files (kobj, throttle_reason_attrs);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u throttle sysfs files (%pe)" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create throttle sysfs files (%pe)" ,ERR_PTR (ret)); }if (HAS_MEDIA_RATIO_MODE (gt->i915) &&intel_uc_uses_guc_slpc (>->uc)) { ret =sysfs_create_files (kobj, media_perf_power_attrs);if (ret) -drm_warn (>->i915->drm, -"failed to create gt%u media_perf_power_attrs sysfs (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to create media_perf_power_attrs sysfs (%pe)\n" , +ERR_PTR (ret)); } ret =sysfs_create_files (gt->sysfs_defaults, rps_defaults_attrs);if (ret) -drm_warn (>->i915->drm, -"failed to add gt%u rps defaults (%pe)\n" , - gt->info.id,ERR_PTR (ret)); +gt_warn (gt,"failed to add rps defaults (%pe)\n" ,ERR_PTR (ret)); }drivers/gpu/drm/i915/gt/intel_gtt.c +4
-3@@ -17,6 +17,7 @@#include "i915_utils.h" #include "intel_gt.h" #include "intel_gt_mcr.h" +#include "intel_gt_print.h" #include "intel_gt_regs.h" #include "intel_gtt.h" @@ -461,9 +462,9 @@ void gtt_write_workarounds(struct intel_gt *gt)intel_uncore_write (uncore,HSW_GTT_CACHE_EN , can_use_gtt_cache ?GTT_CACHE_EN_ALL :0 ); -drm_WARN_ON_ONCE (&i915->drm, can_use_gtt_cache && -intel_uncore_read (uncore, -HSW_GTT_CACHE_EN ) ==0 ); +gt_WARN_ON_ONCE (gt, can_use_gtt_cache && +intel_uncore_read (uncore, +HSW_GTT_CACHE_EN ) ==0 ); } }
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add module oriented dmesg output (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: Add module oriented dmesg output (rev3)
URL : https://patchwork.freedesktop.org/series/111050/
State : warning
== Summary ==
Error: dim checkpatch failed77fe0b8dbc3f drm/i915/gt: Start adding module oriented dmesg output
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
-:361: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #361:
new file mode 100644
-:378: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #378: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:13:
+#define gt_err(_gt, _fmt, ...) \
+ drm_err(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
-:381: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #381: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:16:
+#define gt_warn(_gt, _fmt, ...) \
+ drm_warn(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
-:384: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #384: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:19:
+#define gt_notice(_gt, _fmt, ...) \
+ drm_notice(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
-:387: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #387: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:22:
+#define gt_info(_gt, _fmt, ...) \
+ drm_info(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
-:390: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #390: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:25:
+#define gt_dbg(_gt, _fmt, ...) \
+ drm_dbg(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
-:393: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #393: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:28:
+#define gt_err_ratelimited(_gt, _fmt, ...) \
+ drm_err_ratelimited(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
-:396: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #396: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:31:
+#define gt_probe_error(_gt, _fmt, ...) \
+ do { \
+ if (i915_error_injected()) \
+ gt_dbg(_gt, _fmt, ##__VA_ARGS__); \
+ else \
+ gt_err(_gt, _fmt, ##__VA_ARGS__); \
+ } while (0)
-:396: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_fmt' - possible side-effects? #396: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:31:
+#define gt_probe_error(_gt, _fmt, ...) \
+ do { \
+ if (i915_error_injected()) \
+ gt_dbg(_gt, _fmt, ##__VA_ARGS__); \
+ else \
+ gt_err(_gt, _fmt, ##__VA_ARGS__); \
+ } while (0)
-:410: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #410: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:45:
+#define gt_WARN(_gt, _condition, _fmt, ...) \
+ drm_WARN(&(_gt)->i915->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
-:413: CHECK:MACRO_ARG_REUSE: Macro argument reuse '_gt' - possible side-effects? #413: FILE: drivers/gpu/drm/i915/gt/intel_gt_print.h:48:
+#define gt_WARN_ONCE(_gt, _condition, _fmt, ...) \
+ drm_WARN_ONCE(&(_gt)->i915->drm, _condition, "GT%u: " _fmt, (_gt)->info.id, ##__VA_ARGS__)
total: 0 errors, 1 warnings, 10 checks, 459 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Add module oriented dmesg output (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: Add module oriented dmesg output (rev3)
URL : https://patchwork.freedesktop.org/series/111050/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately. +drivers/gpu/drm/i915/gt/intel_gt_mcr.c:397:9: warning: context imbalance in 'intel_gt_mcr_lock' - wrong count at exit -O:drivers/gpu/drm/i915/gt/intel_gt_mcr.c:396:9: warning: context imbalance in 'intel_gt_mcr_lock' - wrong count at exit
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for Add module oriented dmesg output (rev3)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: Add module oriented dmesg output (rev3)
URL : https://patchwork.freedesktop.org/series/111050/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12560 -> Patchwork_111050v3
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_111050v3 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_111050v3, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/index.html
Participating hosts (37 -> 38)
------------------------------
Additional (2): fi-bsw-kefka fi-rkl-11600
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_111050v3:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_store@basic:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/fi-rkl-11600/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-ivb-3770: [PASS][2] -> [INCOMPLETE][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12560/fi-ivb-3770/igt@i915_selftest@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/fi-ivb-3770/igt@i915_selftest@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@kms_chamelium_hpd@common-hpd-after-suspend}:
- {bat-rpls-2}: NOTRUN -> [SKIP][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/bat-rpls-2/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_111050v3 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- fi-rkl-11600: NOTRUN -> [SKIP][5] ([i915#7456])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/fi-rkl-11600/igt@[email protected]
* igt@prime_vgem@basic-fence-flip:
- fi-bsw-kefka: NOTRUN -> [SKIP][6] ([fdo#109271]) +17 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/fi-bsw-kefka/igt@[email protected]
* igt@runner@aborted:
- fi-ivb-3770: NOTRUN -> [FAIL][7] ([fdo#109271] / [i915#4312])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/fi-ivb-3770/igt@[email protected]
- fi-rkl-11600: NOTRUN -> [FAIL][8] ([i915#4312])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/fi-rkl-11600/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@reset:
- {bat-rpls-2}: [DMESG-FAIL][9] ([i915#4983]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12560/bat-rpls-2/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size:
- fi-bsw-n3050: [FAIL][11] ([i915#6298]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12560/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions-varying-size.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
Build changes
-------------
* Linux: CI_DRM_12560 -> Patchwork_111050v3
CI-20190529: 20190529
CI_DRM_12560: 0eccbe4822259a5e1a78bb7a4c027514d26a2b23 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7113: 15562e123ee6ed88163c7da2ef330dfe9bbd16a5 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_111050v3: 0eccbe4822259a5e1a78bb7a4c027514d26a2b23 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
6a3eefba7385 drm/i915/gt: Start adding module oriented dmesg output
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_111050v3/index.html