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-15 01:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Avoid deadlock with pdev lock

Browse source 
The locks have to be taken by the caller. Handling inside
inline APIs are causing deadlock in few paths due to order of the locks.

With these locks the order is missing.

PDEV lock should be taken prior to vdev lock, and psoc lock should be taken
before taking pdev lock, same for peer and vdev locks also. taking the locks
other order would cause deadlock

Change-Id: I23d83329a0752981974726454d9e1bc1cfd1398f
CRs-Fixed: 2022458
This commit is contained in:
Srinivas Pitla 2017-05-24 18:10:07 +05:30 • committed by snandini
commit 5bdb69bd91
5 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
View file

@ -226,7 +226,7 @@ typedef enum {
*/
static inline char *string_from_dbgid(wlan_objmgr_ref_dbgid id)
{
static const char *strings[] = { "WLAN_OBJMGR_ID",
static const char *strings[] = { "WLAN_OBJMGR_ID",
"WLAN_MLME_SB_ID",
"WLAN_MLME_NB_ID",
"WLAN_MGMT_SB_ID",
@ -253,7 +253,7 @@ static inline char *string_from_dbgid(wlan_objmgr_ref_dbgid id)
"WLAN_SPECTRAL_ID",
"WLAN_REF_ID_MAX" };
return (char *)strings[id];
return (char *)strings[id];
}
#ifdef WLAN_OBJMGR_DEBUG

8
umac/cmn_services/obj_mgr/inc/wlan_objmgr_pdev_obj.h
View file

@ -195,7 +195,7 @@ struct wlan_objmgr_pdev {
* Failure)
*/
struct wlan_objmgr_pdev *wlan_objmgr_pdev_obj_create(
struct wlan_objmgr_psoc *psoc, struct pdev_osif_priv *osif_priv);
struct wlan_objmgr_psoc *psoc, struct pdev_osif_priv *osif_priv);
/**
* wlan_objmgr_pdev_obj_delete() - pdev delete
@ -394,6 +394,9 @@ void *wlan_objmgr_pdev_get_comp_private_obj(
* @pdev: PDEV object
*
* API to acquire PDEV lock
* Parent lock should not be taken in child lock context
* but child lock can be taken in parent lock context
* (for ex: psoc lock can't be invoked in pdev/vdev/peer lock context)
*
* Return: void
*/
@ -608,7 +611,8 @@ static inline void wlan_pdev_set_hw_macaddr(struct wlan_objmgr_pdev *pdev,
*
* Return: ospriv - private pointer
*/
static inline struct pdev_osif_priv *wlan_pdev_get_ospriv(struct wlan_objmgr_pdev *pdev)
static inline struct pdev_osif_priv *wlan_pdev_get_ospriv(
struct wlan_objmgr_pdev *pdev)
{
/* This API is invoked with lock acquired, do not add log prints */
return pdev->pdev_nif.pdev_ospriv;

3
umac/cmn_services/obj_mgr/inc/wlan_objmgr_peer_obj.h
View file

@ -310,6 +310,9 @@ void *wlan_objmgr_peer_get_comp_private_obj(
* @psoc: PEER object
*
* API to acquire PEER spin lock
* Parent lock should not be taken in child lock context
* but child lock can be taken in parent lock context
* (for ex: psoc lock can't be invoked in pdev/vdev/peer lock context)
*
* Return: void
*/

3
umac/cmn_services/obj_mgr/inc/wlan_objmgr_psoc_obj.h
View file

@ -728,6 +728,9 @@ struct wlan_objmgr_vdev *wlan_objmgr_get_vdev_by_macaddr_from_psoc_no_state(
* @psoc: PSOC object
*
* API to acquire PSOC lock
* Parent lock should not be taken in child lock context
* but child lock can be taken in parent lock context
* (for ex: psoc lock can't be invoked in pdev/vdev/peer lock context)
*
* Return: void
*/

5
umac/cmn_services/obj_mgr/inc/wlan_objmgr_vdev_obj.h
View file

@ -604,9 +604,7 @@ static inline struct wlan_objmgr_psoc *wlan_vdev_get_psoc(
if (pdev == NULL)
return NULL;
wlan_pdev_obj_lock(pdev);
psoc = wlan_pdev_get_psoc(pdev);
wlan_pdev_obj_unlock(pdev);
return psoc;
}
@ -820,6 +818,9 @@ static inline QDF_STATUS wlan_vdev_mlme_get_ssid(
* @vdev: VDEV object
*
* API to acquire VDEV lock
* Parent lock should not be taken in child lock context
* but child lock can be taken in parent lock context
* (for ex: psoc lock can't be invoked in pdev/vdev/peer lock context)
*
* Return: void
*/