Commit 95b8c64a authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter

drm: Fix error handling in drm_mm eviction kselftest

        drivers/gpu/drm/selftests/test-drm_mm.c:1277 evict_everything()
        warn: calling list_del() inside list_for_each

The list_del() inside the error handling in the eviction loop is
overkill. We have to undo the eviction scan to return the drm_mm back to
a recoverable state, so have to iterate over the full list, but we only
want to report the error once and once we have an error we can return
early.
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Fixes: 560b3284 ("drm: kselftest for drm_mm and eviction")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170110144031.7609-1-chris@chris-wilson.co.uk
parent fc36ec76
...@@ -1274,13 +1274,19 @@ static bool evict_everything(struct drm_mm *mm, ...@@ -1274,13 +1274,19 @@ static bool evict_everything(struct drm_mm *mm,
if (drm_mm_scan_add_block(&scan, &e->node)) if (drm_mm_scan_add_block(&scan, &e->node))
break; break;
} }
err = 0;
list_for_each_entry(e, &evict_list, link) { list_for_each_entry(e, &evict_list, link) {
if (!drm_mm_scan_remove_block(&scan, &e->node)) { if (!drm_mm_scan_remove_block(&scan, &e->node)) {
pr_err("Node %lld not marked for eviction!\n", if (!err) {
e->node.start); pr_err("Node %lld not marked for eviction!\n",
list_del(&e->link); e->node.start);
err = -EINVAL;
}
} }
} }
if (err)
return false;
list_for_each_entry(e, &evict_list, link) list_for_each_entry(e, &evict_list, link)
drm_mm_remove_node(&e->node); drm_mm_remove_node(&e->node);
......
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