From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH 06/10] staging/android: turn fence_info into a __64 pointer Date: Mon, 1 Feb 2016 09:41:39 +0100 Message-ID: <56AF1A43.5010900@linux.intel.com> References: <1454102426-20637-1-git-send-email-gustavo@padovan.org> <1454102426-20637-7-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id E07036E2D1 for ; Mon, 1 Feb 2016 00:41:42 -0800 (PST) In-Reply-To: <1454102426-20637-7-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 , Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?Q?Arve_Hj=c3=b8nnev=c3=a5g?= , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org T3AgMjktMDEtMTYgb20gMjI6MjAgc2NocmVlZiBHdXN0YXZvIFBhZG92YW46Cj4gRnJvbTogR3Vz dGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgo+Cj4gTWFraW5n IGZlbmNlX2luZm8gYSBwb2ludGVyIGVuYWJsZXMgdXMgdG8gZXh0ZW5kIHRoZSBzdHJ1Y3QgaW4g dGhlIGZ1dHVyZQo+IHdpdGhvdXQgYnJlYWtpbmcgdGhlIEFCSS4KPgo+IFNpZ25lZC1vZmYtYnk6 IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5jby51az4KPiAtLS0K PiAgZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jICAgICAgfCAyICstCj4gIGRyaXZlcnMv c3RhZ2luZy9hbmRyb2lkL3VhcGkvc3luYy5oIHwgMiArLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDIg aW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3N0 YWdpbmcvYW5kcm9pZC9zeW5jLmMgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jLmMKPiBp bmRleCBmNzUzMGYwLi41MWQ0ZjQ3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRy b2lkL3N5bmMuYwo+ICsrKyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYwo+IEBAIC01 MjUsNyArNTI1LDcgQEAgc3RhdGljIGxvbmcgc3luY19maWxlX2lvY3RsX2ZlbmNlX2luZm8oc3Ry dWN0IHN5bmNfZmlsZSAqc3luY19maWxlLAo+ICAJaWYgKGluZm8tPnN0YXR1cyA+PSAwKQo+ICAJ CWluZm8tPnN0YXR1cyA9ICFpbmZvLT5zdGF0dXM7Cj4gIAo+IC0JbGVuID0gc2l6ZW9mKHN0cnVj dCBzeW5jX2ZpbGVfaW5mbyk7Cj4gKwlsZW4gPSBzaXplb2Yoc3RydWN0IHN5bmNfZmlsZV9pbmZv KSAtIHNpemVvZihfX3U2NCAqKTsKPiAgCj4gIAlmb3IgKGkgPSAwOyBpIDwgc3luY19maWxlLT5u dW1fZmVuY2VzOyArK2kpIHsKPiAgCQlzdHJ1Y3QgZmVuY2UgKmZlbmNlID0gc3luY19maWxlLT5j YnNbaV0uZmVuY2U7Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3VhcGkv c3luYy5oIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvdWFwaS9zeW5jLmgKPiBpbmRleCBlZDI4 MWZjLi45ZjA3YWE3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3VhcGkv c3luYy5oCj4gKysrIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvdWFwaS9zeW5jLmgKPiBAQCAt NTQsNyArNTQsNyBAQCBzdHJ1Y3Qgc3luY19maWxlX2luZm8gewo+ICAJY2hhcgluYW1lWzMyXTsK PiAgCV9fczMyCXN0YXR1czsKPiAgCj4gLQlfX3U4CWZlbmNlX2luZm9bMF07Cj4gKwlfX3U2NAkq ZmVuY2VfaW5mbzsKPiAgfTsKPgpQb2ludGVycyBhcmUgYXdmdWwsIGl0IHNob3VsZCBiZSBhIF9f dTY0IHNpbmNlIGl0J3MgYSBwb2ludGVyIHR5cGUuIFVzZXJzcGFjZSBzaG91bGQgY2FzdCBpdCB0 byBhIHVpbnRwdHJfdCBpbiB1c2Vyc3BhY2UuClRoaXMgc3RydWN0dXJlIGFsc28gd29uJ3Qgd29y ayBvbiA2NC1iaXRzIHN5c3RlbXMsIHRoZXJlIG1heSBiZSBhIGhvbGUgYmV0d2VlbiBmZW5jZV9p bmZvIGFuZCBzdGF0dXMgKG9yIG51bV9mZW5jZXMgaW4gbmV4dCBwYXRjaCkuCgpJdCdzIHByb2Jh Ymx5IGJlc3QgdG8gbW92ZSBpdCB0byB0aGUgdG9wIGFuZCBlbnN1cmUgdGhlIHN0cnVjdCBpcyA2 NC1iaXRzIGFsaWduZWQuCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752463AbcBAIlo (ORCPT ); Mon, 1 Feb 2016 03:41:44 -0500 Received: from mga04.intel.com ([192.55.52.120]:37128 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751853AbcBAIln (ORCPT ); Mon, 1 Feb 2016 03:41:43 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,379,1449561600"; d="scan'208";a="893620609" Subject: Re: [PATCH 06/10] staging/android: turn fence_info into a __64 pointer To: Gustavo Padovan , Greg Kroah-Hartman References: <1454102426-20637-1-git-send-email-gustavo@padovan.org> <1454102426-20637-7-git-send-email-gustavo@padovan.org> Cc: 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 , Gustavo Padovan From: Maarten Lankhorst Message-ID: <56AF1A43.5010900@linux.intel.com> Date: Mon, 1 Feb 2016 09:41:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <1454102426-20637-7-git-send-email-gustavo@padovan.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Op 29-01-16 om 22:20 schreef Gustavo Padovan: > From: Gustavo Padovan > > Making fence_info a pointer enables us to extend the struct in the future > without breaking the ABI. > > Signed-off-by: Gustavo Padovan > --- > drivers/staging/android/sync.c | 2 +- > drivers/staging/android/uapi/sync.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c > index f7530f0..51d4f47 100644 > --- a/drivers/staging/android/sync.c > +++ b/drivers/staging/android/sync.c > @@ -525,7 +525,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, > if (info->status >= 0) > info->status = !info->status; > > - len = sizeof(struct sync_file_info); > + len = sizeof(struct sync_file_info) - sizeof(__u64 *); > > for (i = 0; i < sync_file->num_fences; ++i) { > struct fence *fence = sync_file->cbs[i].fence; > diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h > index ed281fc..9f07aa7 100644 > --- a/drivers/staging/android/uapi/sync.h > +++ b/drivers/staging/android/uapi/sync.h > @@ -54,7 +54,7 @@ struct sync_file_info { > char name[32]; > __s32 status; > > - __u8 fence_info[0]; > + __u64 *fence_info; > }; > Pointers are awful, it should be a __u64 since it's a pointer type. Userspace should cast it to a uintptr_t in userspace. This structure also won't work on 64-bits systems, there may be a hole between fence_info and status (or num_fences in next patch). It's probably best to move it to the top and ensure the struct is 64-bits aligned.