[PATCH 22/31] drm: Compile time enabling for asserts in drm_mm
Chris Wilson
chris at chris-wilson.co.uk
Mon Dec 12 08:16:39 UTC 2016
Use CONFIG_DRM_DEBUG_MM to conditionally enable the internal and
validation checking using BUG_ON. Ideally these paths should all be
exercised by CI selftests (with the asserts enabled).
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
drivers/gpu/drm/drm_mm.c | 45 ++++++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 7479b908dd08..0c32da9e3b99 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -91,6 +91,12 @@
* some basic allocator dumpers for debugging.
*/
+#ifdef CONFIG_DRM_DEBUG_MM
+#define MM_BUG_ON(expr) BUG_ON(expr)
+#else
+#define MM_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
+#endif
+
static struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
u64 size,
u64 alignment,
@@ -237,7 +243,7 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node,
u64 adj_start = hole_start;
u64 adj_end = hole_end;
- BUG_ON(node->allocated);
+ MM_BUG_ON(node->allocated);
if (mm->color_adjust)
mm->color_adjust(hole_node, color, &adj_start, &adj_end);
@@ -257,8 +263,8 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node,
}
}
- BUG_ON(adj_start < hole_start);
- BUG_ON(adj_end > hole_end);
+ MM_BUG_ON(adj_start < hole_start);
+ MM_BUG_ON(adj_end > hole_end);
if (adj_start == hole_start) {
hole_node->hole_follows = 0;
@@ -275,7 +281,7 @@ static void drm_mm_insert_helper(struct drm_mm_node *hole_node,
drm_mm_interval_tree_add_node(hole_node, node);
- BUG_ON(node->start + node->size > adj_end);
+ MM_BUG_ON(node->start + node->size > adj_end);
node->hole_follows = 0;
if (__drm_mm_hole_node_start(node) < hole_end) {
@@ -408,7 +414,7 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
u64 adj_start = hole_start;
u64 adj_end = hole_end;
- BUG_ON(!hole_node->hole_follows || node->allocated);
+ MM_BUG_ON(!hole_node->hole_follows || node->allocated);
if (adj_start < start)
adj_start = start;
@@ -448,10 +454,10 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node,
drm_mm_interval_tree_add_node(hole_node, node);
- BUG_ON(node->start < start);
- BUG_ON(node->start < adj_start);
- BUG_ON(node->start + node->size > adj_end);
- BUG_ON(node->start + node->size > end);
+ MM_BUG_ON(node->start < start);
+ MM_BUG_ON(node->start < adj_start);
+ MM_BUG_ON(node->start + node->size > adj_end);
+ MM_BUG_ON(node->start + node->size > end);
node->hole_follows = 0;
if (__drm_mm_hole_node_start(node) < hole_end) {
@@ -520,19 +526,20 @@ void drm_mm_remove_node(struct drm_mm_node *node)
if (WARN_ON(!node->allocated))
return;
- BUG_ON(node->scanned_block || node->scanned_prev_free
- || node->scanned_next_free);
+ MM_BUG_ON(node->scanned_block ||
+ node->scanned_prev_free ||
+ node->scanned_next_free);
prev_node =
list_entry(node->node_list.prev, struct drm_mm_node, node_list);
if (node->hole_follows) {
- BUG_ON(__drm_mm_hole_node_start(node) ==
- __drm_mm_hole_node_end(node));
+ MM_BUG_ON(__drm_mm_hole_node_start(node) ==
+ __drm_mm_hole_node_end(node));
list_del(&node->hole_stack);
} else
- BUG_ON(__drm_mm_hole_node_start(node) !=
- __drm_mm_hole_node_end(node));
+ MM_BUG_ON(__drm_mm_hole_node_start(node) !=
+ __drm_mm_hole_node_end(node));
if (!prev_node->hole_follows) {
@@ -575,7 +582,7 @@ static struct drm_mm_node *drm_mm_search_free_generic(const struct drm_mm *mm,
u64 adj_end;
u64 best_size;
- BUG_ON(mm->scanned_blocks);
+ MM_BUG_ON(mm->scanned_blocks);
best = NULL;
best_size = ~0UL;
@@ -619,7 +626,7 @@ static struct drm_mm_node *drm_mm_search_free_in_range_generic(const struct drm_
u64 adj_end;
u64 best_size;
- BUG_ON(mm->scanned_blocks);
+ MM_BUG_ON(mm->scanned_blocks);
best = NULL;
best_size = ~0UL;
@@ -795,7 +802,7 @@ bool drm_mm_scan_add_block(struct drm_mm_node *node)
mm->scanned_blocks++;
- BUG_ON(node->scanned_block);
+ MM_BUG_ON(node->scanned_block);
node->scanned_block = 1;
prev_node = list_entry(node->node_list.prev, struct drm_mm_node,
@@ -856,7 +863,7 @@ bool drm_mm_scan_remove_block(struct drm_mm_node *node)
mm->scanned_blocks--;
- BUG_ON(!node->scanned_block);
+ MM_BUG_ON(!node->scanned_block);
node->scanned_block = 0;
prev_node = list_entry(node->node_list.prev, struct drm_mm_node,
--
2.11.0
More information about the Intel-gfx-trybot
mailing list