Skip to contentSkip to conversation

dma-buf: keep only not signaled fence in reservation_object_add_shared_replace v2

PATCH In review Christian König 3 participants 5 messages Oct 31, 2017 2 messages not in the archive DMA buffer sharing framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dma-buf: keep only not signaled fence in reservation_object_add_shared_replace v2

The amdgpu issue to also need signaled fences in the reservation objects should be fixed by now.

Optimize the list by keeping only the not signaled yet fences around.

v2: temporary put the signaled fences at the end of the new container

---
 drivers/dma-buf/reservation.c | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)
drivers/dma-buf/reservation.c +26 -10
index b44d9d7db347..6fc794576997 100644
@@ -145,8 +145,8 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
 				      struct reservation_object_list *fobj,
 				      struct dma_fence *fence)
 {
-	unsigned i;
 	struct dma_fence *old_fence = NULL;
+	unsigned i, j, k;
 
 	dma_fence_get(fence);
 
@@ -162,9 +162,7 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
 	 * references from the old struct are carried over to
 	 * the new.
 	 */
-	fobj->shared_count = old->shared_count;
-
-	for (i = 0; i < old->shared_count; ++i) {
+	for (i = 0, j = 0, k = fobj->shared_max; i < old->shared_count; ++i) {
 		struct dma_fence *check;
 
 		check = rcu_dereference_protected(old->shared[i],
@@ -172,10 +170,18 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
 
 		if (!old_fence && check->context == fence->context) {
 			old_fence = check;
-			RCU_INIT_POINTER(fobj->shared[i], fence);
-		} else
-			RCU_INIT_POINTER(fobj->shared[i], check);
+			RCU_INIT_POINTER(fobj->shared[j++], fence);
+		} else if (!dma_fence_is_signaled(check)) {
+			RCU_INIT_POINTER(fobj->shared[j++], check);
+		} else {
+			/*
+			 * Temporary save the signaled fences at the end of the
+			 * new container
+			 */
+			RCU_INIT_POINTER(fobj->shared[--k], check);
+		}
 	}
+	fobj->shared_count = j;
 	if (!old_fence) {
 		RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);
 		fobj->shared_count++;
@@ -192,10 +198,20 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
 	write_seqcount_end(&obj->seq);
 	preempt_enable();
 
-	if (old)
-		kfree_rcu(old, rcu);
-
 	dma_fence_put(old_fence);
+
+	if (!old)
+		return;
+
+	/* Drop the references to the signaled fences */
+	for (i = k; i < fobj->shared_max; ++i) {
+		struct dma_fence *f;
+
+		f = rcu_dereference_protected(fobj->shared[i],
+					      reservation_object_held(obj));
+		dma_fence_put(f);
+	}
+	kfree_rcu(old, rcu);
 }
 
 /**
Signature · 6 lines
2.11.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): 20171031084306.1986-1-christian.koenig-5C7GfCeVMHo@public.gmane.org

#2 lore raw

PATCH 2/2 dma-buf: try to replace a signaled fence in reservation_object_add_shared_inplace

The amdgpu issue to also need signaled fences in the reservation objects should be fixed by now.

Optimize the handling by replacing a signaled fence when adding a new shared one.

---
 drivers/dma-buf/reservation.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/dma-buf/reservation.c +15 -3
index 6fc794576997..a3928ce9f311 100644
@@ -104,7 +104,8 @@ reservation_object_add_shared_inplace(struct reservation_object *obj,
 				      struct reservation_object_list *fobj,
 				      struct dma_fence *fence)
 {
-	u32 i;
+	struct dma_fence *signaled = NULL;
+	u32 i, signaled_idx;
 
 	dma_fence_get(fence);
 
@@ -126,17 +127,28 @@ reservation_object_add_shared_inplace(struct reservation_object *obj,
 			dma_fence_put(old_fence);
 			return;
 		}
+
+		if (!signaled && dma_fence_is_signaled(old_fence)) {
+			signaled = old_fence;
+			signaled_idx = i;
+		}
 	}
 
 	/*
 	 * memory barrier is added by write_seqcount_begin,
 	 * fobj->shared_count is protected by this lock too
 	 */
-	RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);
-	fobj->shared_count++;
+	if (signaled) {
+		RCU_INIT_POINTER(fobj->shared[signaled_idx], fence);
+	} else {
+		RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);
+		fobj->shared_count++;
+	}
 
 	write_seqcount_end(&obj->seq);
 	preempt_enable();
+
+	dma_fence_put(signaled);
 }
 
 static void
Signature · 6 lines
2.11.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#3 lore raw
In reply to a message not in the archive
Quoted 48 lines · Christian König

The amdgpu issue to also need signaled fences in the reservation objects should be fixed by now.

Optimize the list by keeping only the not signaled yet fences around.

v2: temporary put the signaled fences at the end of the new container

---
  drivers/dma-buf/reservation.c | 36 ++++++++++++++++++++++++++----------
  1 file changed, 26 insertions(+), 10 deletions(-)
drivers/dma-buf/reservation.c +6 -7
index b44d9d7db347..6fc794576997 100644
@@ -145,8 +145,8 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
  				      struct reservation_object_list *fobj,
  				      struct dma_fence *fence)
  {
-	unsigned i;
  	struct dma_fence *old_fence = NULL;
+	unsigned i, j, k;
 
  	dma_fence_get(fence);
 
@@ -162,9 +162,7 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
  	 * references from the old struct are carried over to
  	 * the new.
  	 */
-	fobj->shared_count = old->shared_count;
-
-	for (i = 0; i < old->shared_count; ++i) {
+	for (i = 0, j = 0, k = fobj->shared_max; i < old->shared_count; ++i) {
  		struct dma_fence *check;
 
  		check = rcu_dereference_protected(old->shared[i],
@@ -172,10 +170,18 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
 
  		if (!old_fence && check->context == fence->context) {
  			old_fence = check;
-			RCU_INIT_POINTER(fobj->shared[i], fence);
-		} else
-			RCU_INIT_POINTER(fobj->shared[i], check);
+			RCU_INIT_POINTER(fobj->shared[j++], fence);
+		} else if (!dma_fence_is_signaled(check)) {
+			RCU_INIT_POINTER(fobj->shared[j++], check);
+		} else {

drivers/dma-buf/reservation.c reservation_object_add_shared_replace(struct reservation_object *obj, · line 186

Quoted 10 lines
drivers/dma-buf/reservation.c +7 -0
+			/*
+			 * Temporary save the signaled fences at the end of the
+			 * new container
+			 */
+			RCU_INIT_POINTER(fobj->shared[--k], check);
+		}
  	}
+	fobj->shared_count = j;
  	if (!old_fence) {
  		RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);

Seems you still don't address here, how do you sure fobj->shared[fobj->shared_count] is null? if not NULL, the old one will be leak.

Regards,
David Zhou

Quoted 15 lines
drivers/dma-buf/reservation.c +6 -3
  		fobj->shared_count++;
@@ -192,10 +198,20 @@ reservation_object_add_shared_replace(struct reservation_object *obj,
  	write_seqcount_end(&obj->seq);
  	preempt_enable();
 
-	if (old)
-		kfree_rcu(old, rcu);
-
  	dma_fence_put(old_fence);
+
+	if (!old)
+		return;
+
+	/* Drop the references to the signaled fences */
+	for (i = k; i < fobj->shared_max; ++i) {

drivers/dma-buf/reservation.c reservation_object_add_shared_replace(struct reservation_object *obj, · line 217

Quoted 10 lines
drivers/dma-buf/reservation.c +7 -0
+		struct dma_fence *f;
+
+		f = rcu_dereference_protected(fobj->shared[i],
+					      reservation_object_held(obj));
+		dma_fence_put(f);
+	}
+	kfree_rcu(old, rcu);
  }
 
  /**

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#4 lore raw

Am 31.10.2017 um 09:51 schrieb Chunming Zhou:

Quoted 54 lines · Christian König
Quoted 51 lines

The amdgpu issue to also need signaled fences in the reservation objects should be fixed by now.

Optimize the list by keeping only the not signaled yet fences around.

v2: temporary put the signaled fences at the end of the new container

---
  drivers/dma-buf/reservation.c | 36
++++++++++++++++++++++++++----------

  1 file changed, 26 insertions(+), 10 deletions(-)
drivers/dma-buf/reservation.c +1 -1
index b44d9d7db347..6fc794576997 100644
@@ -145,8 +145,8 @@ reservation_object_add_shared_replace(struct 
 reservation_object *obj,
                         struct reservation_object_list *fobj,
                         struct dma_fence *fence)
   {
-    unsigned i;
       struct dma_fence *old_fence = NULL;
+    unsigned i, j, k;
         dma_fence_get(fence);
   @@ -162,9 +162,7 @@ reservation_object_add_shared_replace(struct reservation_object *obj,

       * references from the old struct are carried over to
       * the new.
       */
-    fobj->shared_count = old->shared_count;
-
-    for (i = 0; i < old->shared_count; ++i) {
+    for (i = 0, j = 0, k = fobj->shared_max; i < old->shared_count; ++i) {
          struct dma_fence *check;
            check = rcu_dereference_protected(old->shared[i],

drivers/dma-buf/reservation.c +7 -3
@@ -172,10 +170,18 @@ reservation_object_add_shared_replace(struct 
 reservation_object *obj,
             if (!old_fence && check->context == fence->context) {
               old_fence = check;
-            RCU_INIT_POINTER(fobj->shared[i], fence);
-        } else
-            RCU_INIT_POINTER(fobj->shared[i], check);
+            RCU_INIT_POINTER(fobj->shared[j++], fence);
+        } else if (!dma_fence_is_signaled(check)) {
+            RCU_INIT_POINTER(fobj->shared[j++], check);
+        } else {
+            /*
+             * Temporary save the signaled fences at the end of the
+             * new container
Quoted 8 lines

drivers/dma-buf/reservation.c reservation_object_add_shared_replace(struct reservation_object *obj, · line 186

Quoted 7 lines
drivers/dma-buf/reservation.c +4 -0
+             */
+            RCU_INIT_POINTER(fobj->shared[--k], check);
+        }
       }
+    fobj->shared_count = j;
       if (!old_fence) {
 RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);

Seems you still don't address here, how do you sure fobj->shared[fobj->shared_count] is null? if not NULL, the old one will be leak.

I've put them at the end of the container, see above "k = fobj->shared_max". Since shared_max >> shared_count (at least twice as large in this situation) we should be on the save side.

Regards,
Christian.

Quoted 19 lines

Regards,
David Zhou

Quoted 16 lines
drivers/dma-buf/reservation.c +7 -2
           fobj->shared_count++;
@@ -192,10 +198,20 @@ reservation_object_add_shared_replace(struct 
 reservation_object *obj,
       write_seqcount_end(&obj->seq);
       preempt_enable();
   -    if (old)
-        kfree_rcu(old, rcu);
-
       dma_fence_put(old_fence);
+
+    if (!old)
+        return;
+
+    /* Drop the references to the signaled fences */
+    for (i = k; i < fobj->shared_max; ++i) {
+        struct dma_fence *f;
Quoted 9 lines

drivers/dma-buf/reservation.c reservation_object_add_shared_replace(struct reservation_object *obj, · line 217

Quoted 8 lines
drivers/dma-buf/reservation.c +6 -0
+
+        f = rcu_dereference_protected(fobj->shared[i],
+                          reservation_object_held(obj));
+        dma_fence_put(f);
+    }
+    kfree_rcu(old, rcu);
   }
     /**

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

A message that is not in the archive (sent off-list or not yet received): bb7fb308-8e1d-96c1-6474-c1bd35fd4601-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#6 lore raw
Quoted 64 lines · Christian König

Am 31.10.2017 um 09:51 schrieb Chunming Zhou:

Quoted 54 lines · Christian König
Quoted 51 lines

The amdgpu issue to also need signaled fences in the reservation objects should be fixed by now.

Optimize the list by keeping only the not signaled yet fences around.

v2: temporary put the signaled fences at the end of the new container

---
  drivers/dma-buf/reservation.c | 36
++++++++++++++++++++++++++----------

  1 file changed, 26 insertions(+), 10 deletions(-)
drivers/dma-buf/reservation.c +1 -1
index b44d9d7db347..6fc794576997 100644
@@ -145,8 +145,8 @@ reservation_object_add_shared_replace(struct 
 reservation_object *obj,
                         struct reservation_object_list *fobj,
                         struct dma_fence *fence)
   {
-    unsigned i;
       struct dma_fence *old_fence = NULL;
+    unsigned i, j, k;
         dma_fence_get(fence);
   @@ -162,9 +162,7 @@ reservation_object_add_shared_replace(struct reservation_object *obj,

       * references from the old struct are carried over to
       * the new.
       */
-    fobj->shared_count = old->shared_count;
-
-    for (i = 0; i < old->shared_count; ++i) {
+    for (i = 0, j = 0, k = fobj->shared_max; i < old->shared_count; ++i) {
          struct dma_fence *check;
            check = rcu_dereference_protected(old->shared[i],

drivers/dma-buf/reservation.c +7 -3
@@ -172,10 +170,18 @@ reservation_object_add_shared_replace(struct 
 reservation_object *obj,
             if (!old_fence && check->context == fence->context) {
               old_fence = check;
-            RCU_INIT_POINTER(fobj->shared[i], fence);
-        } else
-            RCU_INIT_POINTER(fobj->shared[i], check);
+            RCU_INIT_POINTER(fobj->shared[j++], fence);
+        } else if (!dma_fence_is_signaled(check)) {
+            RCU_INIT_POINTER(fobj->shared[j++], check);
+        } else {
+            /*
+             * Temporary save the signaled fences at the end of the
+             * new container
Quoted 8 lines

drivers/dma-buf/reservation.c reservation_object_add_shared_replace(struct reservation_object *obj, · line 186

Quoted 7 lines
drivers/dma-buf/reservation.c +4 -0
+             */
+            RCU_INIT_POINTER(fobj->shared[--k], check);
+        }
       }
+    fobj->shared_count = j;
       if (!old_fence) {
 RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);

Seems you still don't address here, how do you sure fobj->shared[fobj->shared_count] is null? if not NULL, the old one will be leak.

Quoted 1 line

I've put them at the end of the container, see above "k = fobj->shared_max". Since shared_max >> shared_count (at least twice as large in this situation) we should be on the save side.

Ah, oops, Reviewed-by: Chunming Zhou <[email protected]> for the series.

Thanks,
David Zhou

Quoted 33 lines

Regards,
Christian.

Quoted 28 lines

Regards,
David Zhou

Quoted 24 lines
drivers/dma-buf/reservation.c +13 -2
           fobj->shared_count++;
@@ -192,10 +198,20 @@ reservation_object_add_shared_replace(struct 
 reservation_object *obj,
       write_seqcount_end(&obj->seq);
       preempt_enable();
   -    if (old)
-        kfree_rcu(old, rcu);
-
       dma_fence_put(old_fence);
+
+    if (!old)
+        return;
+
+    /* Drop the references to the signaled fences */
+    for (i = k; i < fobj->shared_max; ++i) {
+        struct dma_fence *f;
+
+        f = rcu_dereference_protected(fobj->shared[i],
+                          reservation_object_held(obj));
+        dma_fence_put(f);
+    }
+    kfree_rcu(old, rcu);
   }
     /**

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx