A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: fix invalid net_dev accessing due to GRO flush timeout

Browse source 
scenario:
(1) KASAN is enabled and DP thread is slow to process and deliver
Rx packets to stack.
(2) vdev-2 do disconnection and flush Rx packets that belong to
vdev-2, but DP thread is busy with processing vdev-0 Rx pakcets
then no chance to do GRO flush for vdev-2, Rx flush timeout and
vdev-2 net_dev get freed, later when DP thread do GRO flush for
vdev-2 pakcets, invalid accessing to vdev-2 net_dev happened.

solution:
(1) increase Rx packets flush timeout from 1000 ms to 2000 ms.
(2) do extra GRO flush if timeout happened.

Change-Id: Iddc445d950eeb6cd2bd0b125bf87051e850abeb2
CRs-Fixed: 2894978
This commit is contained in:
Jinwei Chen 2021-03-09 00:43:25 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3fc56ff0c8
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/dp/txrx3.0/dp_rx_thread.c
View file

@ -25,7 +25,7 @@
#include <cds_sched.h>
/* Timeout in ms to wait for a DP rx thread */
#define DP_RX_THREAD_WAIT_TIMEOUT 1000
#define DP_RX_THREAD_WAIT_TIMEOUT 2000
#define DP_RX_TM_DEBUG 0
#if DP_RX_TM_DEBUG
@ -1029,10 +1029,17 @@ void dp_rx_thread_flush_by_vdev_id(struct dp_rx_thread *rx_thread,
if (QDF_IS_STATUS_SUCCESS(qdf_status))
dp_debug("thread:%d napi gro flush successfully",
rx_thread->id);
else if (qdf_status == QDF_STATUS_E_TIMEOUT)
else if (qdf_status == QDF_STATUS_E_TIMEOUT) {
dp_err("thread:%d timed out waiting for napi gro flush",
rx_thread->id);
else
/*
* If timeout, then force flush here in case any rx packets
* belong to this vdev is still pending on stack queue,
* while net_vdev will be freed soon.
*/
dp_rx_thread_gro_flush(rx_thread,
DP_RX_GRO_NORMAL_FLUSH);
} else
dp_err("thread:%d failed while waiting for napi gro flush",
rx_thread->id);
}