From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [RFC 2/8] dma-buf/sync_file: add sync_file_fences_get() Date: Fri, 15 Apr 2016 09:56:36 +0200 Message-ID: <20160415075636.GP2510@phenom.ffwll.local> References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> <1460683781-22535-3-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 66E696EBB8 for ; Fri, 15 Apr 2016 07:56:41 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id a140so3828961wma.2 for ; Fri, 15 Apr 2016 00:56:41 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1460683781-22535-3-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Riley Andrews , m.chehab@samsung.com, Gustavo Padovan , John Harrison , laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBBcHIgMTQsIDIwMTYgYXQgMDY6Mjk6MzVQTSAtMDcwMCwgR3VzdGF2byBQYWRvdmFu IHdyb3RlOgo+IEZyb206IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9y YS5jby51az4KPiAKPiBDcmVhdGVzIGEgZnVuY3Rpb24gdGhhdCBnaXZlbiBhbiBzeW5jIGZpbGUg ZGVzY3JpcHRvciByZXR1cm5zIGEKPiBmZW5jZV9jb2xsZWN0aW9uIGNvbnRhaW5pbmcgYWxsIGZl bmNlcyBpbiB0aGUgc3luY19maWxlLgo+IAo+IElmIHRoZXJlIGlzIG9ubHkgb25lIGZlbmNlIGlu IHRoZSBzeW5jX2ZpbGUgdGhpcyBmZW5jZSBpdHNlbGYgaXMgcmV0dXJuZWQsCj4gaG93ZXZlciBp ZiB0aGVyZSBpcyBtb3JlIHRoYW4gb25lLCBhIGZlbmNlX2NvbGxlY3Rpb24gZmVuY2UgaXMgcmV0 dXJuZWQuCj4gCj4gU2lnbmVkLW9mZi1ieTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92 YW5AY29sbGFib3JhLmNvLnVrPgo+IC0tLQo+ICBkcml2ZXJzL2RtYS1idWYvc3luY19maWxlLmMg fCAzNyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCj4gIGluY2x1ZGUvbGlu dXgvc3luY19maWxlLmggICB8IDEwICsrKysrKysrKysKPiAgMiBmaWxlcyBjaGFuZ2VkLCA0NyBp bnNlcnRpb25zKCspCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hLWJ1Zi9zeW5jX2ZpbGUu YyBiL2RyaXZlcnMvZG1hLWJ1Zi9zeW5jX2ZpbGUuYwo+IGluZGV4IDRkMmFmMjQuLjkyNmZhZmEg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9kbWEtYnVmL3N5bmNfZmlsZS5jCj4gKysrIGIvZHJpdmVy cy9kbWEtYnVmL3N5bmNfZmlsZS5jCj4gQEAgLTIzLDYgKzIzLDcgQEAKPiAgI2luY2x1ZGUgPGxp bnV4L3NsYWIuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L3VhY2Nlc3MuaD4KPiAgI2luY2x1ZGUgPGxp bnV4L2Fub25faW5vZGVzLmg+Cj4gKyNpbmNsdWRlIDxsaW51eC9mZW5jZS1jb2xsZWN0aW9uLmg+ Cj4gICNpbmNsdWRlIDxsaW51eC9zeW5jX2ZpbGUuaD4KPiAgI2luY2x1ZGUgPHVhcGkvbGludXgv c3luY19maWxlLmg+Cj4gIAo+IEBAIC0xMjIsNiArMTIzLDM5IEBAIHZvaWQgc3luY19maWxlX2lu c3RhbGwoc3RydWN0IHN5bmNfZmlsZSAqc3luY19maWxlLCBpbnQgZmQpCj4gIH0KPiAgRVhQT1JU X1NZTUJPTChzeW5jX2ZpbGVfaW5zdGFsbCk7Cj4gIAo+ICtzdHJ1Y3QgZmVuY2UgKnN5bmNfZmls ZV9mZW5jZXNfZ2V0KGludCBmZCkKPiArewo+ICsJc3RydWN0IHN5bmNfZmlsZSAqc3luY19maWxl Owo+ICsJc3RydWN0IGZlbmNlX2NvbGxlY3Rpb24gKmNvbGxlY3Rpb247Cj4gKwlpbnQgaTsKPiAr Cj4gKwlzeW5jX2ZpbGUgPSBzeW5jX2ZpbGVfZmRnZXQoZmQpOwo+ICsJaWYgKCFzeW5jX2ZpbGUp Cj4gKwkJcmV0dXJuIE5VTEw7Cj4gKwo+ICsJaWYgKHN5bmNfZmlsZS0+bnVtX2ZlbmNlcyA9PSAx KSB7Cj4gKwkJc3RydWN0IGZlbmNlICpmZW5jZSA9IHN5bmNfZmlsZS0+Y2JzWzBdLmZlbmNlOwo+ ICsKPiArCQlzeW5jX2ZpbGVfcHV0KHN5bmNfZmlsZSk7Cj4gKwkJcmV0dXJuIGZlbmNlOwo+ICsJ fQo+ICsKPiArCWNvbGxlY3Rpb24gPSBmZW5jZV9jb2xsZWN0aW9uX2luaXQoc3luY19maWxlLT5u dW1fZmVuY2VzKTsKPiArCWlmICghY29sbGVjdGlvbikgewo+ICsJCXN5bmNfZmlsZV9wdXQoc3lu Y19maWxlKTsKPiArCQlyZXR1cm4gTlVMTDsKPiArCX0KPiArCj4gKwlmb3IgKGkgPSAwIDsgaSA8 IHN5bmNfZmlsZS0+bnVtX2ZlbmNlcyA7IGkrKykKPiArCQlmZW5jZV9jb2xsZWN0aW9uX2FkZChj b2xsZWN0aW9uLCBzeW5jX2ZpbGUtPmNic1tpXS5mZW5jZSk7Cj4gKwo+ICsJc3luY19maWxlLT5j b2xsZWN0aW9uID0gY29sbGVjdGlvbjsKPiArCXN5bmNfZmlsZV9wdXQoc3luY19maWxlKTsKPiAr Cj4gKwlyZXR1cm4gJmNvbGxlY3Rpb24tPmJhc2U7Cj4gK30KClRoaXMgZnVuY3Rpb24gc2hvdWxk IHByb2JhYmx5IGFjcXVpcmUgYSByZWZlcmVuY2UgZm9yIHRoZSByZXR1cm5lZCBmZW5jZQpmb3Ig dGhlIGNhbGxlci4KLURhbmllbAoKPiArRVhQT1JUX1NZTUJPTChzeW5jX2ZpbGVfZmVuY2VzX2dl dCk7Cj4gKwo+ICBzdGF0aWMgdm9pZCBzeW5jX2ZpbGVfYWRkX3B0KHN0cnVjdCBzeW5jX2ZpbGUg KnN5bmNfZmlsZSwgaW50ICppLAo+ICAJCQkgICAgIHN0cnVjdCBmZW5jZSAqZmVuY2UpCj4gIHsK PiBAQCAtMjAwLDYgKzIzNCw5IEBAIHN0YXRpYyB2b2lkIHN5bmNfZmlsZV9mcmVlKHN0cnVjdCBr cmVmICprcmVmKQo+ICAJCQkJCQkgICAgIGtyZWYpOwo+ICAJaW50IGk7Cj4gIAo+ICsJaWYgKHN5 bmNfZmlsZS0+Y29sbGVjdGlvbikKPiArCQlmZW5jZV9jb2xsZWN0aW9uX3B1dChzeW5jX2ZpbGUt PmNvbGxlY3Rpb24pOwo+ICsKPiAgCWZvciAoaSA9IDA7IGkgPCBzeW5jX2ZpbGUtPm51bV9mZW5j ZXM7ICsraSkgewo+ICAJCWZlbmNlX3JlbW92ZV9jYWxsYmFjayhzeW5jX2ZpbGUtPmNic1tpXS5m ZW5jZSwKPiAgCQkJCSAgICAgICZzeW5jX2ZpbGUtPmNic1tpXS5jYik7Cj4gZGlmZiAtLWdpdCBh L2luY2x1ZGUvbGludXgvc3luY19maWxlLmggYi9pbmNsdWRlL2xpbnV4L3N5bmNfZmlsZS5oCj4g aW5kZXggN2I3YTg5ZC4uMmNiMDQ4NiAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL2xpbnV4L3N5bmNf ZmlsZS5oCj4gKysrIGIvaW5jbHVkZS9saW51eC9zeW5jX2ZpbGUuaAo+IEBAIC00OSw2ICs0OSw3 IEBAIHN0cnVjdCBzeW5jX2ZpbGUgewo+ICAJd2FpdF9xdWV1ZV9oZWFkX3QJd3E7Cj4gIAlhdG9t aWNfdAkJc3RhdHVzOwo+ICAKPiArCXN0cnVjdCBmZW5jZV9jb2xsZWN0aW9uICpjb2xsZWN0aW9u Owo+ICAJc3RydWN0IHN5bmNfZmlsZV9jYgljYnNbXTsKPiAgfTsKPiAgCj4gQEAgLTEwMyw0ICsx MDQsMTMgQEAgdm9pZCBzeW5jX2ZpbGVfcHV0KHN0cnVjdCBzeW5jX2ZpbGUgKnN5bmNfZmlsZSk7 Cj4gICAqLwo+ICB2b2lkIHN5bmNfZmlsZV9pbnN0YWxsKHN0cnVjdCBzeW5jX2ZpbGUgKnN5bmNf ZmlsZSwgaW50IGZkKTsKPiAgCj4gKy8qKgo+ICsgKiBzeW5jX2ZpbGVfZmVuY2VzX2dldCAtIGdl dCB0aGUgZmVuY2UgcmVsYXRlZCB0byB0aGUgZmQKPiArICogQGZkOgkJZmlsZSBkZXNjcmlwdG9y IHRvIGxvb2sgZm9yIGEgZmVuY2UgY29sbGVjdGlvbgo+ICsgKgo+ICsgKiBFbnN1cmVzIEBmZCBy ZWZlcmVuY2VzIGEgdmFsaWQgc3luY19maWxlIGFuZCByZXR1cm5zIHRoZSBiYXNlIG9iamVjdAo+ ICsgKiBvZiB0aGUgZmVuY2VfY29sbGVjdGlvbiB0aGF0IGNvbnRhaW5zIGFsbCBmZW5jZXMgaW4g dGhlIHN5bmNfZmlsZQo+ICsgKiBvciBOVUxMIGluIGNhc2Ugb2YgZXJyb3IuCj4gKyAqLwo+ICtz dHJ1Y3QgZmVuY2UgKnN5bmNfZmlsZV9mZW5jZXNfZ2V0KGludCBmZCk7Cj4gICNlbmRpZiAvKiBf TElOVVhfU1lOQ19IICovCj4gLS0gCj4gMi41LjUKPiAKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3 YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752727AbcDOH4m (ORCPT ); Fri, 15 Apr 2016 03:56:42 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35380 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745AbcDOH4l (ORCPT ); Fri, 15 Apr 2016 03:56:41 -0400 Date: Fri, 15 Apr 2016 09:56:36 +0200 From: Daniel Vetter To: Gustavo Padovan Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Maarten Lankhorst , Gustavo Padovan Subject: Re: [RFC 2/8] dma-buf/sync_file: add sync_file_fences_get() Message-ID: <20160415075636.GP2510@phenom.ffwll.local> Mail-Followup-To: Gustavo Padovan , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Riley Andrews , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Maarten Lankhorst , Gustavo Padovan References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> <1460683781-22535-3-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460683781-22535-3-git-send-email-gustavo@padovan.org> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 14, 2016 at 06:29:35PM -0700, Gustavo Padovan wrote: > From: Gustavo Padovan > > Creates a function that given an sync file descriptor returns a > fence_collection containing all fences in the sync_file. > > If there is only one fence in the sync_file this fence itself is returned, > however if there is more than one, a fence_collection fence is returned. > > Signed-off-by: Gustavo Padovan > --- > drivers/dma-buf/sync_file.c | 37 +++++++++++++++++++++++++++++++++++++ > include/linux/sync_file.h | 10 ++++++++++ > 2 files changed, 47 insertions(+) > > diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c > index 4d2af24..926fafa 100644 > --- a/drivers/dma-buf/sync_file.c > +++ b/drivers/dma-buf/sync_file.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -122,6 +123,39 @@ void sync_file_install(struct sync_file *sync_file, int fd) > } > EXPORT_SYMBOL(sync_file_install); > > +struct fence *sync_file_fences_get(int fd) > +{ > + struct sync_file *sync_file; > + struct fence_collection *collection; > + int i; > + > + sync_file = sync_file_fdget(fd); > + if (!sync_file) > + return NULL; > + > + if (sync_file->num_fences == 1) { > + struct fence *fence = sync_file->cbs[0].fence; > + > + sync_file_put(sync_file); > + return fence; > + } > + > + collection = fence_collection_init(sync_file->num_fences); > + if (!collection) { > + sync_file_put(sync_file); > + return NULL; > + } > + > + for (i = 0 ; i < sync_file->num_fences ; i++) > + fence_collection_add(collection, sync_file->cbs[i].fence); > + > + sync_file->collection = collection; > + sync_file_put(sync_file); > + > + return &collection->base; > +} This function should probably acquire a reference for the returned fence for the caller. -Daniel > +EXPORT_SYMBOL(sync_file_fences_get); > + > static void sync_file_add_pt(struct sync_file *sync_file, int *i, > struct fence *fence) > { > @@ -200,6 +234,9 @@ static void sync_file_free(struct kref *kref) > kref); > int i; > > + if (sync_file->collection) > + fence_collection_put(sync_file->collection); > + > for (i = 0; i < sync_file->num_fences; ++i) { > fence_remove_callback(sync_file->cbs[i].fence, > &sync_file->cbs[i].cb); > diff --git a/include/linux/sync_file.h b/include/linux/sync_file.h > index 7b7a89d..2cb0486 100644 > --- a/include/linux/sync_file.h > +++ b/include/linux/sync_file.h > @@ -49,6 +49,7 @@ struct sync_file { > wait_queue_head_t wq; > atomic_t status; > > + struct fence_collection *collection; > struct sync_file_cb cbs[]; > }; > > @@ -103,4 +104,13 @@ void sync_file_put(struct sync_file *sync_file); > */ > void sync_file_install(struct sync_file *sync_file, int fd); > > +/** > + * sync_file_fences_get - get the fence related to the fd > + * @fd: file descriptor to look for a fence collection > + * > + * Ensures @fd references a valid sync_file and returns the base object > + * of the fence_collection that contains all fences in the sync_file > + * or NULL in case of error. > + */ > +struct fence *sync_file_fences_get(int fd); > #endif /* _LINUX_SYNC_H */ > -- > 2.5.5 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch