samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Close small interface idle race window

Browse Source 
There is an interface idle work that stops the driver module in cases of
adapter inactivity. This work grabs the iface_change_lock, which is also
grabbed before synchronously cancelling the interface idle work. This can
cause a deadlock situation where cancelling the work never finishes,
because the caller holds the lock the work needs in order to complete.
Hoist the calls to cancel the work out of locked regions to avoid the
potential deadlock situation.

Change-Id: Ie421e69e2026ad1de626daba1f72d002d9751013
CRs-Fixed: 2120671
This commit is contained in:
Dustin Brown
2017-10-03 16:13:36 -07:00
committed by snandini
parent 6f42792885
commit 1fe30a8ff3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/hdd/src/wlan_hdd_driver_ops.c
View File

@@ -1427,8 +1427,9 @@ static void wlan_hdd_purge_notifier(void)
return; return;
} }
mutex_lock(&hdd_ctx->iface_change_lock);
qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work); qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work);
mutex_lock(&hdd_ctx->iface_change_lock);
cds_shutdown_notifier_call(); cds_shutdown_notifier_call();
cds_shutdown_notifier_purge(); cds_shutdown_notifier_purge();
mutex_unlock(&hdd_ctx->iface_change_lock); mutex_unlock(&hdd_ctx->iface_change_lock);

6
core/hdd/src/wlan_hdd_main.c
View File

@@ -2316,12 +2316,12 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx,
return -EINVAL; return -EINVAL;
} }
mutex_lock(&hdd_ctx->iface_change_lock);
hdd_ctx->start_modules_in_progress = true;
hdd_set_idle_ps_config(hdd_ctx, false); hdd_set_idle_ps_config(hdd_ctx, false);
qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work); qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work);
mutex_lock(&hdd_ctx->iface_change_lock);
hdd_ctx->start_modules_in_progress = true;
switch (hdd_ctx->driver_status) { switch (hdd_ctx->driver_status) {
case DRIVER_MODULES_UNINITIALIZED: case DRIVER_MODULES_UNINITIALIZED:
unint = true; unint = true;