staging/android: prepare sync_file for de-staging
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Thu, 28 Apr 2016 13:46:54 +0000 (10:46 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 30 Apr 2016 00:37:10 +0000 (17:37 -0700)
Move its functions and structs to their own file. Also moves function's
docs to the .c file.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/Makefile
drivers/staging/android/sync.c
drivers/staging/android/sync.h
drivers/staging/android/sync_debug.c
drivers/staging/android/sync_file.c [new file with mode: 0644]
drivers/staging/android/sync_file.h [new file with mode: 0644]
drivers/staging/android/uapi/sync.h [deleted file]
drivers/staging/android/uapi/sync_file.h [new file with mode: 0644]

index 980d6dc4b26558614fcb2de03f948eb34641ed49..ebc2df1b14fdee5d29cea3515e2d8b647d2c5b44 100644 (file)
@@ -4,5 +4,5 @@ obj-y                                   += ion/
 
 obj-$(CONFIG_ASHMEM)                   += ashmem.o
 obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)        += lowmemorykiller.o
-obj-$(CONFIG_SYNC)                     += sync.o sync_debug.o
+obj-$(CONFIG_SYNC)                     += sync_file.o sync.o sync_debug.o
 obj-$(CONFIG_SW_SYNC)                  += sw_sync.o
index 5470ae9557c7cb365e0aa260ae77af38beaedb22..1d14c83c7f7c95effe5a173471e1a4e238351db2 100644 (file)
 
 #include <linux/debugfs.h>
 #include <linux/export.h>
-#include <linux/file.h>
-#include <linux/fs.h>
 #include <linux/kernel.h>
-#include <linux/poll.h>
 #include <linux/sched.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
@@ -32,7 +29,6 @@
 #include "trace/sync.h"
 
 static const struct fence_ops android_fence_ops;
-static const struct file_operations sync_file_fops;
 
 struct sync_timeline *sync_timeline_create(const struct sync_timeline_ops *ops,
                                           int size, const char *name)
@@ -136,182 +132,6 @@ struct fence *sync_pt_create(struct sync_timeline *obj, int size)
 }
 EXPORT_SYMBOL(sync_pt_create);
 
-static struct sync_file *sync_file_alloc(int size)
-{
-       struct sync_file *sync_file;
-
-       sync_file = kzalloc(size, GFP_KERNEL);
-       if (!sync_file)
-               return NULL;
-
-       sync_file->file = anon_inode_getfile("sync_file", &sync_file_fops,
-                                            sync_file, 0);
-       if (IS_ERR(sync_file->file))
-               goto err;
-
-       kref_init(&sync_file->kref);
-
-       init_waitqueue_head(&sync_file->wq);
-
-       return sync_file;
-
-err:
-       kfree(sync_file);
-       return NULL;
-}
-
-static void fence_check_cb_func(struct fence *f, struct fence_cb *cb)
-{
-       struct sync_file_cb *check;
-       struct sync_file *sync_file;
-
-       check = container_of(cb, struct sync_file_cb, cb);
-       sync_file = check->sync_file;
-
-       if (atomic_dec_and_test(&sync_file->status))
-               wake_up_all(&sync_file->wq);
-}
-
-/**
- * sync_fence_create() - creates a sync fence
- * @fence:     fence to add to the sync_fence
- *
- * Creates a sync_file containg @fence. Once this is called, the sync_file
- * takes ownership of @fence.
- */
-struct sync_file *sync_file_create(struct fence *fence)
-{
-       struct sync_file *sync_file;
-
-       sync_file = sync_file_alloc(offsetof(struct sync_file, cbs[1]));
-       if (!sync_file)
-               return NULL;
-
-       sync_file->num_fences = 1;
-       atomic_set(&sync_file->status, 1);
-       snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%d-%d",
-                fence->ops->get_driver_name(fence),
-                fence->ops->get_timeline_name(fence), fence->context,
-                fence->seqno);
-
-       sync_file->cbs[0].fence = fence;
-       sync_file->cbs[0].sync_file = sync_file;
-       if (fence_add_callback(fence, &sync_file->cbs[0].cb,
-                              fence_check_cb_func))
-               atomic_dec(&sync_file->status);
-
-       sync_file_debug_add(sync_file);
-
-       return sync_file;
-}
-EXPORT_SYMBOL(sync_file_create);
-
-/**
- * sync_file_fdget() - get a sync_file from an fd
- * @fd:                fd referencing a fence
- *
- * Ensures @fd references a valid sync_file, increments the refcount of the
- * backing file. Returns the sync_file or NULL in case of error.
- */
-static struct sync_file *sync_file_fdget(int fd)
-{
-       struct file *file = fget(fd);
-
-       if (!file)
-               return NULL;
-
-       if (file->f_op != &sync_file_fops)
-               goto err;
-
-       return file->private_data;
-
-err:
-       fput(file);
-       return NULL;
-}
-
-static void sync_file_add_pt(struct sync_file *sync_file, int *i,
-                            struct fence *fence)
-{
-       sync_file->cbs[*i].fence = fence;
-       sync_file->cbs[*i].sync_file = sync_file;
-
-       if (!fence_add_callback(fence, &sync_file->cbs[*i].cb,
-                               fence_check_cb_func)) {
-               fence_get(fence);
-               (*i)++;
-       }
-}
-
-/**
- * sync_file_merge() - merge two sync_files
- * @name:      name of new fence
- * @a:         sync_file a
- * @b:         sync_file b
- *
- * Creates a new sync_file which contains copies of all the fences in both
- * @a and @b.  @a and @b remain valid, independent sync_file. Returns the
- * new merged sync_file or NULL in case of error.
- */
-static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,
-                                        struct sync_file *b)
-{
-       int num_fences = a->num_fences + b->num_fences;
-       struct sync_file *sync_file;
-       int i, i_a, i_b;
-       unsigned long size = offsetof(struct sync_file, cbs[num_fences]);
-
-       sync_file = sync_file_alloc(size);
-       if (!sync_file)
-               return NULL;
-
-       atomic_set(&sync_file->status, num_fences);
-
-       /*
-        * Assume sync_file a and b are both ordered and have no
-        * duplicates with the same context.
-        *
-        * If a sync_file can only be created with sync_file_merge
-        * and sync_file_create, this is a reasonable assumption.
-        */
-       for (i = i_a = i_b = 0; i_a < a->num_fences && i_b < b->num_fences; ) {
-               struct fence *pt_a = a->cbs[i_a].fence;
-               struct fence *pt_b = b->cbs[i_b].fence;
-
-               if (pt_a->context < pt_b->context) {
-                       sync_file_add_pt(sync_file, &i, pt_a);
-
-                       i_a++;
-               } else if (pt_a->context > pt_b->context) {
-                       sync_file_add_pt(sync_file, &i, pt_b);
-
-                       i_b++;
-               } else {
-                       if (pt_a->seqno - pt_b->seqno <= INT_MAX)
-                               sync_file_add_pt(sync_file, &i, pt_a);
-                       else
-                               sync_file_add_pt(sync_file, &i, pt_b);
-
-                       i_a++;
-                       i_b++;
-               }
-       }
-
-       for (; i_a < a->num_fences; i_a++)
-               sync_file_add_pt(sync_file, &i, a->cbs[i_a].fence);
-
-       for (; i_b < b->num_fences; i_b++)
-               sync_file_add_pt(sync_file, &i, b->cbs[i_b].fence);
-
-       if (num_fences > i)
-               atomic_sub(num_fences - i, &sync_file->status);
-       sync_file->num_fences = i;
-
-       strlcpy(sync_file->name, name, sizeof(sync_file->name));
-       sync_file_debug_add(sync_file);
-       return sync_file;
-}
-
 static const char *android_fence_get_driver_name(struct fence *fence)
 {
        struct sync_timeline *parent = fence_parent(fence);
@@ -399,197 +219,3 @@ static const struct fence_ops android_fence_ops = {
        .fence_value_str = android_fence_value_str,
        .timeline_value_str = android_fence_timeline_value_str,
 };
-
-static void sync_file_free(struct kref *kref)
-{
-       struct sync_file *sync_file = container_of(kref, struct sync_file,
-                                                    kref);
-       int i;
-
-       for (i = 0; i < sync_file->num_fences; ++i) {
-               fence_remove_callback(sync_file->cbs[i].fence,
-                                     &sync_file->cbs[i].cb);
-               fence_put(sync_file->cbs[i].fence);
-       }
-
-       kfree(sync_file);
-}
-
-static int sync_file_release(struct inode *inode, struct file *file)
-{
-       struct sync_file *sync_file = file->private_data;
-
-       sync_file_debug_remove(sync_file);
-
-       kref_put(&sync_file->kref, sync_file_free);
-       return 0;
-}
-
-static unsigned int sync_file_poll(struct file *file, poll_table *wait)
-{
-       struct sync_file *sync_file = file->private_data;
-       int status;
-
-       poll_wait(file, &sync_file->wq, wait);
-
-       status = atomic_read(&sync_file->status);
-
-       if (!status)
-               return POLLIN;
-       if (status < 0)
-               return POLLERR;
-       return 0;
-}
-
-static long sync_file_ioctl_merge(struct sync_file *sync_file,
-                                  unsigned long arg)
-{
-       int fd = get_unused_fd_flags(O_CLOEXEC);
-       int err;
-       struct sync_file *fence2, *fence3;
-       struct sync_merge_data data;
-
-       if (fd < 0)
-               return fd;
-
-       if (copy_from_user(&data, (void __user *)arg, sizeof(data))) {
-               err = -EFAULT;
-               goto err_put_fd;
-       }
-
-       if (data.flags || data.pad) {
-               err = -EINVAL;
-               goto err_put_fd;
-       }
-
-       fence2 = sync_file_fdget(data.fd2);
-       if (!fence2) {
-               err = -ENOENT;
-               goto err_put_fd;
-       }
-
-       data.name[sizeof(data.name) - 1] = '\0';
-       fence3 = sync_file_merge(data.name, sync_file, fence2);
-       if (!fence3) {
-               err = -ENOMEM;
-               goto err_put_fence2;
-       }
-
-       data.fence = fd;
-       if (copy_to_user((void __user *)arg, &data, sizeof(data))) {
-               err = -EFAULT;
-               goto err_put_fence3;
-       }
-
-       fd_install(fd, fence3->file);
-       fput(fence2->file);
-       return 0;
-
-err_put_fence3:
-       fput(fence3->file);
-
-err_put_fence2:
-       fput(fence2->file);
-
-err_put_fd:
-       put_unused_fd(fd);
-       return err;
-}
-
-static void sync_fill_fence_info(struct fence *fence,
-                               struct sync_fence_info *info)
-{
-       strlcpy(info->obj_name, fence->ops->get_timeline_name(fence),
-               sizeof(info->obj_name));
-       strlcpy(info->driver_name, fence->ops->get_driver_name(fence),
-               sizeof(info->driver_name));
-       if (fence_is_signaled(fence))
-               info->status = fence->status >= 0 ? 1 : fence->status;
-       else
-               info->status = 0;
-       info->timestamp_ns = ktime_to_ns(fence->timestamp);
-}
-
-static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
-                                       unsigned long arg)
-{
-       struct sync_file_info info;
-       struct sync_fence_info *fence_info = NULL;
-       __u32 size;
-       int ret, i;
-
-       if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-               return -EFAULT;
-
-       if (info.flags || info.pad)
-               return -EINVAL;
-
-       /*
-        * Passing num_fences = 0 means that userspace doesn't want to
-        * retrieve any sync_fence_info. If num_fences = 0 we skip filling
-        * sync_fence_info and return the actual number of fences on
-        * info->num_fences.
-        */
-       if (!info.num_fences)
-               goto no_fences;
-
-       if (info.num_fences < sync_file->num_fences)
-               return -EINVAL;
-
-       size = sync_file->num_fences * sizeof(*fence_info);
-       fence_info = kzalloc(size, GFP_KERNEL);
-       if (!fence_info)
-               return -ENOMEM;
-
-       for (i = 0; i < sync_file->num_fences; ++i)
-               sync_fill_fence_info(sync_file->cbs[i].fence, &fence_info[i]);
-
-       if (copy_to_user(u64_to_user_ptr(info.sync_fence_info), fence_info,
-                        size)) {
-               ret = -EFAULT;
-               goto out;
-       }
-
-no_fences:
-       strlcpy(info.name, sync_file->name, sizeof(info.name));
-       info.status = atomic_read(&sync_file->status);
-       if (info.status >= 0)
-               info.status = !info.status;
-
-       info.num_fences = sync_file->num_fences;
-
-       if (copy_to_user((void __user *)arg, &info, sizeof(info)))
-               ret = -EFAULT;
-       else
-               ret = 0;
-
-out:
-       kfree(fence_info);
-
-       return ret;
-}
-
-static long sync_file_ioctl(struct file *file, unsigned int cmd,
-                            unsigned long arg)
-{
-       struct sync_file *sync_file = file->private_data;
-
-       switch (cmd) {
-       case SYNC_IOC_MERGE:
-               return sync_file_ioctl_merge(sync_file, arg);
-
-       case SYNC_IOC_FILE_INFO:
-               return sync_file_ioctl_fence_info(sync_file, arg);
-
-       default:
-               return -ENOTTY;
-       }
-}
-
-static const struct file_operations sync_file_fops = {
-       .release = sync_file_release,
-       .poll = sync_file_poll,
-       .unlocked_ioctl = sync_file_ioctl,
-       .compat_ioctl = sync_file_ioctl,
-};
-
index 7dee444c931dbf389cd3edafa00286b1966ee609..df44abb95963c5eb2a4ab5051c5bd6ed4a27ca32 100644 (file)
 #include <linux/spinlock.h>
 #include <linux/fence.h>
 
-#include "uapi/sync.h"
+#include "sync_file.h"
+#include "uapi/sync_file.h"
 
 struct sync_timeline;
-struct sync_file;
 
 /**
  * struct sync_timeline_ops - sync object implementation ops
@@ -86,38 +86,6 @@ static inline struct sync_timeline *fence_parent(struct fence *fence)
                            child_list_lock);
 }
 
-struct sync_file_cb {
-       struct fence_cb cb;
-       struct fence *fence;
-       struct sync_file *sync_file;
-};
-
-/**
- * struct sync_file - sync file to export to the userspace
- * @file:              file representing this fence
- * @kref:              reference count on fence.
- * @name:              name of sync_file.  Useful for debugging
- * @sync_file_list:    membership in global file list
- * @num_fences         number of sync_pts in the fence
- * @wq:                        wait queue for fence signaling
- * @status:            0: signaled, >0:active, <0: error
- * @cbs:               sync_pts callback information
- */
-struct sync_file {
-       struct file             *file;
-       struct kref             kref;
-       char                    name[32];
-#ifdef CONFIG_DEBUG_FS
-       struct list_head        sync_file_list;
-#endif
-       int num_fences;
-
-       wait_queue_head_t       wq;
-       atomic_t                status;
-
-       struct sync_file_cb     cbs[];
-};
-
 /*
  * API for sync_timeline implementers
  */
@@ -167,8 +135,6 @@ void sync_timeline_signal(struct sync_timeline *obj);
  */
 struct fence *sync_pt_create(struct sync_timeline *parent, int size);
 
-struct sync_file *sync_file_create(struct fence *fence);
-
 #ifdef CONFIG_DEBUG_FS
 
 void sync_timeline_debug_add(struct sync_timeline *obj);
index 2cab40d35d7a00d7ae5b75d5c64b30d02d7bc2ce..8b55218f5535ee33a6ff1d359651ecf9e0e5f3fd 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/uaccess.h>
 #include <linux/anon_inodes.h>
 #include <linux/time64.h>
+#include "sync_file.h"
 #include "sw_sync.h"
 
 #ifdef CONFIG_DEBUG_FS
diff --git a/drivers/staging/android/sync_file.c b/drivers/staging/android/sync_file.c
new file mode 100644 (file)
index 0000000..2c724ec
--- /dev/null
@@ -0,0 +1,394 @@
+/*
+ * drivers/dma-buf/sync_file.c
+ *
+ * Copyright (C) 2012 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/export.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/poll.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
+#include <linux/anon_inodes.h>
+#include "sync_file.h"
+#include "uapi/sync_file.h"
+
+static const struct file_operations sync_file_fops;
+
+static struct sync_file *sync_file_alloc(int size)
+{
+       struct sync_file *sync_file;
+
+       sync_file = kzalloc(size, GFP_KERNEL);
+       if (!sync_file)
+               return NULL;
+
+       sync_file->file = anon_inode_getfile("sync_file", &sync_file_fops,
+                                            sync_file, 0);
+       if (IS_ERR(sync_file->file))
+               goto err;
+
+       kref_init(&sync_file->kref);
+
+       init_waitqueue_head(&sync_file->wq);
+
+       return sync_file;
+
+err:
+       kfree(sync_file);
+       return NULL;
+}
+
+static void fence_check_cb_func(struct fence *f, struct fence_cb *cb)
+{
+       struct sync_file_cb *check;
+       struct sync_file *sync_file;
+
+       check = container_of(cb, struct sync_file_cb, cb);
+       sync_file = check->sync_file;
+
+       if (atomic_dec_and_test(&sync_file->status))
+               wake_up_all(&sync_file->wq);
+}
+
+/**
+ * sync_fence_create() - creates a sync fence
+ * @fence:     fence to add to the sync_fence
+ *
+ * Creates a sync_file containg @fence. Once this is called, the sync_file
+ * takes ownership of @fence.
+ */
+struct sync_file *sync_file_create(struct fence *fence)
+{
+       struct sync_file *sync_file;
+
+       sync_file = sync_file_alloc(offsetof(struct sync_file, cbs[1]));
+       if (!sync_file)
+               return NULL;
+
+       sync_file->num_fences = 1;
+       atomic_set(&sync_file->status, 1);
+       snprintf(sync_file->name, sizeof(sync_file->name), "%s-%s%d-%d",
+                fence->ops->get_driver_name(fence),
+                fence->ops->get_timeline_name(fence), fence->context,
+                fence->seqno);
+
+       sync_file->cbs[0].fence = fence;
+       sync_file->cbs[0].sync_file = sync_file;
+       if (fence_add_callback(fence, &sync_file->cbs[0].cb,
+                              fence_check_cb_func))
+               atomic_dec(&sync_file->status);
+
+       return sync_file;
+}
+EXPORT_SYMBOL(sync_file_create);
+
+/**
+ * sync_file_fdget() - get a sync_file from an fd
+ * @fd:                fd referencing a fence
+ *
+ * Ensures @fd references a valid sync_file, increments the refcount of the
+ * backing file. Returns the sync_file or NULL in case of error.
+ */
+static struct sync_file *sync_file_fdget(int fd)
+{
+       struct file *file = fget(fd);
+
+       if (!file)
+               return NULL;
+
+       if (file->f_op != &sync_file_fops)
+               goto err;
+
+       return file->private_data;
+
+err:
+       fput(file);
+       return NULL;
+}
+
+static void sync_file_add_pt(struct sync_file *sync_file, int *i,
+                            struct fence *fence)
+{
+       sync_file->cbs[*i].fence = fence;
+       sync_file->cbs[*i].sync_file = sync_file;
+
+       if (!fence_add_callback(fence, &sync_file->cbs[*i].cb,
+                               fence_check_cb_func)) {
+               fence_get(fence);
+               (*i)++;
+       }
+}
+
+/**
+ * sync_file_merge() - merge two sync_files
+ * @name:      name of new fence
+ * @a:         sync_file a
+ * @b:         sync_file b
+ *
+ * Creates a new sync_file which contains copies of all the fences in both
+ * @a and @b.  @a and @b remain valid, independent sync_file. Returns the
+ * new merged sync_file or NULL in case of error.
+ */
+static struct sync_file *sync_file_merge(const char *name, struct sync_file *a,
+                                        struct sync_file *b)
+{
+       int num_fences = a->num_fences + b->num_fences;
+       struct sync_file *sync_file;
+       int i, i_a, i_b;
+       unsigned long size = offsetof(struct sync_file, cbs[num_fences]);
+
+       sync_file = sync_file_alloc(size);
+       if (!sync_file)
+               return NULL;
+
+       atomic_set(&sync_file->status, num_fences);
+
+       /*
+        * Assume sync_file a and b are both ordered and have no
+        * duplicates with the same context.
+        *
+        * If a sync_file can only be created with sync_file_merge
+        * and sync_file_create, this is a reasonable assumption.
+        */
+       for (i = i_a = i_b = 0; i_a < a->num_fences && i_b < b->num_fences; ) {
+               struct fence *pt_a = a->cbs[i_a].fence;
+               struct fence *pt_b = b->cbs[i_b].fence;
+
+               if (pt_a->context < pt_b->context) {
+                       sync_file_add_pt(sync_file, &i, pt_a);
+
+                       i_a++;
+               } else if (pt_a->context > pt_b->context) {
+                       sync_file_add_pt(sync_file, &i, pt_b);
+
+                       i_b++;
+               } else {
+                       if (pt_a->seqno - pt_b->seqno <= INT_MAX)
+                               sync_file_add_pt(sync_file, &i, pt_a);
+                       else
+                               sync_file_add_pt(sync_file, &i, pt_b);
+
+                       i_a++;
+                       i_b++;
+               }
+       }
+
+       for (; i_a < a->num_fences; i_a++)
+               sync_file_add_pt(sync_file, &i, a->cbs[i_a].fence);
+
+       for (; i_b < b->num_fences; i_b++)
+               sync_file_add_pt(sync_file, &i, b->cbs[i_b].fence);
+
+       if (num_fences > i)
+               atomic_sub(num_fences - i, &sync_file->status);
+       sync_file->num_fences = i;
+
+       strlcpy(sync_file->name, name, sizeof(sync_file->name));
+       return sync_file;
+}
+
+static void sync_file_free(struct kref *kref)
+{
+       struct sync_file *sync_file = container_of(kref, struct sync_file,
+                                                    kref);
+       int i;
+
+       for (i = 0; i < sync_file->num_fences; ++i) {
+               fence_remove_callback(sync_file->cbs[i].fence,
+                                     &sync_file->cbs[i].cb);
+               fence_put(sync_file->cbs[i].fence);
+       }
+
+       kfree(sync_file);
+}
+
+static int sync_file_release(struct inode *inode, struct file *file)
+{
+       struct sync_file *sync_file = file->private_data;
+
+       kref_put(&sync_file->kref, sync_file_free);
+       return 0;
+}
+
+static unsigned int sync_file_poll(struct file *file, poll_table *wait)
+{
+       struct sync_file *sync_file = file->private_data;
+       int status;
+
+       poll_wait(file, &sync_file->wq, wait);
+
+       status = atomic_read(&sync_file->status);
+
+       if (!status)
+               return POLLIN;
+       if (status < 0)
+               return POLLERR;
+       return 0;
+}
+
+static long sync_file_ioctl_merge(struct sync_file *sync_file,
+                                  unsigned long arg)
+{
+       int fd = get_unused_fd_flags(O_CLOEXEC);
+       int err;
+       struct sync_file *fence2, *fence3;
+       struct sync_merge_data data;
+
+       if (fd < 0)
+               return fd;
+
+       if (copy_from_user(&data, (void __user *)arg, sizeof(data))) {
+               err = -EFAULT;
+               goto err_put_fd;
+       }
+
+       if (data.flags || data.pad) {
+               err = -EINVAL;
+               goto err_put_fd;
+       }
+
+       fence2 = sync_file_fdget(data.fd2);
+       if (!fence2) {
+               err = -ENOENT;
+               goto err_put_fd;
+       }
+
+       data.name[sizeof(data.name) - 1] = '\0';
+       fence3 = sync_file_merge(data.name, sync_file, fence2);
+       if (!fence3) {
+               err = -ENOMEM;
+               goto err_put_fence2;
+       }
+
+       data.fence = fd;
+       if (copy_to_user((void __user *)arg, &data, sizeof(data))) {
+               err = -EFAULT;
+               goto err_put_fence3;
+       }
+
+       fd_install(fd, fence3->file);
+       fput(fence2->file);
+       return 0;
+
+err_put_fence3:
+       fput(fence3->file);
+
+err_put_fence2:
+       fput(fence2->file);
+
+err_put_fd:
+       put_unused_fd(fd);
+       return err;
+}
+
+static void sync_fill_fence_info(struct fence *fence,
+                               struct sync_fence_info *info)
+{
+       strlcpy(info->obj_name, fence->ops->get_timeline_name(fence),
+               sizeof(info->obj_name));
+       strlcpy(info->driver_name, fence->ops->get_driver_name(fence),
+               sizeof(info->driver_name));
+       if (fence_is_signaled(fence))
+               info->status = fence->status >= 0 ? 1 : fence->status;
+       else
+               info->status = 0;
+       info->timestamp_ns = ktime_to_ns(fence->timestamp);
+}
+
+static long sync_file_ioctl_fence_info(struct sync_file *sync_file,
+                                       unsigned long arg)
+{
+       struct sync_file_info info;
+       struct sync_fence_info *fence_info = NULL;
+       __u32 size;
+       int ret, i;
+
+       if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
+               return -EFAULT;
+
+       if (info.flags || info.pad)
+               return -EINVAL;
+
+       /*
+        * Passing num_fences = 0 means that userspace doesn't want to
+        * retrieve any sync_fence_info. If num_fences = 0 we skip filling
+        * sync_fence_info and return the actual number of fences on
+        * info->num_fences.
+        */
+       if (!info.num_fences)
+               goto no_fences;
+
+       if (info.num_fences < sync_file->num_fences)
+               return -EINVAL;
+
+       size = sync_file->num_fences * sizeof(*fence_info);
+       fence_info = kzalloc(size, GFP_KERNEL);
+       if (!fence_info)
+               return -ENOMEM;
+
+       for (i = 0; i < sync_file->num_fences; ++i)
+               sync_fill_fence_info(sync_file->cbs[i].fence, &fence_info[i]);
+
+       if (copy_to_user(u64_to_user_ptr(info.sync_fence_info), fence_info,
+                        size)) {
+               ret = -EFAULT;
+               goto out;
+       }
+
+no_fences:
+       strlcpy(info.name, sync_file->name, sizeof(info.name));
+       info.status = atomic_read(&sync_file->status);
+       if (info.status >= 0)
+               info.status = !info.status;
+
+       info.num_fences = sync_file->num_fences;
+
+       if (copy_to_user((void __user *)arg, &info, sizeof(info)))
+               ret = -EFAULT;
+       else
+               ret = 0;
+
+out:
+       kfree(fence_info);
+
+       return ret;
+}
+
+static long sync_file_ioctl(struct file *file, unsigned int cmd,
+                            unsigned long arg)
+{
+       struct sync_file *sync_file = file->private_data;
+
+       switch (cmd) {
+       case SYNC_IOC_MERGE:
+               return sync_file_ioctl_merge(sync_file, arg);
+
+       case SYNC_IOC_FILE_INFO:
+               return sync_file_ioctl_fence_info(sync_file, arg);
+
+       default:
+               return -ENOTTY;
+       }
+}
+
+static const struct file_operations sync_file_fops = {
+       .release = sync_file_release,
+       .poll = sync_file_poll,
+       .unlocked_ioctl = sync_file_ioctl,
+       .compat_ioctl = sync_file_ioctl,
+};
+
diff --git a/drivers/staging/android/sync_file.h b/drivers/staging/android/sync_file.h
new file mode 100644 (file)
index 0000000..8a1b546
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * include/linux/sync_file.h
+ *
+ * Copyright (C) 2012 Google, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef _LINUX_SYNC_FILE_H
+#define _LINUX_SYNC_FILE_H
+
+#include <linux/types.h>
+#include <linux/kref.h>
+#include <linux/ktime.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/fence.h>
+
+struct sync_file_cb {
+       struct fence_cb cb;
+       struct fence *fence;
+       struct sync_file *sync_file;
+};
+
+/**
+ * struct sync_file - sync file to export to the userspace
+ * @file:              file representing this fence
+ * @kref:              reference count on fence.
+ * @name:              name of sync_file.  Useful for debugging
+ * @sync_file_list:    membership in global file list
+ * @num_fences         number of sync_pts in the fence
+ * @wq:                        wait queue for fence signaling
+ * @status:            0: signaled, >0:active, <0: error
+ * @cbs:               sync_pts callback information
+ */
+struct sync_file {
+       struct file             *file;
+       struct kref             kref;
+       char                    name[32];
+#ifdef CONFIG_DEBUG_FS
+       struct list_head        sync_file_list;
+#endif
+       int num_fences;
+
+       wait_queue_head_t       wq;
+       atomic_t                status;
+
+       struct sync_file_cb     cbs[];
+};
+
+struct sync_file *sync_file_create(struct fence *fence);
+
+#endif /* _LINUX_SYNC_H */
diff --git a/drivers/staging/android/uapi/sync.h b/drivers/staging/android/uapi/sync.h
deleted file mode 100644 (file)
index 413303d..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2012 Google, Inc.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef _UAPI_LINUX_SYNC_H
-#define _UAPI_LINUX_SYNC_H
-
-#include <linux/ioctl.h>
-#include <linux/types.h>
-
-/**
- * struct sync_merge_data - data passed to merge ioctl
- * @name:      name of new fence
- * @fd2:       file descriptor of second fence
- * @fence:     returns the fd of the new fence to userspace
- * @flags:     merge_data flags
- * @pad:       padding for 64-bit alignment, should always be zero
- */
-struct sync_merge_data {
-       char    name[32];
-       __s32   fd2;
-       __s32   fence;
-       __u32   flags;
-       __u32   pad;
-};
-
-/**
- * struct sync_fence_info - detailed fence information
- * @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;
-};
-
-/**
- * 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
- * @pad:       padding for 64-bit alignment, should always be zero
- * @sync_fence_info: pointer to array of structs sync_fence_info with all
- *              fences in the sync_file
- */
-struct sync_file_info {
-       char    name[32];
-       __s32   status;
-       __u32   flags;
-       __u32   num_fences;
-       __u32   pad;
-
-       __u64   sync_fence_info;
-};
-
-#define SYNC_IOC_MAGIC         '>'
-
-/**
- * Opcodes  0, 1 and 2 were burned during a API change to avoid users of the
- * old API to get weird errors when trying to handling sync_files. The API
- * change happened during the de-stage of the Sync Framework when there was
- * no upstream users available.
- */
-
-/**
- * DOC: SYNC_IOC_MERGE - merge two fences
- *
- * Takes a struct sync_merge_data.  Creates a new fence containing copies of
- * the sync_pts in both the calling fd and sync_merge_data.fd2.  Returns the
- * new fence's fd in sync_merge_data.fence
- */
-#define SYNC_IOC_MERGE         _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data)
-
-/**
- * DOC: SYNC_IOC_FENCE_INFO - get detailed information on a fence
- *
- * Takes a struct sync_file_info_data with extra space allocated for pt_info.
- * Caller should write the size of the buffer into len.  On return, len is
- * updated to reflect the total size of the sync_file_info_data including
- * pt_info.
- *
- * pt_info is a buffer containing sync_pt_infos for every sync_pt in the fence.
- * To iterate over the sync_pt_infos, use the sync_pt_info.len field.
- */
-#define SYNC_IOC_FILE_INFO     _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)
-
-#endif /* _UAPI_LINUX_SYNC_H */
diff --git a/drivers/staging/android/uapi/sync_file.h b/drivers/staging/android/uapi/sync_file.h
new file mode 100644 (file)
index 0000000..413303d
--- /dev/null
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2012 Google, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef _UAPI_LINUX_SYNC_H
+#define _UAPI_LINUX_SYNC_H
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/**
+ * struct sync_merge_data - data passed to merge ioctl
+ * @name:      name of new fence
+ * @fd2:       file descriptor of second fence
+ * @fence:     returns the fd of the new fence to userspace
+ * @flags:     merge_data flags
+ * @pad:       padding for 64-bit alignment, should always be zero
+ */
+struct sync_merge_data {
+       char    name[32];
+       __s32   fd2;
+       __s32   fence;
+       __u32   flags;
+       __u32   pad;
+};
+
+/**
+ * struct sync_fence_info - detailed fence information
+ * @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;
+};
+
+/**
+ * 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
+ * @pad:       padding for 64-bit alignment, should always be zero
+ * @sync_fence_info: pointer to array of structs sync_fence_info with all
+ *              fences in the sync_file
+ */
+struct sync_file_info {
+       char    name[32];
+       __s32   status;
+       __u32   flags;
+       __u32   num_fences;
+       __u32   pad;
+
+       __u64   sync_fence_info;
+};
+
+#define SYNC_IOC_MAGIC         '>'
+
+/**
+ * Opcodes  0, 1 and 2 were burned during a API change to avoid users of the
+ * old API to get weird errors when trying to handling sync_files. The API
+ * change happened during the de-stage of the Sync Framework when there was
+ * no upstream users available.
+ */
+
+/**
+ * DOC: SYNC_IOC_MERGE - merge two fences
+ *
+ * Takes a struct sync_merge_data.  Creates a new fence containing copies of
+ * the sync_pts in both the calling fd and sync_merge_data.fd2.  Returns the
+ * new fence's fd in sync_merge_data.fence
+ */
+#define SYNC_IOC_MERGE         _IOWR(SYNC_IOC_MAGIC, 3, struct sync_merge_data)
+
+/**
+ * DOC: SYNC_IOC_FENCE_INFO - get detailed information on a fence
+ *
+ * Takes a struct sync_file_info_data with extra space allocated for pt_info.
+ * Caller should write the size of the buffer into len.  On return, len is
+ * updated to reflect the total size of the sync_file_info_data including
+ * pt_info.
+ *
+ * pt_info is a buffer containing sync_pt_infos for every sync_pt in the fence.
+ * To iterate over the sync_pt_infos, use the sync_pt_info.len field.
+ */
+#define SYNC_IOC_FILE_INFO     _IOWR(SYNC_IOC_MAGIC, 4, struct sync_file_info)
+
+#endif /* _UAPI_LINUX_SYNC_H */