qcacmn: Always free nol timer before free pdev

When wlan target asserts, driver will trigger shutdown and reinit to
do recovery. In shutdown, when pdev is freed and dfs_detach is called,
dfs->dfs_nol should be freed. If at the same time dfs_remove_from_nol
is triggered in another CPU, a race condition may happen as follows:
NOL is moved from dfs->dfs_nol to dfs->dfs_nol_free_list in function
dfs_remove_from_nol, then dfs_detach sets dfs->dfs_pdev_obj to NULL
without freeing the corresponding NOL timer. QDF_ASSERT happens at this
time if the function dfs_remove_from_nol continues to execute.

To be specific: The timer expiry function dfs_remove_from_nol calls
several umac functions e.g. dfs_mlme_nol_timeout_notification which
needs dfs->dfs_pdev_obj as an argument. However, the dfs->dfs_pdev_obj
is set to NULL by wlan_dfs_pdev_obj_destroy_notification function. Even
though before dfs->dfs_pdev_obj is set to NULL, the
wlan_dfs_pdev_obj_destroy_notification waits for the workqueue
qdf_flush_work(&dfs->dfs_nol_elem_free_work) which in turn waits for the
timer epiry function, scheduling of the workqueue seems to have happened
after qdf_flush_work(&dfs->dfs_nol_elem_free_work) in this case. If
qdf_flush_work happens before the workqueue is scheduled then
qdf_flush_work does not wait for the workqueue and therefore we do not
wait for the timer expiry function before setting dfs->dfs_pdev_obj to
NULL.

To fix the race condition, trigger dfs->dfs_nol_elem_free_work
immediately after dfs_nol_delete.

Change-Id: I9fc07231b07139ebe794fc7cc94d2a8ab307c69f
CRs-Fixed: 2400959
This commit is contained in:
bings
2019-02-19 17:59:45 +08:00
zatwierdzone przez nshrivas
rodzic 644f7c48dd
commit 6df21d1f29
2 zmienionych plików z 6 dodań i 7 usunięć

Wyświetl plik

@@ -338,10 +338,16 @@
WLAN_DFSNOL_UNLOCK(dfs); \
} while (0)
/*
* Free the NOL element in a thread. This is to avoid freeing the
* timer object from within timer callback function . The nol element
* contains the timer Object.
*/
#define DFS_NOL_DELETE_CHAN_LOCKED(dfs, freq, chwidth) \
do { \
WLAN_DFSNOL_LOCK(dfs); \
dfs_nol_delete(dfs, freq, chwidth); \
qdf_sched_work(NULL, &dfs->dfs_nol_elem_free_work); \
WLAN_DFSNOL_UNLOCK(dfs); \
} while (0)

Wyświetl plik

@@ -254,13 +254,6 @@ static os_timer_func(dfs_remove_from_nol)
utils_dfs_reg_update_nol_ch(dfs->dfs_pdev_obj,
&chan, 1, DFS_NOL_RESET);
utils_dfs_save_nol(dfs->dfs_pdev_obj);
/*
* Free the NOL element in a thread. This is to avoid freeing the
* timer object from within timer callback function . The nol element
* contains the timer Object.
*/
qdf_sched_work(NULL, &dfs->dfs_nol_elem_free_work);
}
void dfs_print_nol(struct wlan_dfs *dfs)