From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: Re: [PATCH] dma-buf/sync_file: only enable fence signalling during wait Date: Tue, 12 Jul 2016 10:43:59 -0300 Message-ID: <20160712134359.GD2565@joana> References: <1467992691-12442-1-git-send-email-gustavo@padovan.org> <183b15e0-3072-6aa2-7d35-002c20752e0e@linux.intel.com> <20160711202713.GC2565@joana> <58ef685f-0308-6828-6e21-ab5fd1302b84@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id F2CE26E43A for ; Tue, 12 Jul 2016 13:44:05 +0000 (UTC) Received: by mail-yw0-f193.google.com with SMTP id i12so875875ywa.0 for ; Tue, 12 Jul 2016 06:44:05 -0700 (PDT) Content-Disposition: inline In-Reply-To: <58ef685f-0308-6828-6e21-ab5fd1302b84@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maarten Lankhorst Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, m.chehab@samsung.com, Gustavo Padovan , John Harrison , laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org MjAxNi0wNy0xMiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50 ZWwuY29tPjoKCj4gT3AgMTEtMDctMTYgb20gMjI6Mjcgc2NocmVlZiBHdXN0YXZvIFBhZG92YW46 Cj4gPiAyMDE2LTA3LTEwIE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51 eC5pbnRlbC5jb20+Ogo+ID4KPiA+PiBPcCAwOC0wNy0xNiBvbSAxNzo0NCBzY2hyZWVmIEd1c3Rh dm8gUGFkb3ZhbjoKPiA+Pj4gRnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5A Y29sbGFib3JhLmNvLnVrPgo+ID4+Pgo+ID4+PiBTaWduYWxsaW5nIGRvZXNuJ3QgbmVlZCB0byBi ZSBlbmFibGVkIGF0IHN5bmNfZmlsZSBjcmVhdGlvbiwgaXQgaXMgb25seQo+ID4+PiByZXF1aXJl ZCBpZiB1c2Vyc3BhY2Ugd2FpdGluZyB0aGUgZmVuY2UgdG8gc2lnbmFsIHRocm91Z2ggcG9sbCgp Lgo+ID4+Pgo+ID4+PiBUaHVzIHdlIGRlbGF5IGZlbmNlX2FkZF9jYWxsYmFjaygpIHVudGlsIHBv bGwgaXMgY2FsbGVkLiBJdCBvbmx5IGFkZHMgdGhlCj4gPj4+IGNhbGxiYWNrIHRoZSBmaXJzdCB0 aW1lIHBvbGwoKSBpcyBjYWxsZWQuIFRoaXMgYXZvaWQgcmUtYWRkaW5nIHRoZSBzYW1lCj4gPj4+ IGNhbGxiYWNrIG11bHRpcGxlIHRpbWVzLgo+ID4+Pgo+ID4+PiB2MjogcmViYXNlIGFuZCB1cGRh dGUgdG8gd29yayB3aXRoIG5ldyBmZW5jZSBzdXBwb3J0IGZvciBzeW5jX2ZpbGUKPiA+Pj4KPiA+ Pj4gU2lnbmVkLW9mZi1ieTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFi b3JhLmNvLnVrPgo+ID4+PiAtLS0KPiA+Pj4gVGhpcyBwYXRjaCBhcHBsaWVzIG9uIHRvcCBvZiBt eSBsYXRlc3Qgc3luY19maWxlIGNoYW5nZXMgdG8gc3VwcG9ydAo+ID4+PiBmZW5jZV9hcnJheTog aHR0cHM6Ly9sa21sLm9yZy9sa21sLzIwMTYvNy80LzUzNAo+ID4+Pgo+ID4+PiAgZHJpdmVycy9k bWEtYnVmL3N5bmNfZmlsZS5jIHwgMjMgKysrKysrKysrKysrKystLS0tLS0tLS0KPiA+Pj4gIGlu Y2x1ZGUvbGludXgvc3luY19maWxlLmggICB8ICAyICsrCj4gPj4+ICAyIGZpbGVzIGNoYW5nZWQs IDE2IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCj4gPj4+Cj4gPj4+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2RtYS1idWYvc3luY19maWxlLmMgYi9kcml2ZXJzL2RtYS1idWYvc3luY19maWxl LmMKPiA+Pj4gaW5kZXggNjFhNjg3Yy4uMWRiNGE2NCAxMDA2NDQKPiA+Pj4gLS0tIGEvZHJpdmVy cy9kbWEtYnVmL3N5bmNfZmlsZS5jCj4gPj4+ICsrKyBiL2RyaXZlcnMvZG1hLWJ1Zi9zeW5jX2Zp bGUuYwo+ID4+PiBAQCAtODYsOCArODYsNiBAQCBzdHJ1Y3Qgc3luY19maWxlICpzeW5jX2ZpbGVf Y3JlYXRlKHN0cnVjdCBmZW5jZSAqZmVuY2UpCj4gPj4+ICAJCSBmZW5jZS0+b3BzLT5nZXRfdGlt ZWxpbmVfbmFtZShmZW5jZSksIGZlbmNlLT5jb250ZXh0LAo+ID4+PiAgCQkgZmVuY2UtPnNlcW5v KTsKPiA+Pj4gIAo+ID4+PiAtCWZlbmNlX2FkZF9jYWxsYmFjayhmZW5jZSwgJnN5bmNfZmlsZS0+ Y2IsIGZlbmNlX2NoZWNrX2NiX2Z1bmMpOwo+ID4+PiAtCj4gPj4+ICAJcmV0dXJuIHN5bmNfZmls ZTsKPiA+Pj4gIH0KPiA+Pj4gIEVYUE9SVF9TWU1CT0woc3luY19maWxlX2NyZWF0ZSk7Cj4gPj4+ IEBAIC0yNjksOSArMjY3LDYgQEAgc3RhdGljIHN0cnVjdCBzeW5jX2ZpbGUgKnN5bmNfZmlsZV9t ZXJnZShjb25zdCBjaGFyICpuYW1lLCBzdHJ1Y3Qgc3luY19maWxlICphLAo+ID4+PiAgCQlnb3Rv IGVycjsKPiA+Pj4gIAl9Cj4gPj4+ICAKPiA+Pj4gLQlmZW5jZV9hZGRfY2FsbGJhY2soc3luY19m aWxlLT5mZW5jZSwgJnN5bmNfZmlsZS0+Y2IsCj4gPj4+IC0JCQkgICBmZW5jZV9jaGVja19jYl9m dW5jKTsKPiA+Pj4gLQo+ID4+PiAgCXN0cmxjcHkoc3luY19maWxlLT5uYW1lLCBuYW1lLCBzaXpl b2Yoc3luY19maWxlLT5uYW1lKSk7Cj4gPj4+ICAJcmV0dXJuIHN5bmNfZmlsZTsKPiA+Pj4gIAo+ ID4+PiBAQCAtMjg2LDcgKzI4MSw2IEBAIHN0YXRpYyB2b2lkIHN5bmNfZmlsZV9mcmVlKHN0cnVj dCBrcmVmICprcmVmKQo+ID4+PiAgCXN0cnVjdCBzeW5jX2ZpbGUgKnN5bmNfZmlsZSA9IGNvbnRh aW5lcl9vZihrcmVmLCBzdHJ1Y3Qgc3luY19maWxlLAo+ID4+PiAgCQkJCQkJICAgICBrcmVmKTsK PiA+Pj4gIAo+ID4+PiAtCWZlbmNlX3JlbW92ZV9jYWxsYmFjayhzeW5jX2ZpbGUtPmZlbmNlLCAm c3luY19maWxlLT5jYik7Cj4gPj4+ICAJZmVuY2VfcHV0KHN5bmNfZmlsZS0+ZmVuY2UpOwo+ID4+ PiAgCWtmcmVlKHN5bmNfZmlsZSk7Cj4gPj4+ICB9Cj4gPj4+IEBAIC0zMDYsMTMgKzMwMCwyNCBA QCBzdGF0aWMgdW5zaWduZWQgaW50IHN5bmNfZmlsZV9wb2xsKHN0cnVjdCBmaWxlICpmaWxlLCBw b2xsX3RhYmxlICp3YWl0KQo+ID4+PiAgCj4gPj4+ICAJcG9sbF93YWl0KGZpbGUsICZzeW5jX2Zp bGUtPndxLCB3YWl0KTsKPiA+Pj4gIAo+ID4+PiArCWlmICghc3luY19maWxlLT5lbmFibGVkKSB7 Cj4gPj4+ICsJCWZlbmNlX2FkZF9jYWxsYmFjayhzeW5jX2ZpbGUtPmZlbmNlLCAmc3luY19maWxl LT5jYiwKPiA+Pj4gKwkJCQkgICBmZW5jZV9jaGVja19jYl9mdW5jKTsKPiA+Pj4gKwkJc3luY19m aWxlLT5lbmFibGVkID0gdHJ1ZTsKPiA+Pj4gKwl9Cj4gPj4gV29uJ3QgdGhpcyBibG93IHVwIGNv bXBsZXRlbHkgd2l0aCAyIHRocmVhZHMgcG9sbGluZyBhdCB0aGUgc2FtZSB0aW1lPwo+ID4gSW5k ZWVkLCB1c2luZyBhdG9taWMgb3BlcmF0aW9ucyBvbiBlbmFibGVkIHNob3VsZCBmaXggdGhpcy4K PiBObywgaXQgc3RpbGwgd291bGQgYmxvdyB1cCB3aXRob3V0IGxvY2tpbmcgYXJvdW5kIGZlbmNl X3JlbW92ZS9hZGRfY2FsbGJhY2sgdG9vLi4KPiAKPiBQZXJzb25hbGx5IEkgd291bGQganVzdCBh ZGQgdGhlIGNhbGxiYWNrIG9uY2UsIHRoZW4gcmVtb3ZlIGl0IGluIGRlc3RydWN0b3IuCj4gCj4g U29tZXRoaW5nIGxpa2U6Cj4gCj4gcG9sbDoKPiBpZiAoIWF0b21pY194Y2hnKCZzeW5jX2ZpbGUt PmVuYWJsZWQsIDEpKSB7Cj4gaWYgKGZlbmNlX2FkZF9jYWxsYmFjayguLi4pIDwgMCkKPiB3YWtl IHVwIHN5bmNfZmlsZS0+d3EsIGZlbmNlIGlzIHNpZ25hbGVkCj4gfQo+IAo+IHN5bmNfZmlsZV9m cmVlOgo+IGlmIChhdG9taWNfcmVhZCgmc3luY19maWxlLT5lbmFibGVkKSkKPiBmZW5jZV9yZW1v dmVfY2FsbGJhY2soLi4uKTsKPiAKPiBmZW5jZV9wdXQoKQo+IAo+IEl0J3Mgbm90IGxpa2UgZmVu Y2UgY2FuIGRpc2FibGUgaHcgc2lnbmFsaW5nIHdoZW4gYWxsIGNhbGxiYWNrcyBhcmUgcmVtb3Zl ZCBhbnl3YXksCj4gaXQncyBoYXJtbGVzcyB0byBrZWVwIGl0IG9uIHRoZSBsaXN0LgoKTW92ZSB0 aGUgY2FsbGJhY2sgcmVtb3ZhbCB0byBzeW5jX2ZpbGVfZnJlZSgpIHNlZW1zIGEgZ29vZCBpZGVh IHRvIG1lLgpJJ2xsIHJld29yayB0aGlzIHBhdGNoIHRha2luZyBpbiBhY2NvdW50IHlvdXIgc3Vn Z2VzdGlvbnMgYW5kIHJlc2VuZCBpdC4KCglHdXN0YXZvCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751674AbcGLNoM (ORCPT ); Tue, 12 Jul 2016 09:44:12 -0400 Received: from mail-yw0-f195.google.com ([209.85.161.195]:33729 "EHLO mail-yw0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbcGLNoL (ORCPT ); Tue, 12 Jul 2016 09:44:11 -0400 Date: Tue, 12 Jul 2016 10:43:59 -0300 From: Gustavo Padovan To: Maarten Lankhorst Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Sumit Semwal , Gustavo Padovan Subject: Re: [PATCH] dma-buf/sync_file: only enable fence signalling during wait Message-ID: <20160712134359.GD2565@joana> Mail-Followup-To: Gustavo Padovan , Maarten Lankhorst , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Sumit Semwal , Gustavo Padovan References: <1467992691-12442-1-git-send-email-gustavo@padovan.org> <183b15e0-3072-6aa2-7d35-002c20752e0e@linux.intel.com> <20160711202713.GC2565@joana> <58ef685f-0308-6828-6e21-ab5fd1302b84@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <58ef685f-0308-6828-6e21-ab5fd1302b84@linux.intel.com> User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2016-07-12 Maarten Lankhorst : > Op 11-07-16 om 22:27 schreef Gustavo Padovan: > > 2016-07-10 Maarten Lankhorst : > > > >> Op 08-07-16 om 17:44 schreef Gustavo Padovan: > >>> From: Gustavo Padovan > >>> > >>> Signalling doesn't need to be enabled at sync_file creation, it is only > >>> required if userspace waiting the fence to signal through poll(). > >>> > >>> Thus we delay fence_add_callback() until poll is called. It only adds the > >>> callback the first time poll() is called. This avoid re-adding the same > >>> callback multiple times. > >>> > >>> v2: rebase and update to work with new fence support for sync_file > >>> > >>> Signed-off-by: Gustavo Padovan > >>> --- > >>> This patch applies on top of my latest sync_file changes to support > >>> fence_array: https://lkml.org/lkml/2016/7/4/534 > >>> > >>> drivers/dma-buf/sync_file.c | 23 ++++++++++++++--------- > >>> include/linux/sync_file.h | 2 ++ > >>> 2 files changed, 16 insertions(+), 9 deletions(-) > >>> > >>> diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c > >>> index 61a687c..1db4a64 100644 > >>> --- a/drivers/dma-buf/sync_file.c > >>> +++ b/drivers/dma-buf/sync_file.c > >>> @@ -86,8 +86,6 @@ struct sync_file *sync_file_create(struct fence *fence) > >>> fence->ops->get_timeline_name(fence), fence->context, > >>> fence->seqno); > >>> > >>> - fence_add_callback(fence, &sync_file->cb, fence_check_cb_func); > >>> - > >>> return sync_file; > >>> } > >>> EXPORT_SYMBOL(sync_file_create); > >>> @@ -269,9 +267,6 @@ static struct sync_file *sync_file_merge(const char *name, struct sync_file *a, > >>> goto err; > >>> } > >>> > >>> - fence_add_callback(sync_file->fence, &sync_file->cb, > >>> - fence_check_cb_func); > >>> - > >>> strlcpy(sync_file->name, name, sizeof(sync_file->name)); > >>> return sync_file; > >>> > >>> @@ -286,7 +281,6 @@ static void sync_file_free(struct kref *kref) > >>> struct sync_file *sync_file = container_of(kref, struct sync_file, > >>> kref); > >>> > >>> - fence_remove_callback(sync_file->fence, &sync_file->cb); > >>> fence_put(sync_file->fence); > >>> kfree(sync_file); > >>> } > >>> @@ -306,13 +300,24 @@ static unsigned int sync_file_poll(struct file *file, poll_table *wait) > >>> > >>> poll_wait(file, &sync_file->wq, wait); > >>> > >>> + if (!sync_file->enabled) { > >>> + fence_add_callback(sync_file->fence, &sync_file->cb, > >>> + fence_check_cb_func); > >>> + sync_file->enabled = true; > >>> + } > >> Won't this blow up completely with 2 threads polling at the same time? > > Indeed, using atomic operations on enabled should fix this. > No, it still would blow up without locking around fence_remove/add_callback too.. > > Personally I would just add the callback once, then remove it in destructor. > > Something like: > > poll: > if (!atomic_xchg(&sync_file->enabled, 1)) { > if (fence_add_callback(...) < 0) > wake up sync_file->wq, fence is signaled > } > > sync_file_free: > if (atomic_read(&sync_file->enabled)) > fence_remove_callback(...); > > fence_put() > > It's not like fence can disable hw signaling when all callbacks are removed anyway, > it's harmless to keep it on the list. Move the callback removal to sync_file_free() seems a good idea to me. I'll rework this patch taking in account your suggestions and resend it. Gustavo