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

Commit 91c79a66 authored by Sumukh Hallymysore Ravindra's avatar Sumukh Hallymysore Ravindra
Browse files

msm: synx: remove synx client handling based on pid 



Change removes the pid info stored for each client along with
redundant searching of current client session based on pid.
Instead, current client session info already stored in private
data is used.

Change-Id: I61d3cc27539a6f0efbcf364ec463c4b8093dbbe7
Signed-off-by: default avatarSumukh Hallymysore Ravindra <shallymy@codeaurora.org>
parent cd914bbc

drivers/media/platform/msm/synx/synx.c

+16 −31
Original line number Diff line number Diff line
@@ -890,7 +890,8 @@ static int synx_handle_wait(struct synx_private_ioctl_arg *k_ioctl) 
}



static int synx_handle_register_user_payload(

	struct synx_private_ioctl_arg *k_ioctl)

	struct synx_private_ioctl_arg *k_ioctl,

	struct synx_client *client)

{

	s32 synx_obj;

	u32 state = SYNX_STATE_INVALID;
@@ -898,7 +899,6 @@ static int synx_handle_register_user_payload( 
	struct synx_cb_data *user_payload_kernel;

	struct synx_cb_data *user_payload_iter, *temp;

	struct synx_table_row *row = NULL;

	struct synx_client *client = NULL;



	pr_debug("Enter %s\n", __func__);
@@ -917,12 +917,8 @@ static int synx_handle_register_user_payload( 
		return -EINVAL;

	}



	mutex_lock(&synx_dev->table_lock);

	client = get_current_client();

	mutex_unlock(&synx_dev->table_lock);



	if (!client) {

		pr_err("couldn't find client for process %d\n", current->tgid);

		pr_err("invalid client for process %d\n", current->pid);

		return -EINVAL;

	}
@@ -972,11 +968,11 @@ static int synx_handle_register_user_payload( 
}



static int synx_handle_deregister_user_payload(

	struct synx_private_ioctl_arg *k_ioctl)

	struct synx_private_ioctl_arg *k_ioctl,

	struct synx_client *client)

{

	s32 synx_obj;

	u32 state = SYNX_STATE_INVALID;

	struct synx_client *client = NULL;

	struct synx_userpayload_info userpayload_info;

	struct synx_cb_data *user_payload_kernel, *temp;

	struct synx_table_row *row = NULL;
@@ -999,12 +995,8 @@ static int synx_handle_deregister_user_payload( 
		return -EINVAL;

	}



	mutex_lock(&synx_dev->table_lock);

	client = get_current_client();

	mutex_unlock(&synx_dev->table_lock);



	if (!client) {

		pr_err("couldn't find client for process %d\n", current->tgid);

		pr_err("invalid client for process %d\n", current->pid);

		return -EINVAL;

	}
@@ -1124,11 +1116,13 @@ static long synx_ioctl(struct file *filep, 
{

	s32 rc = 0;

	struct synx_device *synx_dev = NULL;

	struct synx_client *client;

	struct synx_private_ioctl_arg k_ioctl;



	pr_debug("Enter %s\n", __func__);



	synx_dev = get_synx_device(filep);

	client = filep->private_data;



	if (cmd != SYNX_PRIVATE_IOCTL_CMD) {

		pr_err("invalid ioctl cmd\n");
@@ -1154,11 +1148,11 @@ static long synx_ioctl(struct file *filep, 
		break;

	case SYNX_REGISTER_PAYLOAD:

		rc = synx_handle_register_user_payload(

			&k_ioctl);

			&k_ioctl, client);

		break;

	case SYNX_DEREGISTER_PAYLOAD:

		rc = synx_handle_deregister_user_payload(

			&k_ioctl);

			&k_ioctl, client);

		break;

	case SYNX_SIGNAL:

		rc = synx_handle_signal(&k_ioctl);
@@ -1266,7 +1260,7 @@ static int synx_open(struct inode *inode, struct file *filep) 
	struct synx_device *synx_dev = NULL;

	struct synx_client *client = NULL;



	pr_debug("Enter %s from pid: %d\n", __func__, current->tgid);

	pr_debug("Enter %s from pid: %d\n", __func__, current->pid);



	synx_dev = container_of(inode->i_cdev, struct synx_device, cdev);
@@ -1275,7 +1269,6 @@ static int synx_open(struct inode *inode, struct file *filep) 
		return -ENOMEM;



	client->device = synx_dev;

	client->pid = current->tgid;

	init_waitqueue_head(&client->wq);

	INIT_LIST_HEAD(&client->eventq);

	spin_lock_init(&client->eventq_lock);
@@ -1297,12 +1290,13 @@ static int synx_close(struct inode *inode, struct file *filep) 
	int rc = 0;

	int i;

	struct synx_device *synx_dev = NULL;

	struct synx_client *client, *tmp_client;

	struct synx_client *client;

	struct synx_import_data *data, *tmp_data;



	pr_debug("Enter %s\n", __func__);

	pr_debug("Enter %s from pid: %d\n", __func__, current->pid);



	synx_dev = get_synx_device(filep);

	client = filep->private_data;



	mutex_lock(&synx_dev->table_lock);
@@ -1377,17 +1371,8 @@ static int synx_close(struct inode *inode, struct file *filep) 
		}

	}



	list_for_each_entry_safe(client, tmp_client,

		&synx_dev->client_list, list) {

		if (current->tgid == client->pid) {

			pr_debug("deleting client for process %d\n",

				client->pid);

	list_del_init(&client->list);

	kfree(client);

			break;

		}

	}



	mutex_unlock(&synx_dev->table_lock);



	pr_debug("Exit %s\n", __func__);

drivers/media/platform/msm/synx/synx_private.h

+0 −2
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ struct synx_device { 
 * specific details

 *

 * @device      : Pointer to synx device structure

 * @pid         : Process id

 * @eventq_lock : Spinlock for the event queue

 * @wq          : Queue for the polling process

 * @eventq      : All the user callback payloads
@@ -239,7 +238,6 @@ struct synx_device { 
 */

struct synx_client {

	struct synx_device *device;

	int pid;

	spinlock_t eventq_lock;

	wait_queue_head_t wq;

	struct list_head eventq;

drivers/media/platform/msm/synx/synx_util.c

+0 −11
Original line number Diff line number Diff line
@@ -584,17 +584,6 @@ s32 synx_create_handle(void *pObj) 
	return id;

}



struct synx_client *get_current_client(void)

{

	struct synx_client *client = NULL;



	list_for_each_entry(client, &synx_dev->client_list, list) {

		if (current->tgid == client->pid)

			break;

	}

	return client;

}



int synx_generate_secure_key(struct synx_table_row *row)

{

	if (!row)

drivers/media/platform/msm/synx/synx_util.h

+0 −7
Original line number Diff line number Diff line
@@ -159,13 +159,6 @@ u32 synx_status(struct synx_table_row *row); 
 */

u32 synx_status_locked(struct synx_table_row *row);



/**

 * @brief: Function to return the current client (active process)

 *

 * @return The current client

 */

struct synx_client *get_current_client(void);



/**

 * @brief: Function to look up a synx handle

 *         It also verifies the authenticity of the request through