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

Commit 9832546f authored by Manoj Prabhu B's avatar Manoj Prabhu B Committed by Chris Lew
Browse files

diag: Synchronize threads to fix possible deadlock 



This patch fixes the possible deadlock during processing
of feature mask between different peripherals.

CRs-Fixed: 1101672
Change-Id: I4d4223275c03017ef367bafa8e55be1803b9a750
Signed-off-by: default avatarManoj Prabhu B <bmanoj@codeaurora.org>
parent 078824f1

drivers/char/diag/diagchar.h

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ struct diagchar_dev { 
	struct mutex diag_id_mutex;

	struct mutex cmd_reg_mutex;

	uint32_t cmd_reg_count;

	struct mutex diagfwd_channel_mutex;

	struct mutex diagfwd_channel_mutex[NUM_PERIPHERALS];

	/* Sizes that reflect memory pool sizes */

	unsigned int poolsize;

	unsigned int poolsize_hdlc;

drivers/char/diag/diagchar_core.c

+3 −2
Original line number Diff line number Diff line
@@ -3416,7 +3416,7 @@ static int diagchar_cleanup(void) 
static int __init diagchar_init(void)

{

	dev_t dev;

	int ret;

	int ret, i;



	pr_debug("diagfwd initializing ..\n");

	ret = 0;
@@ -3463,7 +3463,8 @@ static int __init diagchar_init(void) 
	mutex_init(&driver->diag_file_mutex);

	mutex_init(&driver->delayed_rsp_mutex);

	mutex_init(&apps_data_mutex);

	mutex_init(&driver->diagfwd_channel_mutex);

	for (i = 0; i < NUM_PERIPHERALS; i++)

		mutex_init(&driver->diagfwd_channel_mutex[i]);

	init_waitqueue_head(&driver->wait_q);

	INIT_WORK(&(driver->diag_drain_work), diag_drain_work_fn);

	INIT_WORK(&(driver->update_user_clients),

drivers/char/diag/diagfwd_peripheral.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -646,7 +646,7 @@ void diagfwd_close_transport(uint8_t transport, uint8_t peripheral) 


	}



	mutex_lock(&driver->diagfwd_channel_mutex);

	mutex_lock(&driver->diagfwd_channel_mutex[peripheral]);

	fwd_info = &early_init_info[transport][peripheral];

	if (fwd_info->p_ops && fwd_info->p_ops->close)

		fwd_info->p_ops->close(fwd_info->ctxt);
@@ -670,7 +670,7 @@ void diagfwd_close_transport(uint8_t transport, uint8_t peripheral) 
		diagfwd_late_open(dest_info);

	diagfwd_cntl_open(dest_info);

	init_fn(peripheral);

	mutex_unlock(&driver->diagfwd_channel_mutex);

	mutex_unlock(&driver->diagfwd_channel_mutex[peripheral]);

	diagfwd_queue_read(&peripheral_info[TYPE_DATA][peripheral]);

	diagfwd_queue_read(&peripheral_info[TYPE_CMD][peripheral]);

}

drivers/char/diag/diagfwd_socket.c

+8 −8
Original line number Diff line number Diff line
@@ -1086,9 +1086,9 @@ static int diag_socket_read(void *ctxt, unsigned char *buf, int buf_len) 
				      (info->data_ready > 0) || (!info->hdl) ||

				      (atomic_read(&info->diag_state) == 0));

	if (err) {

		mutex_lock(&driver->diagfwd_channel_mutex);

		mutex_lock(&driver->diagfwd_channel_mutex[info->peripheral]);

		diagfwd_channel_read_done(info->fwd_ctxt, buf, 0);

		mutex_unlock(&driver->diagfwd_channel_mutex);

		mutex_unlock(&driver->diagfwd_channel_mutex[info->peripheral]);

		return -ERESTARTSYS;

	}
@@ -1100,9 +1100,9 @@ static int diag_socket_read(void *ctxt, unsigned char *buf, int buf_len) 
		DIAG_LOG(DIAG_DEBUG_PERIPHERALS,

			 "%s closing read thread. diag state is closed\n",

			 info->name);

		mutex_lock(&driver->diagfwd_channel_mutex);

		mutex_lock(&driver->diagfwd_channel_mutex[info->peripheral]);

		diagfwd_channel_read_done(info->fwd_ctxt, buf, 0);

		mutex_unlock(&driver->diagfwd_channel_mutex);

		mutex_unlock(&driver->diagfwd_channel_mutex[info->peripheral]);

		return 0;

	}
@@ -1169,10 +1169,10 @@ static int diag_socket_read(void *ctxt, unsigned char *buf, int buf_len) 
	if (total_recd > 0) {

		DIAG_LOG(DIAG_DEBUG_PERIPHERALS, "%s read total bytes: %d\n",

			 info->name, total_recd);

		mutex_lock(&driver->diagfwd_channel_mutex);

		mutex_lock(&driver->diagfwd_channel_mutex[info->peripheral]);

		err = diagfwd_channel_read_done(info->fwd_ctxt,

						buf, total_recd);

		mutex_unlock(&driver->diagfwd_channel_mutex);

		mutex_unlock(&driver->diagfwd_channel_mutex[info->peripheral]);

		if (err)

			goto fail;

	} else {
@@ -1185,9 +1185,9 @@ static int diag_socket_read(void *ctxt, unsigned char *buf, int buf_len) 
	return 0;



fail:

	mutex_lock(&driver->diagfwd_channel_mutex);

	mutex_lock(&driver->diagfwd_channel_mutex[info->peripheral]);

	diagfwd_channel_read_done(info->fwd_ctxt, buf, 0);

	mutex_unlock(&driver->diagfwd_channel_mutex);

	mutex_unlock(&driver->diagfwd_channel_mutex[info->peripheral]);

	return -EIO;

}