From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: Re: [PATCH v3 06/11] staging/android: turn fence_info into a __u64 pointer Date: Wed, 3 Feb 2016 15:39:22 +0100 Message-ID: <56B2111A.8080103@linux.intel.com> References: <1454505940-18094-1-git-send-email-gustavo@padovan.org> <1454505940-18094-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 305E96E735 for ; Wed, 3 Feb 2016 06:39:26 -0800 (PST) In-Reply-To: <1454505940-18094-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 T3AgMDMtMDItMTYgb20gMTQ6MjUgc2NocmVlZiBHdXN0YXZvIFBhZG92YW46Cj4gRnJvbTogR3Vz dGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgo+Cj4gVHVybiBz eW5jX2ZlbmNlX2luZm8gaW50byBfX3U2NCB0eXBlIGVuYWJsZSB1cyB0byBleHRlbmQgdGhlIHN0 cnVjdCBpbiB0aGUKPiBmdXR1cmUgd2l0aG91dCBicmVha2luZyB0aGUgQUJJLgo+Cj4gdjI6IHVz ZSB0eXBlIF9fdTY0IGZvciBmZW5jZV9pbmZvCj4KPiB2MzogZml4IGNvbW1pdCBtZXNzYWdlIHRv IHJlZmxlY3QgdGhlIHYyIGNoYW5nZQo+Cj4gU2lnbmVkLW9mZi1ieTogR3VzdGF2byBQYWRvdmFu IDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgo+IC0tLQo+ICBkcml2ZXJzL3N0YWdp bmcvYW5kcm9pZC9zeW5jLmMgICAgICB8IDIgKy0KPiAgZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv dWFwaS9zeW5jLmggfCAyICstCj4gIDIgZmlsZXMgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAy IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5 bmMuYyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmMuYwo+IGluZGV4IDJhYjBjMjAuLjg0 MjU0NTcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCj4gKysr IGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQvc3luYy5jCj4gQEAgLTUyNSw3ICs1MjUsNyBAQCBz dGF0aWMgbG9uZyBzeW5jX2ZpbGVfaW9jdGxfZmVuY2VfaW5mbyhzdHJ1Y3Qgc3luY19maWxlICpz eW5jX2ZpbGUsCj4gIAlpZiAoaW5mby0+c3RhdHVzID49IDApCj4gIAkJaW5mby0+c3RhdHVzID0g IWluZm8tPnN0YXR1czsKPiAgCj4gLQlsZW4gPSBzaXplb2Yoc3RydWN0IHN5bmNfZmlsZV9pbmZv KTsKPiArCWxlbiA9IHNpemVvZihzdHJ1Y3Qgc3luY19maWxlX2luZm8pIC0gc2l6ZW9mKF9fdTY0 KTsKPiAgCj4gIAlmb3IgKGkgPSAwOyBpIDwgc3luY19maWxlLT5udW1fZmVuY2VzOyArK2kpIHsK PiAgCQlzdHJ1Y3QgZmVuY2UgKmZlbmNlID0gc3luY19maWxlLT5jYnNbaV0uZmVuY2U7Cj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3VhcGkvc3luYy5oIGIvZHJpdmVycy9z dGFnaW5nL2FuZHJvaWQvdWFwaS9zeW5jLmgKPiBpbmRleCBhMGNmMzU3Li5lNjQ5OTUzIDEwMDY0 NAo+IC0tLSBhL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3VhcGkvc3luYy5oCj4gKysrIGIvZHJp dmVycy9zdGFnaW5nL2FuZHJvaWQvdWFwaS9zeW5jLmgKPiBAQCAtNTQsNyArNTQsNyBAQCBzdHJ1 Y3Qgc3luY19maWxlX2luZm8gewo+ICAJY2hhcgluYW1lWzMyXTsKPiAgCV9fczMyCXN0YXR1czsK PiAgCj4gLQlfX3U4CXN5bmNfZmVuY2VfaW5mb1swXTsKPiArCV9fdTY0CXN5bmNfZmVuY2VfaW5m bzsKPiAgfTsKPiAgCj4gICNkZWZpbmUgU1lOQ19JT0NfTUFHSUMJCSc+JwpUaGlzIHN0aWxsIGRv ZXNuJ3QgZG8gd2hhdCB5b3UgZXhwZWN0IGl0IHRvLgoKSSB0aGluayB0aGlzIGlzIHdoYXQgeW91 IHdhbnQgaXMgZm9yIHVzZXJzcGFjZSB0byBkbzoKCnN0cnVjdCBzeW5jX2ZpbGVfaW5mbyBpbmZv OwoKaW5mby5mbGFncyA9IGluZm8ubnVtX2ZlbmNlcyA9IDA7CmlvY3RsKGZkLCBTWU5DX0lPQ19G RU5DRV9JTkZPLCAmaW5mbyk7CmlmIChpbmZvLm51bV9mZW5jZXMpIHsKaW5mby5zeW5jX2ZlbmNl X2luZm8gPSAodWludHB0cilrY2FsbG9jKGluZm8ubnVtX2ZlbmNlcywgc2l6ZW9mKHN0cnVjdCBz eW5jX2ZlbmNlX2luZm8pKTsKaW9jdGwoZmQsIFNZTkNfSU9DX0ZFTkNFX0lORk8sICZpbmZvKTsK fQoKTWF5YmUgdXNlcnNwYWNlIGNvdWxkIHByZWFsbG9jYXRlIHRoZSBtYXggaW4gYWR2YW5jZSBh bmQgc2V0IG51bV9mZW5jZXMgaGlnaGVyLAoKa2VybmVsIHdvdWxkIGRvIHNvbWV0aGluZyBsaWtl OgoKbnVtX2ZlbmNlcyA9IG1pbihpbmZvLm51bV9mZW5jZXMsIHN5bmMtPm51bV9mZW5jZXMpOwpz dHJ1Y3Qgc3luY19mZW5jZV9pbmZvIGFycmF5W251bV9mZW5jZXNdOwoKaW5mby5udW1fZmVuY2Vz ID0gc3luYy0+bnVtX2ZlbmNlczsKaWYgKG51bV9mZW5jZXMgJiYKICAgIGNvcHlfdG9fdXNlcigo dm9pZCAqIF9fdXNlcikodW5zaWduZWQgbG9uZylpbmZvLnN5bmNfZmVuY2VfaW5mbywgYXJyYXks IG51bV9mZW5jZXMgICogc2l6ZW9mKGFycmF5KSkpCiByZXR1cm4gLUVGQVVMVDsKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755896AbcBCOj1 (ORCPT ); Wed, 3 Feb 2016 09:39:27 -0500 Received: from mga04.intel.com ([192.55.52.120]:6892 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755771AbcBCOj0 (ORCPT ); Wed, 3 Feb 2016 09:39:26 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,391,1449561600"; d="scan'208";a="41727025" Subject: Re: [PATCH v3 06/11] staging/android: turn fence_info into a __u64 pointer To: Gustavo Padovan , Greg Kroah-Hartman References: <1454505940-18094-1-git-send-email-gustavo@padovan.org> <1454505940-18094-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: <56B2111A.8080103@linux.intel.com> Date: Wed, 3 Feb 2016 15:39:22 +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: <1454505940-18094-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 03-02-16 om 14:25 schreef Gustavo Padovan: > From: Gustavo Padovan > > Turn sync_fence_info into __u64 type enable us to extend the struct in the > future without breaking the ABI. > > v2: use type __u64 for fence_info > > v3: fix commit message to reflect the v2 change > > 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 2ab0c20..8425457 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 a0cf357..e649953 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 sync_fence_info[0]; > + __u64 sync_fence_info; > }; > > #define SYNC_IOC_MAGIC '>' This still doesn't do what you expect it to. I think this is what you want is for userspace to do: struct sync_file_info info; info.flags = info.num_fences = 0; ioctl(fd, SYNC_IOC_FENCE_INFO, &info); if (info.num_fences) { info.sync_fence_info = (uintptr)kcalloc(info.num_fences, sizeof(struct sync_fence_info)); ioctl(fd, SYNC_IOC_FENCE_INFO, &info); } Maybe userspace could preallocate the max in advance and set num_fences higher, kernel would do something like: num_fences = min(info.num_fences, sync->num_fences); struct sync_fence_info array[num_fences]; info.num_fences = sync->num_fences; if (num_fences && copy_to_user((void * __user)(unsigned long)info.sync_fence_info, array, num_fences * sizeof(array))) return -EFAULT;