From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH 2/7] staging/android: display sync_pt name on debugfs Date: Tue, 9 Aug 2016 12:04:49 +0200 Message-ID: <93e2abc0-e3a6-a722-bb2a-d3e0f88abb2b@linux.intel.com> References: <1466437993-21573-1-git-send-email-gustavo@padovan.org> <1466437993-21573-3-git-send-email-gustavo@padovan.org> <20160808195918.GO2484@joana> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id CB5856E249 for ; Tue, 9 Aug 2016 10:04:53 +0000 (UTC) In-Reply-To: <20160808195918.GO2484@joana> 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: devel@driverdev.osuosl.org, Daniel Stone , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , =?UTF-8?Q?Arve_Hj=c3=b8nnev=c3=a5g?= , Greg Kroah-Hartman , Riley Andrews , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org T3AgMDgtMDgtMTYgb20gMjE6NTkgc2NocmVlZiBHdXN0YXZvIFBhZG92YW46Cj4gMjAxNi0wOC0w OCBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPjoK Pgo+PiBPcCAyMC0wNi0xNiBvbSAxNzo1MyBzY2hyZWVmIEd1c3Rhdm8gUGFkb3ZhbjoKPj4+IEZy b206IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5jby51az4KPj4+ Cj4+PiBXaGVuIGNyZWF0aW5nIGEgc3luY19wdCB0aGUgbmFtZSByZWNlaXZlZCB3YXNuJ3QgdXNl ZCBhbnl3aGVyZS4KPj4+IE5vdyB3ZSBhZGQgaXQgdG8gdGhlIHN5bmMgaW5mbyBkZWJ1ZyBvdXRw dXQgdG8gbWFrZSBpdCBlYXNpZXIgdG8gaW5kZXRpZnkKPj4+IHRoZSB1c2Vyc3BhY2UgbmFtZSBv ZiB0aGF0IHN5bmMgcHQuCj4+Pgo+Pj4gU2lnbmVkLW9mZi1ieTogR3VzdGF2byBQYWRvdmFuIDxn dXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgo+Pj4gLS0tCj4+PiAgZHJpdmVycy9zdGFn aW5nL2FuZHJvaWQvc3dfc3luYy5jICAgIHwgMTYgKysrKy0tLS0tLS0tLS0tLQo+Pj4gIGRyaXZl cnMvc3RhZ2luZy9hbmRyb2lkL3N5bmNfZGVidWcuYyB8ICA1ICsrKy0tCj4+PiAgZHJpdmVycy9z dGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1Zy5oIHwgIDkgKysrKysrKysrCj4+PiAgMyBmaWxlcyBj aGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKPj4+Cj4+PiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3luYy5jIGIvZHJpdmVycy9zdGFnaW5n L2FuZHJvaWQvc3dfc3luYy5jCj4+PiBpbmRleCBiNGFlMDkyLi5lYTI3NTEyIDEwMDY0NAo+Pj4g LS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3luYy5jCj4+PiArKysgYi9kcml2ZXJz L3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMKPj4+IEBAIC0zNywxNSArMzcsNiBAQCBzdHJ1Y3Qg c3dfc3luY19jcmVhdGVfZmVuY2VfZGF0YSB7Cj4+PiAgCQlzdHJ1Y3Qgc3dfc3luY19jcmVhdGVf ZmVuY2VfZGF0YSkKPj4+ICAjZGVmaW5lIFNXX1NZTkNfSU9DX0lOQwkJCV9JT1coU1dfU1lOQ19J T0NfTUFHSUMsIDEsIF9fdTMyKQo+Pj4gIAo+Pj4gLXN0YXRpYyBjb25zdCBzdHJ1Y3QgZmVuY2Vf b3BzIHRpbWVsaW5lX2ZlbmNlX29wczsKPj4+IC0KPj4+IC1zdGF0aWMgaW5saW5lIHN0cnVjdCBz eW5jX3B0ICpmZW5jZV90b19zeW5jX3B0KHN0cnVjdCBmZW5jZSAqZmVuY2UpCj4+PiAtewo+Pj4g LQlpZiAoZmVuY2UtPm9wcyAhPSAmdGltZWxpbmVfZmVuY2Vfb3BzKQo+Pj4gLQkJcmV0dXJuIE5V TEw7Cj4+PiAtCXJldHVybiBjb250YWluZXJfb2YoZmVuY2UsIHN0cnVjdCBzeW5jX3B0LCBiYXNl KTsKPj4+IC19Cj4+PiAtCj4+PiAgc3RydWN0IHN5bmNfdGltZWxpbmUgKnN5bmNfdGltZWxpbmVf Y3JlYXRlKGNvbnN0IGNoYXIgKm5hbWUpCj4+PiAgewo+Pj4gIAlzdHJ1Y3Qgc3luY190aW1lbGlu ZSAqb2JqOwo+Pj4gQEAgLTEwOCw3ICs5OSw3IEBAIHN0YXRpYyB2b2lkIHN5bmNfdGltZWxpbmVf c2lnbmFsKHN0cnVjdCBzeW5jX3RpbWVsaW5lICpvYmosIHVuc2lnbmVkIGludCBpbmMpCj4+PiAg fQo+Pj4gIAo+Pj4gIHN0YXRpYyBzdHJ1Y3Qgc3luY19wdCAqc3luY19wdF9jcmVhdGUoc3RydWN0 IHN5bmNfdGltZWxpbmUgKm9iaiwgaW50IHNpemUsCj4+PiAtCQkJICAgICB1bnNpZ25lZCBpbnQg dmFsdWUpCj4+PiArCQkJICAgICB1bnNpZ25lZCBpbnQgdmFsdWUsIGNoYXIgKm5hbWUpCj4+PiAg ewo+Pj4gIAl1bnNpZ25lZCBsb25nIGZsYWdzOwo+Pj4gIAlzdHJ1Y3Qgc3luY19wdCAqcHQ7Cj4+ PiBAQCAtMTIwLDYgKzExMSw3IEBAIHN0YXRpYyBzdHJ1Y3Qgc3luY19wdCAqc3luY19wdF9jcmVh dGUoc3RydWN0IHN5bmNfdGltZWxpbmUgKm9iaiwgaW50IHNpemUsCj4+PiAgCWlmICghcHQpCj4+ PiAgCQlyZXR1cm4gTlVMTDsKPj4+ICAKPj4+ICsJc3RybGNweShwdC0+bmFtZSwgbmFtZSwgc2l6 ZW9mKHB0LT5uYW1lKSk7Cj4+PiAgCXNwaW5fbG9ja19pcnFzYXZlKCZvYmotPmNoaWxkX2xpc3Rf bG9jaywgZmxhZ3MpOwo+Pj4gIAlzeW5jX3RpbWVsaW5lX2dldChvYmopOwo+Pj4gIAlmZW5jZV9p bml0KCZwdC0+YmFzZSwgJnRpbWVsaW5lX2ZlbmNlX29wcywgJm9iai0+Y2hpbGRfbGlzdF9sb2Nr LAo+Pj4gQEAgLTE5MSw3ICsxODMsNyBAQCBzdGF0aWMgdm9pZCB0aW1lbGluZV9mZW5jZV90aW1l bGluZV92YWx1ZV9zdHIoc3RydWN0IGZlbmNlICpmZW5jZSwKPj4+ICAJc25wcmludGYoc3RyLCBz aXplLCAiJWQiLCBwYXJlbnQtPnZhbHVlKTsKPj4+ICB9Cj4+PiAgCj4+PiAtc3RhdGljIGNvbnN0 IHN0cnVjdCBmZW5jZV9vcHMgdGltZWxpbmVfZmVuY2Vfb3BzID0gewo+Pj4gK2NvbnN0IHN0cnVj dCBmZW5jZV9vcHMgdGltZWxpbmVfZmVuY2Vfb3BzID0gewo+Pj4gIAkuZ2V0X2RyaXZlcl9uYW1l ID0gdGltZWxpbmVfZmVuY2VfZ2V0X2RyaXZlcl9uYW1lLAo+Pj4gIAkuZ2V0X3RpbWVsaW5lX25h bWUgPSB0aW1lbGluZV9mZW5jZV9nZXRfdGltZWxpbmVfbmFtZSwKPj4+ICAJLmVuYWJsZV9zaWdu YWxpbmcgPSB0aW1lbGluZV9mZW5jZV9lbmFibGVfc2lnbmFsaW5nLAo+Pj4gQEAgLTI1Miw3ICsy NDQsNyBAQCBzdGF0aWMgbG9uZyBzd19zeW5jX2lvY3RsX2NyZWF0ZV9mZW5jZShzdHJ1Y3Qgc3lu Y190aW1lbGluZSAqb2JqLAo+Pj4gIAkJZ290byBlcnI7Cj4+PiAgCX0KPj4+ICAKPj4+IC0JcHQg PSBzeW5jX3B0X2NyZWF0ZShvYmosIHNpemVvZigqcHQpLCBkYXRhLnZhbHVlKTsKPj4+ICsJcHQg PSBzeW5jX3B0X2NyZWF0ZShvYmosIHNpemVvZigqcHQpLCBkYXRhLnZhbHVlLCBkYXRhLm5hbWUp Owo+Pj4gIAlpZiAoIXB0KSB7Cj4+PiAgCQllcnIgPSAtRU5PTUVNOwo+Pj4gIAkJZ290byBlcnI7 Cj4+PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1Zy5jIGIv ZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1Zy5jCj4+PiBpbmRleCA0YzVhODU1Li5i NzMyZWEzIDEwMDY0NAo+Pj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY19kZWJ1 Zy5jCj4+PiArKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jX2RlYnVnLmMKPj4+IEBA IC03NSwxMyArNzUsMTQgQEAgc3RhdGljIHZvaWQgc3luY19wcmludF9mZW5jZShzdHJ1Y3Qgc2Vx X2ZpbGUgKnMsIHN0cnVjdCBmZW5jZSAqZmVuY2UsIGJvb2wgc2hvdykKPj4+ICB7Cj4+PiAgCWlu dCBzdGF0dXMgPSAxOwo+Pj4gIAlzdHJ1Y3Qgc3luY190aW1lbGluZSAqcGFyZW50ID0gZmVuY2Vf cGFyZW50KGZlbmNlKTsKPj4+ICsJc3RydWN0IHN5bmNfcHQgKnB0ID0gZmVuY2VfdG9fc3luY19w dChmZW5jZSk7Cj4+PiAgCj4+PiAgCWlmIChmZW5jZV9pc19zaWduYWxlZF9sb2NrZWQoZmVuY2Up KQo+Pj4gIAkJc3RhdHVzID0gZmVuY2UtPnN0YXR1czsKPj4+ICAKPj4+IC0Jc2VxX3ByaW50Zihz LCAiICAlcyVzZmVuY2UgJXMiLAo+Pj4gKwlzZXFfcHJpbnRmKHMsICIgICVzJXNmZW5jZSAlcyAl cyIsCj4+PiAgCQkgICBzaG93ID8gcGFyZW50LT5uYW1lIDogIiIsCj4+PiAtCQkgICBzaG93ID8g Il8iIDogIiIsCj4+PiArCQkgICBzaG93ID8gIl8iIDogIiIsIHB0LT5uYW1lLAo+Pj4gIAkJICAg c3luY19zdGF0dXNfc3RyKHN0YXR1cykpOwo+Pj4gIAo+PiBOQUssCj4+IEEgZmVuY2UgaW4gc3lu Y19wcmludF9mZW5jZSBjYW4gYmUgb2YgYW55IHR5cGUuIElmIHlvdSB3YW50IHRvIHByaW50IHRo ZSBuYW1lLCB1c2UgdGhlIGZlbmNlX3ZhbHVlX3N0ciBjYWxsYmFjay4KPiBJbmRlZWQuIEJ1dCBm ZW5jZV92YWx1ZV9zdHIgZG9lc24ndCByZXR1cm4gdGhlIHN5bmNfcHQgbmFtZSwgYnV0IHRoZQo+ IHNlcW5vIG9mIHRoYXQgZmVuY2UuIEknbGwga2VlcCB0aGlzIGNoYW5nZSBvdXQgZm9yIHRoZSBk ZS1zdGFnaW5nIGFuZAo+IHRoZW4gdHJ5IHRvIGNvbWUgd2l0aCBzb21ldGhpbmcgdGhhdCB3b3Jr cyBiZXR0ZXIuCj4KPiAJR3VzdGF2bwoKVGhpcyB3aWxsIHByb2JhYmx5IGNhdXNlIGEga2VybmVs IHBhbmljIGlmIHlvdSBrZWVwIGl0IGxpa2UgaXQgaXMgYW5kIHlvdSBsb29rIGF0CmRlYnVnZnMg Zm9yIG5vbiBzeW5jX3B0IGZlbmNlcywgaXQgc2hvdWxkIGRlZmluaXRlbHkgYmUgZml4ZWQgYmVm b3JlIGRlc3RhZ2luZy4KSWdub3Jpbmcgc3luY19wdCBuYW1lIHdvdWxkIGJlIGJldHRlciB0aGFu IGNyYXNoaW5nLgoKfk1hYXJ0ZW4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932297AbcHIKE5 (ORCPT ); Tue, 9 Aug 2016 06:04:57 -0400 Received: from mga04.intel.com ([192.55.52.120]:27132 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932150AbcHIKEz (ORCPT ); Tue, 9 Aug 2016 06:04:55 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,494,1464678000"; d="scan'208";a="1037807319" Subject: Re: [PATCH 2/7] staging/android: display sync_pt name on debugfs To: Gustavo Padovan References: <1466437993-21573-1-git-send-email-gustavo@padovan.org> <1466437993-21573-3-git-send-email-gustavo@padovan.org> <20160808195918.GO2484@joana> Cc: Gustavo Padovan , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, Daniel Stone , =?UTF-8?Q?Arve_Hj=c3=b8nnev=c3=a5g?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , Sumit Semwal , Gustavo Padovan From: Maarten Lankhorst Message-ID: <93e2abc0-e3a6-a722-bb2a-d3e0f88abb2b@linux.intel.com> Date: Tue, 9 Aug 2016 12:04:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 MIME-Version: 1.0 In-Reply-To: <20160808195918.GO2484@joana> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Op 08-08-16 om 21:59 schreef Gustavo Padovan: > 2016-08-08 Maarten Lankhorst : > >> Op 20-06-16 om 17:53 schreef Gustavo Padovan: >>> From: Gustavo Padovan >>> >>> When creating a sync_pt the name received wasn't used anywhere. >>> Now we add it to the sync info debug output to make it easier to indetify >>> the userspace name of that sync pt. >>> >>> Signed-off-by: Gustavo Padovan >>> --- >>> drivers/staging/android/sw_sync.c | 16 ++++------------ >>> drivers/staging/android/sync_debug.c | 5 +++-- >>> drivers/staging/android/sync_debug.h | 9 +++++++++ >>> 3 files changed, 16 insertions(+), 14 deletions(-) >>> >>> diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c >>> index b4ae092..ea27512 100644 >>> --- a/drivers/staging/android/sw_sync.c >>> +++ b/drivers/staging/android/sw_sync.c >>> @@ -37,15 +37,6 @@ struct sw_sync_create_fence_data { >>> struct sw_sync_create_fence_data) >>> #define SW_SYNC_IOC_INC _IOW(SW_SYNC_IOC_MAGIC, 1, __u32) >>> >>> -static const struct fence_ops timeline_fence_ops; >>> - >>> -static inline struct sync_pt *fence_to_sync_pt(struct fence *fence) >>> -{ >>> - if (fence->ops != &timeline_fence_ops) >>> - return NULL; >>> - return container_of(fence, struct sync_pt, base); >>> -} >>> - >>> struct sync_timeline *sync_timeline_create(const char *name) >>> { >>> struct sync_timeline *obj; >>> @@ -108,7 +99,7 @@ static void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc) >>> } >>> >>> static struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size, >>> - unsigned int value) >>> + unsigned int value, char *name) >>> { >>> unsigned long flags; >>> struct sync_pt *pt; >>> @@ -120,6 +111,7 @@ static struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size, >>> if (!pt) >>> return NULL; >>> >>> + strlcpy(pt->name, name, sizeof(pt->name)); >>> spin_lock_irqsave(&obj->child_list_lock, flags); >>> sync_timeline_get(obj); >>> fence_init(&pt->base, &timeline_fence_ops, &obj->child_list_lock, >>> @@ -191,7 +183,7 @@ static void timeline_fence_timeline_value_str(struct fence *fence, >>> snprintf(str, size, "%d", parent->value); >>> } >>> >>> -static const struct fence_ops timeline_fence_ops = { >>> +const struct fence_ops timeline_fence_ops = { >>> .get_driver_name = timeline_fence_get_driver_name, >>> .get_timeline_name = timeline_fence_get_timeline_name, >>> .enable_signaling = timeline_fence_enable_signaling, >>> @@ -252,7 +244,7 @@ static long sw_sync_ioctl_create_fence(struct sync_timeline *obj, >>> goto err; >>> } >>> >>> - pt = sync_pt_create(obj, sizeof(*pt), data.value); >>> + pt = sync_pt_create(obj, sizeof(*pt), data.value, data.name); >>> if (!pt) { >>> err = -ENOMEM; >>> goto err; >>> diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c >>> index 4c5a855..b732ea3 100644 >>> --- a/drivers/staging/android/sync_debug.c >>> +++ b/drivers/staging/android/sync_debug.c >>> @@ -75,13 +75,14 @@ static void sync_print_fence(struct seq_file *s, struct fence *fence, bool show) >>> { >>> int status = 1; >>> struct sync_timeline *parent = fence_parent(fence); >>> + struct sync_pt *pt = fence_to_sync_pt(fence); >>> >>> if (fence_is_signaled_locked(fence)) >>> status = fence->status; >>> >>> - seq_printf(s, " %s%sfence %s", >>> + seq_printf(s, " %s%sfence %s %s", >>> show ? parent->name : "", >>> - show ? "_" : "", >>> + show ? "_" : "", pt->name, >>> sync_status_str(status)); >>> >> NAK, >> A fence in sync_print_fence can be of any type. If you want to print the name, use the fence_value_str callback. > Indeed. But fence_value_str doesn't return the sync_pt name, but the > seqno of that fence. I'll keep this change out for the de-staging and > then try to come with something that works better. > > Gustavo This will probably cause a kernel panic if you keep it like it is and you look at debugfs for non sync_pt fences, it should definitely be fixed before destaging. Ignoring sync_pt name would be better than crashing. ~Maarten