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

qcacmn: Fix race condition of mlo disconnect/connect

Browse Source 
Currently, link vdev is triggered to connect process
after assoc vdev connects successfully in function
mlo_send_link_connect. If osif_cm_disconnect_sync is
invoked during assoc vdev connection, the disconnect
command for link vdev is dropped since it is in INIT
state. Then it only queues the disconnect command for
assoc vdev. After link vdev connects successfully, it
process the disconnect command for assoc vdev, and F/W
assert happens because deleting assoc peer before link
peer.

To resolve the issue, invoking wlan_cm_disconnect with
source CM_MLO_LINK_VDEV_DISCONNECT for each link vdev
in function cm_disconnect_start for assoc vdev.

Change-Id: Id0d0607d4374ed48513f15e5e3f5dfe499087935
CRs-Fixed: 3346737
This commit is contained in:
Paul Zhang
2022-11-28 10:14:56 +08:00
committed by Madan Koyyalamudi
parent 43b4691c62
commit a4660a051d
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
umac/mlo_mgr/src/wlan_mlo_mgr_sta.c
View File

@@ -820,17 +820,12 @@ static QDF_STATUS ml_activate_pend_disconn_req_cb(struct scheduler_msg *msg)
mlo_dev_ctx = vdev->mlo_dev_ctx;
sta_ctx = mlo_dev_ctx->sta_ctx;
if (sta_ctx->disconn_req) {
mlo_disconnect(vdev, sta_ctx->disconn_req->source,
sta_ctx->disconn_req->reason_code,
&sta_ctx->disconn_req->bssid);
qdf_mem_free(sta_ctx->disconn_req);
sta_ctx->disconn_req = NULL;
} else {
mlo_disconnect(vdev, CM_MLME_DISCONNECT,
REASON_DEAUTH_NETWORK_LEAVING,
NULL);
}
mlo_disconnect(vdev, sta_ctx->disconn_req->source,
sta_ctx->disconn_req->reason_code,
&sta_ctx->disconn_req->bssid);
qdf_mem_free(sta_ctx->disconn_req);
sta_ctx->disconn_req = NULL;
wlan_objmgr_vdev_release_ref(vdev, WLAN_MLO_MGR_ID);
return QDF_STATUS_SUCCESS;
@@ -959,7 +954,6 @@ void mlo_sta_link_connect_notify(struct wlan_objmgr_vdev *vdev,
{
struct wlan_mlo_dev_context *mlo_dev_ctx = vdev->mlo_dev_ctx;
struct wlan_mlo_sta *sta_ctx = NULL;
struct wlan_objmgr_vdev *assoc_vdev;
if (mlo_dev_ctx) {
sta_ctx = mlo_dev_ctx->sta_ctx;
@@ -975,18 +969,6 @@ void mlo_sta_link_connect_notify(struct wlan_objmgr_vdev *vdev,
return;
}
assoc_vdev = mlo_get_assoc_link_vdev(vdev->mlo_dev_ctx);
if (assoc_vdev && QDF_IS_STATUS_SUCCESS(rsp->connect_status) &&
!wlan_cm_is_vdev_connected(assoc_vdev)) {
mlo_debug("Handle pending disconnect for vdev %d",
wlan_vdev_get_id(vdev));
if (assoc_vdev != vdev)
mlo_disconnect(vdev, CM_MLME_DISCONNECT,
REASON_DEAUTH_NETWORK_LEAVING,
NULL);
return;
}
if (wlan_cm_is_vdev_disconnected(vdev))
mlo_free_copied_conn_req(sta_ctx);
@@ -1048,19 +1030,19 @@ mlo_send_link_disconnect_sync(struct wlan_mlo_dev_context *mlo_dev_ctx,
enum wlan_reason_code reason_code,
struct qdf_mac_addr *bssid)
{
uint8_t i = 0;
uint8_t i;
struct wlan_objmgr_vdev *assoc_vdev =
mlo_get_assoc_link_vdev(mlo_dev_ctx);
if (!assoc_vdev)
return QDF_STATUS_E_FAILURE;
for (i = 0; i < WLAN_UMAC_MLO_MAX_VDEVS; i++) {
for (i = 0; i < WLAN_UMAC_MLO_MAX_VDEVS; i++) {
if (!mlo_dev_ctx->wlan_vdev_list[i])
continue;
if (mlo_dev_ctx->wlan_vdev_list[i] !=
mlo_get_assoc_link_vdev(mlo_dev_ctx))
mlo_get_assoc_link_vdev(mlo_dev_ctx))
wlan_cm_disconnect_sync(mlo_dev_ctx->wlan_vdev_list[i],
source, reason_code);
}
@@ -1829,11 +1811,11 @@ void mlo_internal_disconnect_links(struct wlan_objmgr_vdev *vdev)
mlo_sta_get_vdev_list(vdev, &vdev_count, wlan_vdev_list);
for (i = 0; i < vdev_count; i++) {
if (qdf_test_bit(i, sta_ctx->wlan_connected_links) &&
wlan_vdev_list[i] !=
mlo_get_assoc_link_vdev(mlo_dev_ctx))
if (wlan_vdev_list[i] != mlo_get_assoc_link_vdev(mlo_dev_ctx) &&
(wlan_cm_is_vdev_connected(wlan_vdev_list[i]) ||
wlan_cm_is_vdev_connecting(wlan_vdev_list[i])))
wlan_cm_disconnect(wlan_vdev_list[i],
CM_INTERNAL_DISCONNECT,
CM_MLO_LINK_VDEV_DISCONNECT,
REASON_UNSPEC_FAILURE,
NULL);
mlo_release_vdev_ref(wlan_vdev_list[i]);