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

Commit 8ff24670 authored by Yu Tian's avatar Yu Tian Committed by Madan Koyyalamudi
Browse files

qcacld-3.0: use adaptive timeout value for rx thread flush 

When vdev down flag is set, rx thread needs to flush the
pending frames in a fixed timeout value. Overall scheduler
timeout value is 10s, fixed timeout for each thread is 4s,
so if more than two threads timeout happens, scheduler timeout
may happen and lead to crash. Change to use adaptive timeout
for each thread to make overall threads wait time less than 10s.

Change-Id: If8acdaf1cac9d776e15d3020c8152101eae74a0c
CRs-Fixed: 2973947
parent 90dd00b3

core/dp/txrx3.0/dp_rx_thread.c

+40 −6
Original line number Diff line number Diff line
@@ -996,20 +996,21 @@ dp_rx_refill_thread_suspend(struct dp_rx_refill_thread *refill_thread) 
 * @rx_thread - rx_thread pointer of the queue from which packets are

 *              to be flushed out

 * @vdev_id: vdev id for which packets are to be flushed

 * @wait_timeout: wait time value for rx thread to complete flush

 *

 * The function will flush the RX packets by vdev_id in a particular

 * RX thead queue. And will notify and wait the TX thread to flush the

 * packets in the NAPI RX GRO hash list

 *

 * Return: void

 * Return: Success/Failure

 */

static inline

void dp_rx_thread_flush_by_vdev_id(struct dp_rx_thread *rx_thread,

				   uint8_t vdev_id)

QDF_STATUS dp_rx_thread_flush_by_vdev_id(struct dp_rx_thread *rx_thread,

					 uint8_t vdev_id, int wait_timeout)

{

	qdf_nbuf_t nbuf_list, tmp_nbuf_list;

	uint32_t num_list_elements = 0;

	QDF_STATUS qdf_status;

	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;



	qdf_nbuf_queue_head_lock(&rx_thread->nbuf_queue);

	QDF_NBUF_QUEUE_WALK_SAFE(&rx_thread->nbuf_queue, nbuf_list,
@@ -1031,7 +1032,8 @@ void dp_rx_thread_flush_by_vdev_id(struct dp_rx_thread *rx_thread, 
	qdf_wake_up_interruptible(&rx_thread->wait_q);



	qdf_status = qdf_wait_single_event(&rx_thread->vdev_del_event,

					   DP_RX_THREAD_WAIT_TIMEOUT);

					    wait_timeout);



	if (QDF_IS_STATUS_SUCCESS(qdf_status))

		dp_debug("thread:%d napi gro flush successfully",

			 rx_thread->id);
@@ -1048,6 +1050,8 @@ void dp_rx_thread_flush_by_vdev_id(struct dp_rx_thread *rx_thread, 
	} else

		dp_err("thread:%d failed while waiting for napi gro flush",

		       rx_thread->id);



	return qdf_status;

}



/**
@@ -1059,6 +1063,34 @@ void dp_rx_thread_flush_by_vdev_id(struct dp_rx_thread *rx_thread, 
 *

 * Return: QDF_STATUS_SUCCESS

 */

#ifdef HAL_CONFIG_SLUB_DEBUG_ON

QDF_STATUS dp_rx_tm_flush_by_vdev_id(struct dp_rx_tm_handle *rx_tm_hdl,

				     uint8_t vdev_id)

{

	struct dp_rx_thread *rx_thread;

	QDF_STATUS qdf_status;

	int i;

	int wait_timeout = DP_RX_THREAD_WAIT_TIMEOUT;



	for (i = 0; i < rx_tm_hdl->num_dp_rx_threads; i++) {

		rx_thread = rx_tm_hdl->rx_thread[i];

		if (!rx_thread)

			continue;



		dp_debug("thread %d", i);

		qdf_status = dp_rx_thread_flush_by_vdev_id(rx_thread, vdev_id,

							   wait_timeout);



		/* if one thread timeout happened, shrink timeout value

		 * to 1/4 of origional value

		 */

		if (qdf_status == QDF_STATUS_E_TIMEOUT)

			wait_timeout = DP_RX_THREAD_WAIT_TIMEOUT / 4;

	}



	return QDF_STATUS_SUCCESS;

}

#else

QDF_STATUS dp_rx_tm_flush_by_vdev_id(struct dp_rx_tm_handle *rx_tm_hdl,

				     uint8_t vdev_id)

{
@@ -1071,11 +1103,13 @@ QDF_STATUS dp_rx_tm_flush_by_vdev_id(struct dp_rx_tm_handle *rx_tm_hdl, 
			continue;



		dp_debug("thread %d", i);

		dp_rx_thread_flush_by_vdev_id(rx_thread, vdev_id);

		dp_rx_thread_flush_by_vdev_id(rx_thread, vdev_id,

					      DP_RX_THREAD_WAIT_TIMEOUT);

	}



	return QDF_STATUS_SUCCESS;

}

#endif



/**

 * dp_rx_tm_resume() - resume DP RX threads