Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15c6098c authored by Laura Abbott's avatar Laura Abbott Committed by Greg Kroah-Hartman
Browse files

staging: android: ion: Remove ion_handle and ion_client 



ion_handle was introduced as an abstraction to represent a reference to
a buffer via an ion_client. As frameworks outside of Ion evolved, the dmabuf
emerged as the preferred standard for use in the kernel. This has made
the ion_handle an unnecessary abstraction and prone to race
conditions. ion_client is also now only used internally. We have enough
mechanisms for race conditions and leaks already so just drop ion_handle
and ion_client. This also includes ripping out most of the debugfs
infrastructure since much of that was tied to clients and handles.
The debugfs infrastructure was prone to give confusing data (orphaned
allocations) so it can be replaced with something better if people
actually want it.

Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3b914bc

drivers/staging/android/ion/ion-ioctl.c

+7 −46
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ 
#include "ion.h"



union ion_ioctl_arg {

	struct ion_fd_data fd;

	struct ion_allocation_data allocation;

	struct ion_handle_data handle;

	struct ion_heap_query query;

};
@@ -48,8 +46,6 @@ static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg) 
static unsigned int ion_ioctl_dir(unsigned int cmd)

{

	switch (cmd) {

	case ION_IOC_FREE:

		return _IOC_WRITE;

	default:

		return _IOC_DIR(cmd);

	}
@@ -57,8 +53,6 @@ static unsigned int ion_ioctl_dir(unsigned int cmd) 


long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)

{

	struct ion_client *client = filp->private_data;

	struct ion_handle *cleanup_handle = NULL;

	int ret = 0;

	unsigned int dir;

	union ion_ioctl_arg data;
@@ -86,61 +80,28 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	switch (cmd) {

	case ION_IOC_ALLOC:

	{

		struct ion_handle *handle;

		int fd;



		handle = ion_alloc(client, data.allocation.len,

		fd = ion_alloc(data.allocation.len,

						data.allocation.heap_id_mask,

						data.allocation.flags);

		if (IS_ERR(handle))

			return PTR_ERR(handle);

		if (fd < 0)

			return fd;



		data.allocation.handle = handle->id;

		data.allocation.fd = fd;



		cleanup_handle = handle;

		break;

	}

	case ION_IOC_FREE:

	{

		struct ion_handle *handle;



		mutex_lock(&client->lock);

		handle = ion_handle_get_by_id_nolock(client,

						     data.handle.handle);

		if (IS_ERR(handle)) {

			mutex_unlock(&client->lock);

			return PTR_ERR(handle);

		}

		ion_free_nolock(client, handle);

		ion_handle_put_nolock(handle);

		mutex_unlock(&client->lock);

		break;

	}

	case ION_IOC_SHARE:

	{

		struct ion_handle *handle;



		handle = ion_handle_get_by_id(client, data.handle.handle);

		if (IS_ERR(handle))

			return PTR_ERR(handle);

		data.fd.fd = ion_share_dma_buf_fd(client, handle);

		ion_handle_put(handle);

		if (data.fd.fd < 0)

			ret = data.fd.fd;

		break;

	}

	case ION_IOC_HEAP_QUERY:

		ret = ion_query_heaps(client, &data.query);

		ret = ion_query_heaps(&data.query);

		break;

	default:

		return -ENOTTY;

	}



	if (dir & _IOC_READ) {

		if (copy_to_user((void __user *)arg, &data, _IOC_SIZE(cmd))) {

			if (cleanup_handle)

				ion_free(client, cleanup_handle);

		if (copy_to_user((void __user *)arg, &data, _IOC_SIZE(cmd)))

			return -EFAULT;

	}

	}

	return ret;

}

drivers/staging/android/ion/ion.c

+41 −660

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/android/ion/ion.h

+2 −75

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/android/uapi/ion.h

+1 −24
Original line number Diff line number Diff line
@@ -85,31 +85,8 @@ struct ion_allocation_data { 
	__u64 len;

	__u32 heap_id_mask;

	__u32 flags;

	__u32 handle;

	__u32 unused;

};



/**

 * struct ion_fd_data - metadata passed to/from userspace for a handle/fd pair

 * @handle:	a handle

 * @fd:		a file descriptor representing that handle

 *

 * For ION_IOC_SHARE or ION_IOC_MAP userspace populates the handle field with

 * the handle returned from ion alloc, and the kernel returns the file

 * descriptor to share or map in the fd field.  For ION_IOC_IMPORT, userspace

 * provides the file descriptor and the kernel returns the handle.

 */

struct ion_fd_data {

	__u32 handle;

	__u32 fd;

};



/**

 * struct ion_handle_data - a handle passed to/from the kernel

 * @handle:	a handle

 */

struct ion_handle_data {

	__u32 handle;

	__u32 unused;

};



#define MAX_HEAP_NAME			32