From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> To: Gustavo Padovan <gustavo@padovan.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, "Daniel Stone" <daniels@collabora.com>, "Arve Hjønnevåg" <arve@android.com>, "Riley Andrews" <riandrews@android.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Rob Clark" <robdclark@gmail.com>, "Greg Hackmann" <ghackmann@google.com>, "John Harrison" <John.C.Harrison@Intel.com>, "Gustavo Padovan" <gustavo.padovan@collabora.co.uk> Subject: Re: [PATCH v4 5/5] staging/android: add flags member to sync ioctl structs Date: Mon, 29 Feb 2016 09:30:41 +0100 [thread overview] Message-ID: <56D401B1.7080200@linux.intel.com> (raw) In-Reply-To: <1456511507-2534-5-git-send-email-gustavo@padovan.org> Op 26-02-16 om 19:31 schreef Gustavo Padovan: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > Play safe and add flags member to all structs. So we don't need to > break API or create new IOCTL in the future if new features that requires > flags arises. > > v2: check if flags are valid (zero, in this case) > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > --- > drivers/staging/android/sync.c | 7 ++++++- > drivers/staging/android/uapi/sync.h | 6 ++++++ > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c > index 837cff5..54fd5ab 100644 > --- a/drivers/staging/android/sync.c > +++ b/drivers/staging/android/sync.c > @@ -445,6 +445,11 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file, > goto err_put_fd; > } > > + if (data.flags) { > + err = -EFAULT; > + goto err_put_fd; > + } -EINVAL > fence2 = sync_file_fdget(data.fd2); > if (!fence2) { > err = -ENOENT; > @@ -511,7 +516,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, > if (copy_from_user(&in, (void __user *)arg, sizeof(*info))) > return -EFAULT; > > - if (in.status || strcmp(in.name, "\0")) > + if (in.status || in.flags || strcmp(in.name, "\0")) > return -EFAULT; -EINVAL > if (in.num_fences && !in.sync_fence_info) > diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h > index 9aad623..f56a6c2 100644 > --- a/drivers/staging/android/uapi/sync.h > +++ b/drivers/staging/android/uapi/sync.h > @@ -19,11 +19,13 @@ > * @fd2: file descriptor of second fence > * @name: name of new fence > * @fence: returns the fd of the new fence to userspace > + * @flags: merge_data flags > */ > struct sync_merge_data { > __s32 fd2; > char name[32]; > __s32 fence; > + __u32 flags; > }; > > /** > @@ -31,12 +33,14 @@ struct sync_merge_data { > * @obj_name: name of parent sync_timeline > * @driver_name: name of driver implementing the parent > * @status: status of the fence 0:active 1:signaled <0:error > + * @flags: fence_info flags > * @timestamp_ns: timestamp of status change in nanoseconds > */ > struct sync_fence_info { > char obj_name[32]; > char driver_name[32]; > __s32 status; > + __u32 flags; > __u64 timestamp_ns; > }; > > @@ -44,6 +48,7 @@ struct sync_fence_info { > * struct sync_file_info - data returned from fence info ioctl > * @name: name of fence > * @status: status of fence. 1: signaled 0:active <0:error > + * @flags: sync_file_info flags > * @num_fences number of fences in the sync_file > * @len: ioctl caller writes the size of the buffer its passing in. > * ioctl returns length of all fence_infos summed. > @@ -52,6 +57,7 @@ struct sync_fence_info { > struct sync_file_info { > char name[32]; > __s32 status; > + __u32 flags; > __u32 num_fences; > __u32 len; >
WARNING: multiple messages have this Message-ID (diff)
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> To: Gustavo Padovan <gustavo@padovan.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: devel@driverdev.osuosl.org, "Daniel Stone" <daniels@collabora.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Riley Andrews" <riandrews@android.com>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Arve Hjønnevåg" <arve@android.com>, "Gustavo Padovan" <gustavo.padovan@collabora.co.uk>, "John Harrison" <John.C.Harrison@Intel.com> Subject: Re: [PATCH v4 5/5] staging/android: add flags member to sync ioctl structs Date: Mon, 29 Feb 2016 09:30:41 +0100 [thread overview] Message-ID: <56D401B1.7080200@linux.intel.com> (raw) In-Reply-To: <1456511507-2534-5-git-send-email-gustavo@padovan.org> Op 26-02-16 om 19:31 schreef Gustavo Padovan: > From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > > Play safe and add flags member to all structs. So we don't need to > break API or create new IOCTL in the future if new features that requires > flags arises. > > v2: check if flags are valid (zero, in this case) > > Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> > --- > drivers/staging/android/sync.c | 7 ++++++- > drivers/staging/android/uapi/sync.h | 6 ++++++ > 2 files changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c > index 837cff5..54fd5ab 100644 > --- a/drivers/staging/android/sync.c > +++ b/drivers/staging/android/sync.c > @@ -445,6 +445,11 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file, > goto err_put_fd; > } > > + if (data.flags) { > + err = -EFAULT; > + goto err_put_fd; > + } -EINVAL > fence2 = sync_file_fdget(data.fd2); > if (!fence2) { > err = -ENOENT; > @@ -511,7 +516,7 @@ static long sync_file_ioctl_fence_info(struct sync_file *sync_file, > if (copy_from_user(&in, (void __user *)arg, sizeof(*info))) > return -EFAULT; > > - if (in.status || strcmp(in.name, "\0")) > + if (in.status || in.flags || strcmp(in.name, "\0")) > return -EFAULT; -EINVAL > if (in.num_fences && !in.sync_fence_info) > diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h > index 9aad623..f56a6c2 100644 > --- a/drivers/staging/android/uapi/sync.h > +++ b/drivers/staging/android/uapi/sync.h > @@ -19,11 +19,13 @@ > * @fd2: file descriptor of second fence > * @name: name of new fence > * @fence: returns the fd of the new fence to userspace > + * @flags: merge_data flags > */ > struct sync_merge_data { > __s32 fd2; > char name[32]; > __s32 fence; > + __u32 flags; > }; > > /** > @@ -31,12 +33,14 @@ struct sync_merge_data { > * @obj_name: name of parent sync_timeline > * @driver_name: name of driver implementing the parent > * @status: status of the fence 0:active 1:signaled <0:error > + * @flags: fence_info flags > * @timestamp_ns: timestamp of status change in nanoseconds > */ > struct sync_fence_info { > char obj_name[32]; > char driver_name[32]; > __s32 status; > + __u32 flags; > __u64 timestamp_ns; > }; > > @@ -44,6 +48,7 @@ struct sync_fence_info { > * struct sync_file_info - data returned from fence info ioctl > * @name: name of fence > * @status: status of fence. 1: signaled 0:active <0:error > + * @flags: sync_file_info flags > * @num_fences number of fences in the sync_file > * @len: ioctl caller writes the size of the buffer its passing in. > * ioctl returns length of all fence_infos summed. > @@ -52,6 +57,7 @@ struct sync_fence_info { > struct sync_file_info { > char name[32]; > __s32 status; > + __u32 flags; > __u32 num_fences; > __u32 len; > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-02-29 8:30 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-26 18:31 [PATCH v4 1/5] staging/android: add num_fences field to struct sync_file_info Gustavo Padovan 2016-02-26 18:31 ` Gustavo Padovan 2016-02-26 18:31 ` [PATCH v4 2/5] staging/android: rename SYNC_IOC_FENCE_INFO Gustavo Padovan 2016-02-26 18:31 ` Gustavo Padovan 2016-02-26 18:31 ` [PATCH v4 3/5] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan 2016-02-26 18:31 ` Gustavo Padovan 2016-02-29 8:31 ` Maarten Lankhorst 2016-02-29 8:31 ` Maarten Lankhorst 2016-02-26 18:31 ` [PATCH v4 4/5] staging/android: refactor SYNC_IOC_FILE_INFO Gustavo Padovan 2016-02-26 18:31 ` Gustavo Padovan 2016-02-26 21:00 ` [PATCH] " Gustavo Padovan 2016-02-26 21:00 ` Gustavo Padovan 2016-02-27 2:18 ` Emil Velikov 2016-02-27 2:18 ` Emil Velikov 2016-02-27 15:25 ` Gustavo Padovan 2016-02-27 15:25 ` Gustavo Padovan 2016-02-29 8:34 ` Emil Velikov 2016-02-29 8:34 ` Emil Velikov 2016-02-29 8:26 ` Maarten Lankhorst 2016-02-29 8:26 ` Maarten Lankhorst 2016-02-29 22:08 ` Gustavo Padovan 2016-02-29 22:08 ` Gustavo Padovan 2016-03-01 8:35 ` Maarten Lankhorst 2016-03-01 8:35 ` Maarten Lankhorst 2016-03-01 11:55 ` Gustavo Padovan 2016-03-01 6:55 ` [PATCH v4 4/5] " Dan Carpenter 2016-03-01 6:55 ` Dan Carpenter 2016-02-26 18:31 ` [PATCH v4 5/5] staging/android: add flags member to sync ioctl structs Gustavo Padovan 2016-02-26 18:31 ` Gustavo Padovan 2016-02-27 2:20 ` Emil Velikov 2016-02-27 2:20 ` Emil Velikov 2016-02-27 15:27 ` Gustavo Padovan 2016-02-29 7:59 ` Emil Velikov 2016-02-29 7:59 ` Emil Velikov 2016-02-29 8:30 ` Maarten Lankhorst [this message] 2016-02-29 8:30 ` Maarten Lankhorst 2016-03-01 6:36 ` [PATCH v4 1/5] staging/android: add num_fences field to struct sync_file_info Dan Carpenter 2016-03-01 6:36 ` Dan Carpenter 2016-03-01 11:52 ` Gustavo Padovan 2016-03-01 11:52 ` Gustavo Padovan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=56D401B1.7080200@linux.intel.com \ --to=maarten.lankhorst@linux.intel.com \ --cc=John.C.Harrison@Intel.com \ --cc=arve@android.com \ --cc=daniel.vetter@ffwll.ch \ --cc=daniels@collabora.com \ --cc=devel@driverdev.osuosl.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=ghackmann@google.com \ --cc=gregkh@linuxfoundation.org \ --cc=gustavo.padovan@collabora.co.uk \ --cc=gustavo@padovan.org \ --cc=linux-kernel@vger.kernel.org \ --cc=riandrews@android.com \ --cc=robdclark@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.