[RFC 28/29] staging/android: use .cleanup() to interrupt any sync_fence waiter

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Gustavo Padovan <gustavo@padovan.org>
Newsgroups	linux.kernel
Subject	[RFC 28/29] staging/android: use .cleanup() to interrupt any sync_fence waiter
Date	Fri, 15 Jan 2016 16:00:03 +0100
Message-ID	<qRe15-7zo-53@gated-at.bofh.it> (permalink)
References	<qRe14-7zo-5@gated-at.bofh.it>
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AfuB2u2hX7iq26bmdDdBdO2au9C7yVfjE0lckWtVvS4=; b=FN4sRaYfGTg0deKlGCoQklMWfHuTtK6XmBosIaf+/xkykXb5edffPFdTIUprYig1AO lvO9OfzzHtmnLpjcelKAfmQm5psrwIzRHiEjAKS7ci0H24zIXp23fec803UtDu6n+u5c teKWPKqgs4TvDg1jXS5vu7VKoJLozEnJTcXDp/2w6CGKGbUiVg7joS2RTlJuLegAHyqz bQwuhT3VwXjsIEFXa+IrLeFuYVCoog6sXX5GEJ3Q1niB1q0Z87joZ7fQtV9gPp3nPymA 57BMsZtD++mrYEKXQJvOtOAFw0WNrmjAOowfEIxFRulurCZxBTWc5nnMhcBpN8OZHjzG dQLw==
X-Gm-Message-State	ALoCoQmbmo2ko/vronkpL6cbiZ7OkF717Y43X6Puu45UglkbW5MZWYzmLX9owHS4wh+xRFZqWgwP7wH4qreWYAPwN02RCVoRMw==
X-Received	by 10.129.51.214 with SMTP id z205mr8240236ywz.157.1452869851608; Fri, 15 Jan 2016 06:57:31 -0800 (PST)
X-Mailer	git-send-email 2.5.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	80
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, daniels@collabora.com, Arve Hjønnevåg <arve@android.com>, Riley Andrews <riandrews@android.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Rob Clark <robdclark@gmail.com>, Greg Hackmann <ghackmann@google.com>, John Harrison <John.C.Harrison@Intel.com>, Maarten Lankhorst <maarten.lankhorst@canonical.com>, Gustavo Padovan <gustavo.padovan@collabora.co.uk>
X-Original-Date	Fri, 15 Jan 2016 12:55:38 -0200
X-Original-Message-ID	<1452869739-3304-29-git-send-email-gustavo@padovan.org>
X-Original-References	<1452869739-3304-1-git-send-email-gustavo@padovan.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1310192

Show key headers only | View raw

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

When the timeline is being destroyed all the waiters waiting for the
sync_fence to signal need to be woken up and finished as well.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 drivers/staging/android/sw_sync.c | 8 ++++++++
 drivers/staging/android/sync.c    | 9 +++++++++
 drivers/staging/android/sync.h    | 2 ++
 3 files changed, 19 insertions(+)

diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index ee7a942..8c83bad 100644
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -25,6 +25,13 @@
 
 #include "sw_sync.h"
 
+static void sw_sync_cleanup(struct fence *fence, void *user_data)
+{
+	struct sync_fence *sync_fence = user_data;
+
+	sync_fence_cleanup(sync_fence);
+}
+
 static const struct fence_ops sw_sync_fence_ops = {
 	.get_driver_name = fence_default_get_driver_name,
 	.get_timeline_name = fence_default_get_timeline_name,
@@ -32,6 +39,7 @@ static const struct fence_ops sw_sync_fence_ops = {
 	.signaled = fence_default_signaled,
 	.wait = fence_default_wait,
 	.release = fence_default_release,
+	.cleanup = sw_sync_cleanup,
 	.fill_driver_data = fence_default_fill_driver_data,
 	.fence_value_str = fence_default_value_str,
 	.timeline_value_str = fence_default_timeline_value_str,
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 956b4e9..aafecf4 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -91,6 +91,8 @@ struct sync_fence *sync_fence_create_dma(const char *name, struct fence *fence)
 
 	sync_fence_debug_add(sync_fence);
 
+	fence_add_user_data(fence, sync_fence);
+
 	return sync_fence;
 }
 EXPORT_SYMBOL(sync_fence_create_dma);
@@ -101,6 +103,13 @@ struct sync_fence *sync_fence_create(const char *name, struct fence *fence)
 }
 EXPORT_SYMBOL(sync_fence_create);
 
+void sync_fence_cleanup(struct sync_fence *sync_fence)
+{
+	atomic_set(&sync_fence->status, -ENOENT);
+	wake_up_all(&sync_fence->wq);
+}
+EXPORT_SYMBOL(sync_fence_cleanup);
+
 struct sync_fence *sync_fence_fdget(int fd)
 {
 	struct file *file = fget(fd);
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index 8e6827b..d60d9c2 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -98,6 +98,8 @@ struct sync_fence *sync_fence_create(const char *name, struct fence *fence);
  */
 struct sync_fence *sync_fence_create_dma(const char *name, struct fence *pt);
 
+void sync_fence_cleanup(struct sync_fence *sync_fence);
+
 /*
  * API for sync_fence consumers
  */
-- 
2.5.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[RFC 28/29] staging/android: use .cleanup() to interrupt any sync_fence waiter Gustavo Padovan <gustavo@padovan.org> - 2016-01-15 16:00 +0100

csiph-web