* [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes
@ 2020-03-12 10:35 Chris Wilson
2020-03-12 11:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Chris Wilson @ 2020-03-12 10:35 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
Since drm_mm_node are intended to be embedded into larger structs, we
can use the DEBUG_OBJECTS facility to help track the lifetime of the
drm_mm_node and ensure that they are not being used after the containing
object has been freed, along with the usual verification that the
drm_mm_nodes are being used correctly.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/Kconfig | 13 +++++++
drivers/gpu/drm/drm_mm.c | 54 ++++++++++++++++++++++++++++
drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 --
drivers/gpu/drm/i915/i915_vma.c | 17 +++++++--
include/drm/drm_mm.h | 19 ++++++++++
5 files changed, 100 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 43594978958e..33ac38be55b0 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -54,6 +54,19 @@ config DRM_DEBUG_MM
If in doubt, say "N".
+config DRM_DEBUG_MM_OBJECTS
+ bool "Use debugobjects to track live drm_mm_nodes"
+ default n
+ depends on DRM_DEBUG_MM
+ depends on DEBUG_OBJECTS
+ help
+ Enable allocation tracking of memory manager and leak detection on
+ shutdown.
+
+ Recommended for driver developers only.
+
+ If in doubt, say "N".
+
config DRM_DEBUG_SELFTEST
tristate "kselftests for DRM"
depends on DRM
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index bc6e208949e8..c149c54d8ede 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -150,6 +150,41 @@ static void save_stack(struct drm_mm_node *node) { }
static void show_leaks(struct drm_mm *mm) { }
#endif
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+
+static struct debug_obj_descr drm_mm_debug_descr = {
+ .name = "drm_mm_node",
+};
+
+static inline void debug_node_init(struct drm_mm_node *node)
+{
+ debug_object_init(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_activate(struct drm_mm_node *node)
+{
+ debug_object_activate(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_deactivate(struct drm_mm_node *node)
+{
+ debug_object_deactivate(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_free(struct drm_mm_node *node)
+{
+ debug_object_free(node, &drm_mm_debug_descr);
+}
+
+#else
+
+static inline void debug_node_init(struct drm_mm_node *node) { }
+static inline void debug_node_activate(struct drm_mm_node *node) { }
+static inline void debug_node_deactivate(struct drm_mm_node *node) { }
+static inline void debug_node_free(struct drm_mm_node *node) { }
+
+#endif
+
#define START(node) ((node)->start)
#define LAST(node) ((node)->start + (node)->size - 1)
@@ -428,6 +463,8 @@ int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node)
if (adj_start > node->start || adj_end < end)
return -ENOSPC;
+ debug_node_activate(node);
+
node->mm = mm;
__set_bit(DRM_MM_NODE_ALLOCATED_BIT, &node->flags);
@@ -543,6 +580,8 @@ int drm_mm_insert_node_in_range(struct drm_mm * const mm,
}
}
+ debug_node_activate(node);
+
node->mm = mm;
node->size = size;
node->start = adj_start;
@@ -587,6 +626,7 @@ void drm_mm_remove_node(struct drm_mm_node *node)
DRM_MM_BUG_ON(!drm_mm_node_allocated(node));
DRM_MM_BUG_ON(drm_mm_node_scanned_block(node));
+ debug_node_deactivate(node);
prev_node = list_prev_entry(node, node_list);
@@ -618,6 +658,8 @@ void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)
struct drm_mm *mm = old->mm;
DRM_MM_BUG_ON(!drm_mm_node_allocated(old));
+ debug_node_deactivate(old);
+ debug_node_activate(new);
*new = *old;
@@ -639,6 +681,18 @@ void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)
}
EXPORT_SYMBOL(drm_mm_replace_node);
+void __drm_mm_node_init(struct drm_mm_node *node)
+{
+ debug_node_init(node);
+}
+EXPORT_SYMBOL(__drm_mm_node_init);
+
+void __drm_mm_node_fini(struct drm_mm_node *node)
+{
+ debug_node_free(node);
+}
+EXPORT_SYMBOL(__drm_mm_node_fini);
+
/**
* DOC: lru scan roster
*
diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index f4fec7eb4064..0c34d4dd6458 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -359,8 +359,6 @@ static struct i915_vma *pd_vma_create(struct gen6_ppgtt *ppgtt, int size)
i915_active_init(&vma->active, NULL, NULL);
- kref_init(&vma->ref);
- mutex_init(&vma->pages_mutex);
vma->vm = i915_vm_get(&ggtt->vm);
vma->ops = &pd_vma_ops;
vma->private = ppgtt;
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 5b3efb43a8ef..64140d51ae2c 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -45,11 +45,24 @@ static struct i915_global_vma {
struct i915_vma *i915_vma_alloc(void)
{
- return kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
+ struct i915_vma *vma;
+
+ vma = kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
+ if (!vma)
+ return NULL;
+
+ kref_init(&vma->ref);
+ mutex_init(&vma->pages_mutex);
+ drm_mm_node_init(&vma->node);
+
+ return vma;
}
void i915_vma_free(struct i915_vma *vma)
{
+ drm_mm_node_fini(&vma->node);
+ mutex_destroy(&vma->pages_mutex);
+
return kmem_cache_free(global.slab_vmas, vma);
}
@@ -114,8 +127,6 @@ vma_create(struct drm_i915_gem_object *obj,
if (vma == NULL)
return ERR_PTR(-ENOMEM);
- kref_init(&vma->ref);
- mutex_init(&vma->pages_mutex);
vma->vm = i915_vm_get(vm);
vma->ops = &vm->vma_ops;
vma->obj = obj;
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index d7939c054259..5ecadb7ca8fb 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -275,6 +275,25 @@ static inline bool drm_mm_initialized(const struct drm_mm *mm)
return mm->hole_stack.next;
}
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+void __drm_mm_node_init(struct drm_mm_node *node);
+void __drm_mm_node_fini(struct drm_mm_node *node);
+#else
+static inline void __drm_mm_node_init(struct drm_mm_node *node) { }
+static inline void __drm_mm_node_fini(struct drm_mm_node *node) { }
+#endif
+
+static inline void drm_mm_node_init(struct drm_mm_node *node)
+{
+ __drm_mm_node_init(node);
+ memset(node, 0, sizeof(*node));
+}
+
+static inline void drm_mm_node_fini(struct drm_mm_node *node)
+{
+ __drm_mm_node_fini(node);
+}
+
/**
* drm_mm_hole_follows - checks whether a hole follows this node
* @node: drm_mm_node to check
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/mm: Use debugobject to track lifetimes
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
@ 2020-03-12 11:11 ` Patchwork
2020-03-12 11:19 ` [Intel-gfx] [PATCH] " Chris Wilson
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-03-12 11:11 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/mm: Use debugobject to track lifetimes
URL : https://patchwork.freedesktop.org/series/74638/
State : failure
== Summary ==
CALL scripts/checksyscalls.sh
CALL scripts/atomic/check-atomics.sh
DESCEND objtool
CHK include/generated/compile.h
CC drivers/gpu/drm/drm_mm.o
drivers/gpu/drm/drm_mm.c:684:6: error: redefinition of ‘__drm_mm_node_init’
void __drm_mm_node_init(struct drm_mm_node *node)
^~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/drm_mm.c:52:0:
./include/drm/drm_mm.h:282:20: note: previous definition of ‘__drm_mm_node_init’ was here
static inline void __drm_mm_node_init(struct drm_mm_node *node) { }
^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/drm_mm.c:690:6: error: redefinition of ‘__drm_mm_node_fini’
void __drm_mm_node_fini(struct drm_mm_node *node)
^~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/drm_mm.c:52:0:
./include/drm/drm_mm.h:283:20: note: previous definition of ‘__drm_mm_node_fini’ was here
static inline void __drm_mm_node_fini(struct drm_mm_node *node) { }
^~~~~~~~~~~~~~~~~~
scripts/Makefile.build:267: recipe for target 'drivers/gpu/drm/drm_mm.o' failed
make[3]: *** [drivers/gpu/drm/drm_mm.o] Error 1
scripts/Makefile.build:505: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:505: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1683: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
2020-03-12 11:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
@ 2020-03-12 11:19 ` Chris Wilson
2020-03-12 12:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev2) Patchwork
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Chris Wilson @ 2020-03-12 11:19 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
Since drm_mm_node are intended to be embedded into larger structs, we
can use the DEBUG_OBJECTS facility to help track the lifetime of the
drm_mm_node and ensure that they are not being used after the containing
object has been freed, along with the usual verification that the
drm_mm_nodes are being used correctly.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/Kconfig | 13 +++++++
drivers/gpu/drm/drm_mm.c | 55 ++++++++++++++++++++++++++++
drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 -
drivers/gpu/drm/i915/i915_vma.c | 17 +++++++--
include/drm/drm_mm.h | 31 ++++++++++++++++
5 files changed, 113 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 43594978958e..33ac38be55b0 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -54,6 +54,19 @@ config DRM_DEBUG_MM
If in doubt, say "N".
+config DRM_DEBUG_MM_OBJECTS
+ bool "Use debugobjects to track live drm_mm_nodes"
+ default n
+ depends on DRM_DEBUG_MM
+ depends on DEBUG_OBJECTS
+ help
+ Enable allocation tracking of memory manager and leak detection on
+ shutdown.
+
+ Recommended for driver developers only.
+
+ If in doubt, say "N".
+
config DRM_DEBUG_SELFTEST
tristate "kselftests for DRM"
depends on DRM
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index bc6e208949e8..073b417bdd7a 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -150,6 +150,41 @@ static void save_stack(struct drm_mm_node *node) { }
static void show_leaks(struct drm_mm *mm) { }
#endif
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+
+static struct debug_obj_descr drm_mm_debug_descr = {
+ .name = "drm_mm_node",
+};
+
+static inline void debug_node_init(struct drm_mm_node *node)
+{
+ debug_object_init(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_activate(struct drm_mm_node *node)
+{
+ debug_object_activate(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_deactivate(struct drm_mm_node *node)
+{
+ debug_object_deactivate(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_free(struct drm_mm_node *node)
+{
+ debug_object_free(node, &drm_mm_debug_descr);
+}
+
+#else
+
+static inline void debug_node_init(struct drm_mm_node *node) { }
+static inline void debug_node_activate(struct drm_mm_node *node) { }
+static inline void debug_node_deactivate(struct drm_mm_node *node) { }
+static inline void debug_node_free(struct drm_mm_node *node) { }
+
+#endif
+
#define START(node) ((node)->start)
#define LAST(node) ((node)->start + (node)->size - 1)
@@ -428,6 +463,8 @@ int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node)
if (adj_start > node->start || adj_end < end)
return -ENOSPC;
+ debug_node_activate(node);
+
node->mm = mm;
__set_bit(DRM_MM_NODE_ALLOCATED_BIT, &node->flags);
@@ -543,6 +580,8 @@ int drm_mm_insert_node_in_range(struct drm_mm * const mm,
}
}
+ debug_node_activate(node);
+
node->mm = mm;
node->size = size;
node->start = adj_start;
@@ -587,6 +626,7 @@ void drm_mm_remove_node(struct drm_mm_node *node)
DRM_MM_BUG_ON(!drm_mm_node_allocated(node));
DRM_MM_BUG_ON(drm_mm_node_scanned_block(node));
+ debug_node_deactivate(node);
prev_node = list_prev_entry(node, node_list);
@@ -618,6 +658,8 @@ void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)
struct drm_mm *mm = old->mm;
DRM_MM_BUG_ON(!drm_mm_node_allocated(old));
+ debug_node_deactivate(old);
+ debug_node_activate(new);
*new = *old;
@@ -639,6 +681,19 @@ void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)
}
EXPORT_SYMBOL(drm_mm_replace_node);
+void __drm_mm_node_init(struct drm_mm_node *node)
+{
+ debug_node_init(node);
+}
+EXPORT_SYMBOL(__drm_mm_node_init);
+
+void __drm_mm_node_fini(struct drm_mm_node *node)
+{
+ DRM_MM_BUG_ON(drm_mm_node_allocated(node));
+ debug_node_free(node);
+}
+EXPORT_SYMBOL(__drm_mm_node_fini);
+
/**
* DOC: lru scan roster
*
diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index f4fec7eb4064..0c34d4dd6458 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -359,8 +359,6 @@ static struct i915_vma *pd_vma_create(struct gen6_ppgtt *ppgtt, int size)
i915_active_init(&vma->active, NULL, NULL);
- kref_init(&vma->ref);
- mutex_init(&vma->pages_mutex);
vma->vm = i915_vm_get(&ggtt->vm);
vma->ops = &pd_vma_ops;
vma->private = ppgtt;
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 5b3efb43a8ef..64140d51ae2c 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -45,11 +45,24 @@ static struct i915_global_vma {
struct i915_vma *i915_vma_alloc(void)
{
- return kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
+ struct i915_vma *vma;
+
+ vma = kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
+ if (!vma)
+ return NULL;
+
+ kref_init(&vma->ref);
+ mutex_init(&vma->pages_mutex);
+ drm_mm_node_init(&vma->node);
+
+ return vma;
}
void i915_vma_free(struct i915_vma *vma)
{
+ drm_mm_node_fini(&vma->node);
+ mutex_destroy(&vma->pages_mutex);
+
return kmem_cache_free(global.slab_vmas, vma);
}
@@ -114,8 +127,6 @@ vma_create(struct drm_i915_gem_object *obj,
if (vma == NULL)
return ERR_PTR(-ENOMEM);
- kref_init(&vma->ref);
- mutex_init(&vma->pages_mutex);
vma->vm = i915_vm_get(vm);
vma->ops = &vm->vma_ops;
vma->obj = obj;
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index d7939c054259..514685590603 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -275,6 +275,37 @@ static inline bool drm_mm_initialized(const struct drm_mm *mm)
return mm->hole_stack.next;
}
+/* stubs for external module compatiblity */
+void __drm_mm_node_init(struct drm_mm_node *node);
+void __drm_mm_node_fini(struct drm_mm_node *node);
+
+/**
+ * drm_mm_node_init - Prepare a node for use.
+ *
+ * Drivers should clear the drm_mm_node prior to use. If debug is enabled,
+ * the lifetime of the embedded drm_mm_node will be tracked.
+ */
+static inline void drm_mm_node_init(struct drm_mm_node *node)
+{
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+ __drm_mm_node_init(node);
+#endif
+ memset(node, 0, sizeof(*node));
+}
+
+/**
+ * drm_mm_node_fini - Finalize a node for use.
+ *
+ * Drivers should indicate that the drm_mm_node is finished, and its
+ * state will then be verified by drm_mm.
+ */
+static inline void drm_mm_node_fini(struct drm_mm_node *node)
+{
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+ __drm_mm_node_fini(node);
+#endif
+}
+
/**
* drm_mm_hole_follows - checks whether a hole follows this node
* @node: drm_mm_node to check
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev2)
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
2020-03-12 11:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2020-03-12 11:19 ` [Intel-gfx] [PATCH] " Chris Wilson
@ 2020-03-12 12:10 ` Patchwork
2020-03-12 12:19 ` [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-03-12 12:10 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/mm: Use debugobject to track lifetimes (rev2)
URL : https://patchwork.freedesktop.org/series/74638/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
99485e1feb1b drm/mm: Use debugobject to track lifetimes
-:199: WARNING:TYPO_SPELLING: 'compatiblity' may be misspelled - perhaps 'compatibility'?
#199: FILE: include/drm/drm_mm.h:278:
+/* stubs for external module compatiblity */
total: 0 errors, 1 warnings, 0 checks, 188 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
` (2 preceding siblings ...)
2020-03-12 12:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev2) Patchwork
@ 2020-03-12 12:19 ` Chris Wilson
2020-03-12 12:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/mm: Use debugobject to track lifetimes (rev2) Patchwork
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Chris Wilson @ 2020-03-12 12:19 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
Since drm_mm_node are intended to be embedded into larger structs, we
can use the DEBUG_OBJECTS facility to help track the lifetime of the
drm_mm_node and ensure that they are not being used after the containing
object has been freed, along with the usual verification that the
drm_mm_nodes are being used correctly.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
And now switch on for CI. Expect failure from unmarked drm_mm_nodes.
---
drivers/gpu/drm/Kconfig | 13 +++
drivers/gpu/drm/drm_mm.c | 113 +++++++++++++++++++++++----
drivers/gpu/drm/i915/Kconfig.debug | 1 +
drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 -
drivers/gpu/drm/i915/i915_vma.c | 17 +++-
include/drm/drm_mm.h | 31 ++++++++
6 files changed, 158 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 43594978958e..33ac38be55b0 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -54,6 +54,19 @@ config DRM_DEBUG_MM
If in doubt, say "N".
+config DRM_DEBUG_MM_OBJECTS
+ bool "Use debugobjects to track live drm_mm_nodes"
+ default n
+ depends on DRM_DEBUG_MM
+ depends on DEBUG_OBJECTS
+ help
+ Enable allocation tracking of memory manager and leak detection on
+ shutdown.
+
+ Recommended for driver developers only.
+
+ If in doubt, say "N".
+
config DRM_DEBUG_SELFTEST
tristate "kselftests for DRM"
depends on DRM
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index bc6e208949e8..3cbee92f5832 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -116,38 +116,99 @@ static noinline void save_stack(struct drm_mm_node *node)
node->stack = stack_depot_save(entries, n, GFP_NOWAIT);
}
-static void show_leaks(struct drm_mm *mm)
+static void __print_node(struct drm_mm_node *node,
+ char *buf, int sz,
+ const char *reason)
{
- struct drm_mm_node *node;
unsigned long *entries;
unsigned int nr_entries;
+
+ if (!node->stack) {
+ DRM_ERROR("node [%08llx + %08llx]: %s, unknown owner\n",
+ node->start, node->size, reason);
+ return;
+ }
+
+ nr_entries = stack_depot_fetch(node->stack, &entries);
+ stack_trace_snprint(buf, sz, entries, nr_entries, 0);
+ DRM_ERROR("node [%08llx + %08llx]: %s, inserted at\n%s",
+ node->start, node->size, reason, buf);
+}
+
+static void show_leaks(struct drm_mm *mm)
+{
+ struct drm_mm_node *node;
char *buf;
buf = kmalloc(BUFSZ, GFP_KERNEL);
if (!buf)
return;
- list_for_each_entry(node, drm_mm_nodes(mm), node_list) {
- if (!node->stack) {
- DRM_ERROR("node [%08llx + %08llx]: unknown owner\n",
- node->start, node->size);
- continue;
- }
-
- nr_entries = stack_depot_fetch(node->stack, &entries);
- stack_trace_snprint(buf, BUFSZ, entries, nr_entries, 0);
- DRM_ERROR("node [%08llx + %08llx]: inserted at\n%s",
- node->start, node->size, buf);
- }
+ list_for_each_entry(node, drm_mm_nodes(mm), node_list)
+ __print_node(node, buf, BUFSZ, "leaked");
kfree(buf);
}
+static void show_node(struct drm_mm_node *node, const char *reason)
+{
+ char buf[128];
+
+ __print_node(node, buf, sizeof(buf), reason);
+}
+
#undef STACKDEPTH
#undef BUFSZ
#else
static void save_stack(struct drm_mm_node *node) { }
static void show_leaks(struct drm_mm *mm) { }
+
+static void show_node(struct drm_mm_node *node, const char *reason)
+{
+ DRM_ERROR("node [%08llx + %08llx]: %s\n",
+ node->start, node->size, reason);
+}
+#endif
+
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+
+static struct debug_obj_descr drm_mm_debug_descr = {
+ .name = "drm_mm_node",
+};
+
+static inline void debug_node_init(struct drm_mm_node *node)
+{
+ debug_object_init(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_activate(struct drm_mm_node *node)
+{
+ debug_object_activate(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_deactivate(struct drm_mm_node *node)
+{
+ debug_object_deactivate(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_free(struct drm_mm_node *node)
+{
+ debug_object_free(node, &drm_mm_debug_descr);
+}
+
+static inline void debug_node_assert(struct drm_mm_node *node)
+{
+ debug_object_assert_init(node, &drm_mm_debug_descr);
+}
+
+#else
+
+static inline void debug_node_init(struct drm_mm_node *node) { }
+static inline void debug_node_activate(struct drm_mm_node *node) { }
+static inline void debug_node_deactivate(struct drm_mm_node *node) { }
+static inline void debug_node_free(struct drm_mm_node *node) { }
+static inline void debug_node_assert(struct drm_mm_node *node) { }
+
#endif
#define START(node) ((node)->start)
@@ -428,6 +489,8 @@ int drm_mm_reserve_node(struct drm_mm *mm, struct drm_mm_node *node)
if (adj_start > node->start || adj_end < end)
return -ENOSPC;
+ debug_node_activate(node);
+
node->mm = mm;
__set_bit(DRM_MM_NODE_ALLOCATED_BIT, &node->flags);
@@ -543,6 +606,8 @@ int drm_mm_insert_node_in_range(struct drm_mm * const mm,
}
}
+ debug_node_activate(node);
+
node->mm = mm;
node->size = size;
node->start = adj_start;
@@ -587,6 +652,7 @@ void drm_mm_remove_node(struct drm_mm_node *node)
DRM_MM_BUG_ON(!drm_mm_node_allocated(node));
DRM_MM_BUG_ON(drm_mm_node_scanned_block(node));
+ debug_node_deactivate(node);
prev_node = list_prev_entry(node, node_list);
@@ -618,6 +684,8 @@ void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)
struct drm_mm *mm = old->mm;
DRM_MM_BUG_ON(!drm_mm_node_allocated(old));
+ debug_node_deactivate(old);
+ debug_node_activate(new);
*new = *old;
@@ -639,6 +707,21 @@ void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new)
}
EXPORT_SYMBOL(drm_mm_replace_node);
+void __drm_mm_node_init(struct drm_mm_node *node)
+{
+ debug_node_init(node);
+}
+EXPORT_SYMBOL(__drm_mm_node_init);
+
+void __drm_mm_node_fini(struct drm_mm_node *node)
+{
+ if (unlikely(drm_mm_node_allocated(node)))
+ show_node(node, "use-after-free");
+
+ debug_node_free(node);
+}
+EXPORT_SYMBOL(__drm_mm_node_fini);
+
/**
* DOC: lru scan roster
*
@@ -742,6 +825,7 @@ bool drm_mm_scan_add_block(struct drm_mm_scan *scan,
u64 col_start, col_end;
u64 adj_start, adj_end;
+ debug_node_assert(node);
DRM_MM_BUG_ON(node->mm != mm);
DRM_MM_BUG_ON(!drm_mm_node_allocated(node));
DRM_MM_BUG_ON(drm_mm_node_scanned_block(node));
@@ -829,6 +913,7 @@ bool drm_mm_scan_remove_block(struct drm_mm_scan *scan,
{
struct drm_mm_node *prev_node;
+ debug_node_assert(node);
DRM_MM_BUG_ON(node->mm != scan->mm);
DRM_MM_BUG_ON(!drm_mm_node_scanned_block(node));
__clear_bit(DRM_MM_NODE_SCANNED_BIT, &node->flags);
diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug
index 206882e154bc..21ecc4cb3e8b 100644
--- a/drivers/gpu/drm/i915/Kconfig.debug
+++ b/drivers/gpu/drm/i915/Kconfig.debug
@@ -35,6 +35,7 @@ config DRM_I915_DEBUG
select X86_MSR # used by igt/pm_rpm
select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)
select DRM_DEBUG_MM if DRM=y
+ select DRM_DEBUG_MM_OBJECTS
select DRM_EXPORT_FOR_TESTS if m
select DRM_DEBUG_SELFTEST
select DMABUF_SELFTESTS
diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index f4fec7eb4064..0c34d4dd6458 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -359,8 +359,6 @@ static struct i915_vma *pd_vma_create(struct gen6_ppgtt *ppgtt, int size)
i915_active_init(&vma->active, NULL, NULL);
- kref_init(&vma->ref);
- mutex_init(&vma->pages_mutex);
vma->vm = i915_vm_get(&ggtt->vm);
vma->ops = &pd_vma_ops;
vma->private = ppgtt;
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 5b3efb43a8ef..64140d51ae2c 100644
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -45,11 +45,24 @@ static struct i915_global_vma {
struct i915_vma *i915_vma_alloc(void)
{
- return kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
+ struct i915_vma *vma;
+
+ vma = kmem_cache_zalloc(global.slab_vmas, GFP_KERNEL);
+ if (!vma)
+ return NULL;
+
+ kref_init(&vma->ref);
+ mutex_init(&vma->pages_mutex);
+ drm_mm_node_init(&vma->node);
+
+ return vma;
}
void i915_vma_free(struct i915_vma *vma)
{
+ drm_mm_node_fini(&vma->node);
+ mutex_destroy(&vma->pages_mutex);
+
return kmem_cache_free(global.slab_vmas, vma);
}
@@ -114,8 +127,6 @@ vma_create(struct drm_i915_gem_object *obj,
if (vma == NULL)
return ERR_PTR(-ENOMEM);
- kref_init(&vma->ref);
- mutex_init(&vma->pages_mutex);
vma->vm = i915_vm_get(vm);
vma->ops = &vm->vma_ops;
vma->obj = obj;
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index d7939c054259..514685590603 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -275,6 +275,37 @@ static inline bool drm_mm_initialized(const struct drm_mm *mm)
return mm->hole_stack.next;
}
+/* stubs for external module compatiblity */
+void __drm_mm_node_init(struct drm_mm_node *node);
+void __drm_mm_node_fini(struct drm_mm_node *node);
+
+/**
+ * drm_mm_node_init - Prepare a node for use.
+ *
+ * Drivers should clear the drm_mm_node prior to use. If debug is enabled,
+ * the lifetime of the embedded drm_mm_node will be tracked.
+ */
+static inline void drm_mm_node_init(struct drm_mm_node *node)
+{
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+ __drm_mm_node_init(node);
+#endif
+ memset(node, 0, sizeof(*node));
+}
+
+/**
+ * drm_mm_node_fini - Finalize a node for use.
+ *
+ * Drivers should indicate that the drm_mm_node is finished, and its
+ * state will then be verified by drm_mm.
+ */
+static inline void drm_mm_node_fini(struct drm_mm_node *node)
+{
+#ifdef CONFIG_DRM_DEBUG_MM_OBJECTS
+ __drm_mm_node_fini(node);
+#endif
+}
+
/**
* drm_mm_hole_follows - checks whether a hole follows this node
* @node: drm_mm_node to check
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/mm: Use debugobject to track lifetimes (rev2)
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
` (3 preceding siblings ...)
2020-03-12 12:19 ` [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
@ 2020-03-12 12:35 ` Patchwork
2020-03-12 14:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev3) Patchwork
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-03-12 12:35 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/mm: Use debugobject to track lifetimes (rev2)
URL : https://patchwork.freedesktop.org/series/74638/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8126 -> Patchwork_16949
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16949/index.html
Known issues
------------
Here are the changes found in Patchwork_16949 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@i915_pm_rpm@basic-rte:
- fi-hsw-4770: [SKIP][1] ([fdo#109271]) -> [PASS][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8126/fi-hsw-4770/igt@i915_pm_rpm@basic-rte.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16949/fi-hsw-4770/igt@i915_pm_rpm@basic-rte.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][3] ([i915#323]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8126/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16949/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
Participating hosts (46 -> 41)
------------------------------
Missing (5): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-tgl-y fi-byt-clapper
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8126 -> Patchwork_16949
CI-20190529: 20190529
CI_DRM_8126: 2bd9e989a5653d4cd710e9dd2b42b0a080f1add8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5505: 8973d811f3fdfb4ace4aabab2095ce0309881648 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16949: 99485e1feb1bb9577a7752eb0c9bbf7681dd5228 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
99485e1feb1b drm/mm: Use debugobject to track lifetimes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16949/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev3)
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
` (4 preceding siblings ...)
2020-03-12 12:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/mm: Use debugobject to track lifetimes (rev2) Patchwork
@ 2020-03-12 14:59 ` Patchwork
2020-03-12 15:15 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-03-12 14:59 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/mm: Use debugobject to track lifetimes (rev3)
URL : https://patchwork.freedesktop.org/series/74638/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
c869cbdfdc9f drm/mm: Use debugobject to track lifetimes
-:301: WARNING:TYPO_SPELLING: 'compatiblity' may be misspelled - perhaps 'compatibility'?
#301: FILE: include/drm/drm_mm.h:278:
+/* stubs for external module compatiblity */
total: 0 errors, 1 warnings, 0 checks, 283 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/mm: Use debugobject to track lifetimes (rev3)
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
` (5 preceding siblings ...)
2020-03-12 14:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev3) Patchwork
@ 2020-03-12 15:15 ` Patchwork
2020-03-12 21:23 ` [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes kbuild test robot
2020-03-12 22:18 ` kbuild test robot
8 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-03-12 15:15 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/mm: Use debugobject to track lifetimes (rev3)
URL : https://patchwork.freedesktop.org/series/74638/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8127 -> Patchwork_16953
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16953 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_16953, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16953:
### IGT changes ###
#### Possible regressions ####
* igt@runner@aborted:
- fi-pnv-d510: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-pnv-d510/igt@runner@aborted.html
- fi-snb-2520m: NOTRUN -> [FAIL][2]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-snb-2520m/igt@runner@aborted.html
- fi-snb-2600: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-snb-2600/igt@runner@aborted.html
- fi-bxt-dsi: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-bxt-dsi/igt@runner@aborted.html
- fi-elk-e7500: NOTRUN -> [FAIL][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-elk-e7500/igt@runner@aborted.html
- fi-blb-e6850: NOTRUN -> [FAIL][6]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-blb-e6850/igt@runner@aborted.html
#### Warnings ####
* igt@runner@aborted:
- fi-ivb-3770: [FAIL][7] ([i915#1405]) -> [FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8127/fi-ivb-3770/igt@runner@aborted.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-ivb-3770/igt@runner@aborted.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@runner@aborted:
- {fi-tgl-dsi}: NOTRUN -> [FAIL][9]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-tgl-dsi/igt@runner@aborted.html
- {fi-ehl-1}: NOTRUN -> [FAIL][10]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-ehl-1/igt@runner@aborted.html
- {fi-tgl-u}: NOTRUN -> [FAIL][11]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-tgl-u/igt@runner@aborted.html
Known issues
------------
Here are the changes found in Patchwork_16953 that come from known issues:
### IGT changes ###
#### Warnings ####
* igt@runner@aborted:
- fi-kbl-8809g: [FAIL][12] ([i915#1209]) -> [FAIL][13] ([i915#192] / [i915#193] / [i915#194])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8127/fi-kbl-8809g/igt@runner@aborted.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/fi-kbl-8809g/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1209]: https://gitlab.freedesktop.org/drm/intel/issues/1209
[i915#1405]: https://gitlab.freedesktop.org/drm/intel/issues/1405
[i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
[i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
[i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
Participating hosts (42 -> 43)
------------------------------
Additional (8): fi-bsw-n3050 fi-cfl-guc fi-snb-2520m fi-kbl-x1275 fi-bsw-kefka fi-kbl-7560u fi-bsw-nick fi-kbl-r
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-kbl-7500u fi-gdg-551 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8127 -> Patchwork_16953
CI-20190529: 20190529
CI_DRM_8127: 6b843f994832ac95eafa8d380399c3aef2cab3e5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5506: 59fd8a0d01dac58dc6c7d86ef391ed4393ab5aae @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16953: c869cbdfdc9f89f38b1b14d2e2b2342f6dfe2e06 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
c869cbdfdc9f drm/mm: Use debugobject to track lifetimes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16953/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
` (6 preceding siblings ...)
2020-03-12 15:15 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
@ 2020-03-12 21:23 ` kbuild test robot
2020-03-12 22:18 ` kbuild test robot
8 siblings, 0 replies; 10+ messages in thread
From: kbuild test robot @ 2020-03-12 21:23 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, kbuild-all, dri-devel
[-- Attachment #1: Type: text/plain, Size: 2540 bytes --]
Hi Chris,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master v5.6-rc5 next-20200312]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Chris-Wilson/drm-mm-Use-debugobject-to-track-lifetimes/20200313-035020
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
config: openrisc-randconfig-a001-20200312 (attached as .config)
compiler: or1k-linux-gcc (GCC) 9.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=9.2.0 make.cross ARCH=openrisc
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/drm_mm.c:684:6: error: redefinition of '__drm_mm_node_init'
684 | void __drm_mm_node_init(struct drm_mm_node *node)
| ^~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/drm_mm.c:52:
include/drm/drm_mm.h:282:20: note: previous definition of '__drm_mm_node_init' was here
282 | static inline void __drm_mm_node_init(struct drm_mm_node *node) { }
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/drm_mm.c:690:6: error: redefinition of '__drm_mm_node_fini'
690 | void __drm_mm_node_fini(struct drm_mm_node *node)
| ^~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/drm_mm.c:52:
include/drm/drm_mm.h:283:20: note: previous definition of '__drm_mm_node_fini' was here
283 | static inline void __drm_mm_node_fini(struct drm_mm_node *node) { }
| ^~~~~~~~~~~~~~~~~~
vim +/__drm_mm_node_init +684 drivers/gpu/drm/drm_mm.c
683
> 684 void __drm_mm_node_init(struct drm_mm_node *node)
685 {
686 debug_node_init(node);
687 }
688 EXPORT_SYMBOL(__drm_mm_node_init);
689
> 690 void __drm_mm_node_fini(struct drm_mm_node *node)
691 {
692 debug_node_free(node);
693 }
694 EXPORT_SYMBOL(__drm_mm_node_fini);
695
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 26690 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
` (7 preceding siblings ...)
2020-03-12 21:23 ` [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes kbuild test robot
@ 2020-03-12 22:18 ` kbuild test robot
8 siblings, 0 replies; 10+ messages in thread
From: kbuild test robot @ 2020-03-12 22:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: clang-built-linux, intel-gfx, kbuild-all, dri-devel
[-- Attachment #1: Type: text/plain, Size: 2137 bytes --]
Hi Chris,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next linus/master v5.6-rc5 next-20200312]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Chris-Wilson/drm-mm-Use-debugobject-to-track-lifetimes/20200313-035020
base: git://anongit.freedesktop.org/drm/drm-tip drm-tip
config: x86_64-defconfig (attached as .config)
compiler: clang version 11.0.0 (git://gitmirror/llvm_project 14a1b80e044aac1947c891525cf30521be0a79b7)
reproduce:
# FIXME the reproduce steps for clang is not ready yet
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/drm_mm.c:684:6: error: redefinition of '__drm_mm_node_init'
void __drm_mm_node_init(struct drm_mm_node *node)
^
include/drm/drm_mm.h:282:20: note: previous definition is here
static inline void __drm_mm_node_init(struct drm_mm_node *node) { }
^
>> drivers/gpu/drm/drm_mm.c:690:6: error: redefinition of '__drm_mm_node_fini'
void __drm_mm_node_fini(struct drm_mm_node *node)
^
include/drm/drm_mm.h:283:20: note: previous definition is here
static inline void __drm_mm_node_fini(struct drm_mm_node *node) { }
^
2 errors generated.
vim +/__drm_mm_node_init +684 drivers/gpu/drm/drm_mm.c
683
> 684 void __drm_mm_node_init(struct drm_mm_node *node)
685 {
686 debug_node_init(node);
687 }
688 EXPORT_SYMBOL(__drm_mm_node_init);
689
> 690 void __drm_mm_node_fini(struct drm_mm_node *node)
691 {
692 debug_node_free(node);
693 }
694 EXPORT_SYMBOL(__drm_mm_node_fini);
695
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 29030 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-03-12 22:19 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-12 10:35 [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
2020-03-12 11:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for " Patchwork
2020-03-12 11:19 ` [Intel-gfx] [PATCH] " Chris Wilson
2020-03-12 12:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev2) Patchwork
2020-03-12 12:19 ` [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes Chris Wilson
2020-03-12 12:35 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/mm: Use debugobject to track lifetimes (rev2) Patchwork
2020-03-12 14:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/mm: Use debugobject to track lifetimes (rev3) Patchwork
2020-03-12 15:15 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2020-03-12 21:23 ` [Intel-gfx] [PATCH] drm/mm: Use debugobject to track lifetimes kbuild test robot
2020-03-12 22:18 ` kbuild test robot
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).