Skip to contentSkip to conversation

drm/i915: Handle i915_ppgtt_put correctly

PATCH Superseded Michel Thierry 2 participants 4 messages Aug 19, 2014 – Aug 26, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Handle i915_ppgtt_put correctly

Unfortunately, the gem_obj/vma relationship is not symmetrical; a gem_obj can look up for the same vma more than once (where the ppgtt refcount is incremented), but will free the vma only once (i915_gem_free_object).

This difference in refcount get/put means that the ppgtt is not removed after the context and vma are destroyed, because sometimes the refcount will never go back to zero.

Keep track of how many times a gem_obj has looked up for a given vma and call i915_ppgtt_put accordingly. This will ensure that the ppgtt is also removed.

OTC-Jira: VIZ-3719

---
 drivers/gpu/drm/i915/i915_gem.c     | 8 ++++++--
 drivers/gpu/drm/i915/i915_gem_gtt.c | 5 ++++-
 drivers/gpu/drm/i915/i915_gem_gtt.h | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +6 -2
index 488244a..f8e9431 100644
@@ -4573,8 +4573,12 @@ void i915_gem_vma_destroy(struct i915_vma *vma)
 
 	vm = vma->vm;
 
-	if (!i915_is_ggtt(vm))
-		i915_ppgtt_put(i915_vm_to_ppgtt(vm));
+	if (!i915_is_ggtt(vm)) {
+		while (vma->ppgtt_refcount > 0) {
+			i915_ppgtt_put(i915_vm_to_ppgtt(vm));
+			vma->ppgtt_refcount--;
+		}
+	}
 
 	list_del(&vma->vma_link);
 
drivers/gpu/drm/i915/i915_gem_gtt.c +4 -1
index 840365c..db6bbe3 100644
@@ -2223,6 +2223,7 @@ static struct i915_vma *__i915_gem_vma_create(struct drm_i915_gem_object *obj,
 	INIT_LIST_HEAD(&vma->exec_list);
 	vma->vm = vm;
 	vma->obj = obj;
+	vma->ppgtt_refcount = 0;
 
 	switch (INTEL_INFO(vm->dev)->gen) {
 	case 8:
@@ -2267,8 +2268,10 @@ i915_gem_obj_lookup_or_create_vma(struct drm_i915_gem_object *obj,
 	if (!vma)
 		vma = __i915_gem_vma_create(obj, vm);
 
-	if (!i915_is_ggtt(vm))
+	if (!i915_is_ggtt(vm)) {
 		i915_ppgtt_get(i915_vm_to_ppgtt(vm));
+		vma->ppgtt_refcount++;
+	}
 
 	return vma;
 }
drivers/gpu/drm/i915/i915_gem_gtt.h +1 -0
index 7616876..28e41d7 100644
@@ -122,6 +122,7 @@ struct i915_vma {
 	struct drm_mm_node node;
 	struct drm_i915_gem_object *obj;
 	struct i915_address_space *vm;
+	int ppgtt_refcount;
 
 	/** This object's place on the active/inactive lists */
 	struct list_head mm_list;
Signature · 1 line
2.0.3
#1 lore raw
Quoted 11 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -0
@@ -2223,6 +2223,7 @@ static struct i915_vma *__i915_gem_vma_create(struct drm_i915_gem_object *obj,
        INIT_LIST_HEAD(&vma->exec_list);
        vma->vm = vm;
        vma->obj = obj;
+       vma->ppgtt_refcount = 0;
 
        switch (INTEL_INFO(vm->dev)->gen) {
        case 8:

drivers/gpu/drm/i915/i915_gem_gtt.c i915_gem_obj_lookup_or_create_vma(struct drm_i915_gem_object *obj, · line 2274

Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -1
@@ -2267,8 +2268,10 @@ i915_gem_obj_lookup_or_create_vma(struct drm_i915_gem_object *obj,
        if (!vma)
                vma = __i915_gem_vma_create(obj, vm);
 
-       if (!i915_is_ggtt(vm))
+       if (!i915_is_ggtt(vm)) {
                i915_ppgtt_get(i915_vm_to_ppgtt(vm));
+               vma->ppgtt_refcount++;
+       }

Shouldn't we just move the ppgtt into the vma_create hunk (or function) instead of this complication?
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#2 lore raw

PATCH v2 1/1 drm/i915: Handle i915_ppgtt_put correctly

In reply to Michel Thierry

Unfortunately, the gem_obj/vma relationship is not symmetrical; a gem_obj can look up for the same vma more than once (where the ppgtt refcount is incremented), but will free the vma only once (i915_gem_free_object).

This difference in refcount get/put means that the ppgtt is not removed after the context and vma are destroyed, because sometimes the refcount will never go back to zero.

v2: Just move the ppgtt refcount into vma_create.

OTC-Jira: VIZ-3719

---
 drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -4
index 840365c..95f6df4 100644
@@ -2251,8 +2251,10 @@ static struct i915_vma *__i915_gem_vma_create(struct drm_i915_gem_object *obj,
 	/* Keep GGTT vmas first to make debug easier */
 	if (i915_is_ggtt(vm))
 		list_add(&vma->vma_link, &obj->vma_list);
-	else
+	else {
 		list_add_tail(&vma->vma_link, &obj->vma_list);
+		i915_ppgtt_get(i915_vm_to_ppgtt(vm));
+	}
 
 	return vma;
 }
@@ -2267,8 +2269,5 @@ i915_gem_obj_lookup_or_create_vma(struct drm_i915_gem_object *obj,
 	if (!vma)
 		vma = __i915_gem_vma_create(obj, vm);
 
-	if (!i915_is_ggtt(vm))
-		i915_ppgtt_get(i915_vm_to_ppgtt(vm));
-
 	return vma;
 }
Signature · 1 line
2.0.3
#3 lore raw
Quoted 4 lines · Michel Thierry

Unfortunately, the gem_obj/vma relationship is not symmetrical; a gem_obj can look up for the same vma more than once (where the ppgtt refcount is incremented), but will free the vma only once (i915_gem_free_object).

Quoted 8 lines

This difference in refcount get/put means that the ppgtt is not removed after the context and vma are destroyed, because sometimes the refcount will never go back to zero.

v2: Just move the ppgtt refcount into vma_create.

OTC-Jira: VIZ-3719

Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch