drm/i915: Mark i915.inject_load_failure as being hit
When we reach the magic value and do inject a fault into our module load, mark the module option as being hit. Since we fail from inside pci probe, the module load isn't actually aborted and the module (and parameters) are left lingering. igt can then inspect the parameter on its synchronous completion of modprobe to see if the fault injection was successful, and will keeping on injecting new faults until the module succeeds in loading having surpassed the number of fault points. v2: Reset to 0 after being hit; Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michał Winiarski <michal.winiarski@intel.com> Cc: Imre Deak <imre.deak@intel.com> Reviewed-by: Michał Winiarski <michal.winiarski@intel.com> Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180606144153.4244-1-chris@chris-wilson.co.uk
This commit is contained in:
Родитель
82ad6443a5
Коммит
cf68f0c3a0
|
@ -67,6 +67,7 @@ bool __i915_inject_load_failure(const char *func, int line)
|
|||
if (++i915_load_fail_count == i915_modparams.inject_load_failure) {
|
||||
DRM_INFO("Injecting failure at checkpoint %u [%s:%d]\n",
|
||||
i915_modparams.inject_load_failure, func, line);
|
||||
i915_modparams.inject_load_failure = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -117,16 +118,15 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
|
|||
static bool i915_error_injected(struct drm_i915_private *dev_priv)
|
||||
{
|
||||
#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
|
||||
return i915_modparams.inject_load_failure &&
|
||||
i915_load_fail_count == i915_modparams.inject_load_failure;
|
||||
return i915_load_fail_count && !i915_modparams.inject_load_failure;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
#define i915_load_error(dev_priv, fmt, ...) \
|
||||
__i915_printk(dev_priv, \
|
||||
i915_error_injected(dev_priv) ? KERN_DEBUG : KERN_ERR, \
|
||||
#define i915_load_error(i915, fmt, ...) \
|
||||
__i915_printk(i915, \
|
||||
i915_error_injected(i915) ? KERN_DEBUG : KERN_ERR, \
|
||||
fmt, ##__VA_ARGS__)
|
||||
|
||||
/* Map PCH device id to PCH type, or PCH_NONE if unknown. */
|
||||
|
|
Загрузка…
Ссылка в новой задаче