From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: [PATCH 1/5] drm/i915: downgrade non-lethal BUG_ONs
Date: Wed, 20 Apr 2011 09:18:03 +0100 [thread overview]
Message-ID: <b7da2f$r5rbjv@fmsmga001.fm.intel.com> (raw)
In-Reply-To: <1303245964-3022-2-git-send-email-daniel.vetter@ffwll.ch>
On Tue, 19 Apr 2011 22:46:00 +0200, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> If it's a simple gem accounting error that won't lead to immediate harm
> (like a NULL-deref) or is a simple violation of a required invariant
> that the caller should always check/ensure, downgrade the BUG_ON to
> a WARN_ON and hope the system survives long enough to grab the dmesg.
When converting to a WARN we should include the error checking and
propagate the failure back up rather than continuing on with inconsistent
state.
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/i915_gem.c | 6 +++---
> drivers/gpu/drm/i915/i915_gem_evict.c | 4 ++--
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 ++--
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index ae40272..1ef0b91 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1748,7 +1748,7 @@ i915_gem_object_move_to_flushing(struct drm_i915_gem_object *obj)
> struct drm_device *dev = obj->base.dev;
> drm_i915_private_t *dev_priv = dev->dev_private;
>
> - BUG_ON(!obj->active);
> + WARN_ON(!obj->active);
This warning can be moved up into the caller and so share the warning
between move_to_flushing and move_to_inactive.
> list_move_tail(&obj->mm_list, &dev_priv->mm.flushing_list);
>
> i915_gem_object_move_off_active(obj);
> @@ -1765,8 +1765,8 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
> else
> list_move_tail(&obj->mm_list, &dev_priv->mm.inactive_list);
>
> - BUG_ON(!list_empty(&obj->gpu_write_list));
> - BUG_ON(!obj->active);
> + WARN_ON(!list_empty(&obj->gpu_write_list));
> + WARN_ON(!obj->active);
> obj->ring = NULL;
>
> i915_gem_object_move_off_active(obj);
> diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c
> index da05a26..db62fae 100644
> --- a/drivers/gpu/drm/i915/i915_gem_evict.c
> +++ b/drivers/gpu/drm/i915/i915_gem_evict.c
> @@ -136,7 +136,7 @@ i915_gem_evict_something(struct drm_device *dev, int min_size,
> exec_list);
>
> ret = drm_mm_scan_remove_block(obj->gtt_space);
> - BUG_ON(ret);
> + WARN_ON(ret);
drm_mm_scan_remove_block() should be returning a bool so that we (I!) don't
confuse it with an error code.
if (WARN_ON(ret)) return -EIO; /* or whatever is safe. */
If there is no safe way to handle the error, it is a BUG.
> list_del_init(&obj->exec_list);
> drm_gem_object_unreference(&obj->base);
> @@ -199,7 +199,7 @@ i915_gem_evict_everything(struct drm_device *dev, bool purgeable_only)
> if (ret)
> return ret;
>
> - BUG_ON(!list_empty(&dev_priv->mm.flushing_list));
> + WARN_ON(!list_empty(&dev_priv->mm.flushing_list));
if (WARN_ON(!list_empty()) return -EIO;
> return i915_gem_evict_inactive(dev, purgeable_only);
> }
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 316603e..8cac87c 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1093,7 +1093,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
> &objects, eb,
> exec,
> args->buffer_count);
> - BUG_ON(!mutex_is_locked(&dev->struct_mutex));
> + WARN_ON(!mutex_is_locked(&dev->struct_mutex));
I think this can be dropped after close inspection of the call path.
> }
> if (ret)
> goto err;
> @@ -1122,7 +1122,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
> if (ret)
> goto err;
>
> - BUG_ON(ring->sync_seqno[i]);
> + WARN_ON(ring->sync_seqno[i]);
if (WARN_ON()) { ret = -EIO; goto err; }
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2011-04-20 8:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-19 20:45 [PATCH 0/5] various small patches for -next Daniel Vetter
2011-04-19 20:46 ` [PATCH 1/5] drm/i915: downgrade non-lethal BUG_ONs Daniel Vetter
2011-04-20 8:18 ` Chris Wilson [this message]
2011-04-20 14:27 ` Ben Widawsky
2011-04-20 14:36 ` Chris Wilson
2011-04-19 20:46 ` [PATCH 2/5] drm/i915: not finding a fence is a non-recoverable condition Daniel Vetter
2011-04-19 20:46 ` [PATCH 3/5] drm/i915: check gpu_write_list in move_to_flushing Daniel Vetter
2011-04-19 20:46 ` [PATCH 4/5] drm/i915: fix relaxed tiling on gen2: y-tiling on i855gm Daniel Vetter
2011-04-19 20:46 ` [PATCH 5/5] drm/i915: fix relaxed tiling on gen2: tile height Daniel Vetter
2011-04-21 9:23 ` [PATCH 0/5] various small patches for -next Chris Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='b7da2f$r5rbjv@fmsmga001.fm.intel.com' \
--to=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).