Commit bbb8a9d7 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin

drm/i915: GEM_WARN_ON considered harmful

GEM_WARN_ON currently has dangerous semantics where it is completely
compiled out on !GEM_DEBUG builds. This can leave users who expect it to
be more like a WARN_ON, just without a warning in non-debug builds, in
complete ignorance.

Another gotcha with it is that it cannot be used as a statement. Which is
again different from a standard kernel WARN_ON.

This patch fixes both problems by making it behave as one would expect.

It can now be used both as an expression and as statement, and also the
condition evaluates properly in all builds - code under the conditional
will therefore not unexpectedly disappear.

To satisfy call sites which really want the code under the conditional to
completely disappear, we add GEM_DEBUG_WARN_ON and convert some of the
callers to it. This one can also be used as both expression and statement.

>From the above it follows GEM_DEBUG_WARN_ON should be used in situations
where we are certain the condition will be hit during development, but at
a place in code where error can be handled to the benefit of not crashing
the machine.

GEM_WARN_ON on the other hand should be used where condition may happen in
production and we just want to distinguish the level of debugging output
emitted between the production and debug build.

v2:
 * Dropped BUG_ON hunk.
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Tomasz Lis <tomasz.lis@intel.com>
Reviewed-by: default avatarTomasz Lis <tomasz.lis@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181012063142.16080-1-tvrtko.ursulin@linux.intel.com
parent 61cdfb9e
...@@ -47,17 +47,19 @@ struct drm_i915_private; ...@@ -47,17 +47,19 @@ struct drm_i915_private;
#define GEM_DEBUG_DECL(var) var #define GEM_DEBUG_DECL(var) var
#define GEM_DEBUG_EXEC(expr) expr #define GEM_DEBUG_EXEC(expr) expr
#define GEM_DEBUG_BUG_ON(expr) GEM_BUG_ON(expr) #define GEM_DEBUG_BUG_ON(expr) GEM_BUG_ON(expr)
#define GEM_DEBUG_WARN_ON(expr) GEM_WARN_ON(expr)
#else #else
#define GEM_SHOW_DEBUG() (0) #define GEM_SHOW_DEBUG() (0)
#define GEM_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr) #define GEM_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
#define GEM_WARN_ON(expr) (BUILD_BUG_ON_INVALID(expr), 0) #define GEM_WARN_ON(expr) ({ unlikely(!!(expr)); })
#define GEM_DEBUG_DECL(var) #define GEM_DEBUG_DECL(var)
#define GEM_DEBUG_EXEC(expr) do { } while (0) #define GEM_DEBUG_EXEC(expr) do { } while (0)
#define GEM_DEBUG_BUG_ON(expr) #define GEM_DEBUG_BUG_ON(expr)
#define GEM_DEBUG_WARN_ON(expr) ({ BUILD_BUG_ON_INVALID(expr); 0; })
#endif #endif
#if IS_ENABLED(CONFIG_DRM_I915_TRACE_GEM) #if IS_ENABLED(CONFIG_DRM_I915_TRACE_GEM)
......
...@@ -305,12 +305,12 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, ...@@ -305,12 +305,12 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level,
GEM_BUG_ON(!drm_mm_node_allocated(&vma->node)); GEM_BUG_ON(!drm_mm_node_allocated(&vma->node));
GEM_BUG_ON(vma->size > vma->node.size); GEM_BUG_ON(vma->size > vma->node.size);
if (GEM_WARN_ON(range_overflows(vma->node.start, if (GEM_DEBUG_WARN_ON(range_overflows(vma->node.start,
vma->node.size, vma->node.size,
vma->vm->total))) vma->vm->total)))
return -ENODEV; return -ENODEV;
if (GEM_WARN_ON(!flags)) if (GEM_DEBUG_WARN_ON(!flags))
return -EINVAL; return -EINVAL;
bind_flags = 0; bind_flags = 0;
......
...@@ -273,13 +273,13 @@ intel_engine_setup(struct drm_i915_private *dev_priv, ...@@ -273,13 +273,13 @@ intel_engine_setup(struct drm_i915_private *dev_priv,
BUILD_BUG_ON(MAX_ENGINE_CLASS >= BIT(GEN11_ENGINE_CLASS_WIDTH)); BUILD_BUG_ON(MAX_ENGINE_CLASS >= BIT(GEN11_ENGINE_CLASS_WIDTH));
BUILD_BUG_ON(MAX_ENGINE_INSTANCE >= BIT(GEN11_ENGINE_INSTANCE_WIDTH)); BUILD_BUG_ON(MAX_ENGINE_INSTANCE >= BIT(GEN11_ENGINE_INSTANCE_WIDTH));
if (GEM_WARN_ON(info->class > MAX_ENGINE_CLASS)) if (GEM_DEBUG_WARN_ON(info->class > MAX_ENGINE_CLASS))
return -EINVAL; return -EINVAL;
if (GEM_WARN_ON(info->instance > MAX_ENGINE_INSTANCE)) if (GEM_DEBUG_WARN_ON(info->instance > MAX_ENGINE_INSTANCE))
return -EINVAL; return -EINVAL;
if (GEM_WARN_ON(dev_priv->engine_class[info->class][info->instance])) if (GEM_DEBUG_WARN_ON(dev_priv->engine_class[info->class][info->instance]))
return -EINVAL; return -EINVAL;
GEM_BUG_ON(dev_priv->engine[id]); GEM_BUG_ON(dev_priv->engine[id]);
...@@ -402,7 +402,7 @@ int intel_engines_init(struct drm_i915_private *dev_priv) ...@@ -402,7 +402,7 @@ int intel_engines_init(struct drm_i915_private *dev_priv)
err = -EINVAL; err = -EINVAL;
err_id = id; err_id = id;
if (GEM_WARN_ON(!init)) if (GEM_DEBUG_WARN_ON(!init))
goto cleanup; goto cleanup;
err = init(engine); err = init(engine);
......
...@@ -1515,7 +1515,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine) ...@@ -1515,7 +1515,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
unsigned int i; unsigned int i;
int ret; int ret;
if (GEM_WARN_ON(engine->id != RCS)) if (GEM_DEBUG_WARN_ON(engine->id != RCS))
return -EINVAL; return -EINVAL;
switch (INTEL_GEN(engine->i915)) { switch (INTEL_GEN(engine->i915)) {
...@@ -1554,7 +1554,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine) ...@@ -1554,7 +1554,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
*/ */
for (i = 0; i < ARRAY_SIZE(wa_bb_fn); i++) { for (i = 0; i < ARRAY_SIZE(wa_bb_fn); i++) {
wa_bb[i]->offset = batch_ptr - batch; wa_bb[i]->offset = batch_ptr - batch;
if (GEM_WARN_ON(!IS_ALIGNED(wa_bb[i]->offset, if (GEM_DEBUG_WARN_ON(!IS_ALIGNED(wa_bb[i]->offset,
CACHELINE_BYTES))) { CACHELINE_BYTES))) {
ret = -EINVAL; ret = -EINVAL;
break; break;
......
...@@ -948,7 +948,7 @@ struct whitelist { ...@@ -948,7 +948,7 @@ struct whitelist {
static void whitelist_reg(struct whitelist *w, i915_reg_t reg) static void whitelist_reg(struct whitelist *w, i915_reg_t reg)
{ {
if (GEM_WARN_ON(w->count >= RING_MAX_NONPRIV_SLOTS)) if (GEM_DEBUG_WARN_ON(w->count >= RING_MAX_NONPRIV_SLOTS))
return; return;
w->reg[w->count++] = reg; w->reg[w->count++] = reg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment