alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/multiple_btm_rrm_task_v51' into 'release/v5.1'

Browse Source 
Fix race conditions in btm task deletion(v5.1)

See merge request espressif/esp-idf!24764
This commit is contained in:
Jiang Jiang Jian 2023-07-14 08:10:39 +08:00
commit 7d6a86062b
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
components/wpa_supplicant/esp_supplicant/src/esp_common.c
View File

@ -40,6 +40,7 @@ struct wpa_supplicant g_wpa_supp;
static void *s_supplicant_task_hdl = NULL; static void *s_supplicant_task_hdl = NULL;
static void *s_supplicant_evt_queue = NULL; static void *s_supplicant_evt_queue = NULL;
static void *s_supplicant_api_lock = NULL; static void *s_supplicant_api_lock = NULL;
static bool s_supplicant_task_init_done;
#define SUPPLICANT_API_LOCK() os_mutex_lock(s_supplicant_api_lock) #define SUPPLICANT_API_LOCK() os_mutex_lock(s_supplicant_api_lock)
#define SUPPLICANT_API_UNLOCK() os_mutex_unlock(s_supplicant_api_lock) #define SUPPLICANT_API_UNLOCK() os_mutex_unlock(s_supplicant_api_lock)
#define SUPPLICANT_TASK_STACK_SIZE (6144 + TASK_STACK_SIZE_ADD) #define SUPPLICANT_TASK_STACK_SIZE (6144 + TASK_STACK_SIZE_ADD)
@ -155,11 +156,6 @@ static void btm_rrm_task(void *pvParameters)
os_queue_delete(s_supplicant_evt_queue); os_queue_delete(s_supplicant_evt_queue);
s_supplicant_evt_queue = NULL; s_supplicant_evt_queue = NULL;
if (s_supplicant_api_lock) {
os_semphr_delete(s_supplicant_api_lock);
s_supplicant_api_lock = NULL;
}
/* At this point, we completed */ /* At this point, we completed */
os_task_delete(NULL); os_task_delete(NULL);
} }
@ -325,7 +321,10 @@ int esp_supplicant_common_init(struct wpa_funcs *wpa_cb)
#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) || defined(CONFIG_SAE_PK) #if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) || defined(CONFIG_SAE_PK)
#ifdef CONFIG_SUPPLICANT_TASK #ifdef CONFIG_SUPPLICANT_TASK
s_supplicant_api_lock = os_recursive_mutex_create(); if (!s_supplicant_api_lock) {
s_supplicant_api_lock = os_recursive_mutex_create();
}
if (!s_supplicant_api_lock) { if (!s_supplicant_api_lock) {
wpa_printf(MSG_ERROR, "%s: failed to create Supplicant API lock", __func__); wpa_printf(MSG_ERROR, "%s: failed to create Supplicant API lock", __func__);
ret = -1; ret = -1;
@ -345,6 +344,7 @@ int esp_supplicant_common_init(struct wpa_funcs *wpa_cb)
ret = -1; ret = -1;
goto err; goto err;
} }
s_supplicant_task_init_done = true;
#endif /* CONFIG_SUPPLICANT_TASK */ #endif /* CONFIG_SUPPLICANT_TASK */
#ifdef CONFIG_IEEE80211KV #ifdef CONFIG_IEEE80211KV
wpas_rrm_reset(wpa_s); wpas_rrm_reset(wpa_s);
@ -390,7 +390,8 @@ void esp_supplicant_common_deinit(void)
} }
#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) #if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R)
#ifdef CONFIG_SUPPLICANT_TASK #ifdef CONFIG_SUPPLICANT_TASK
if (!s_supplicant_task_hdl && esp_supplicant_post_evt(SIG_SUPPLICANT_DEL_TASK, 0) != 0) { /* We have failed to create task, delete queue and exit */
if (!s_supplicant_task_hdl) {
if (s_supplicant_evt_queue) { if (s_supplicant_evt_queue) {
os_queue_delete(s_supplicant_evt_queue); os_queue_delete(s_supplicant_evt_queue);
s_supplicant_evt_queue = NULL; s_supplicant_evt_queue = NULL;
@ -399,7 +400,14 @@ void esp_supplicant_common_deinit(void)
os_semphr_delete(s_supplicant_api_lock); os_semphr_delete(s_supplicant_api_lock);
s_supplicant_api_lock = NULL; s_supplicant_api_lock = NULL;
} }
} else if (esp_supplicant_post_evt(SIG_SUPPLICANT_DEL_TASK, 0) != 0) {
/* failed to post delete event, just delete event queue and exit */
if (s_supplicant_evt_queue) {
os_queue_delete(s_supplicant_evt_queue);
s_supplicant_evt_queue = NULL;
}
} }
s_supplicant_task_init_done = false;
#endif /* CONFIG_SUPPLICANT_TASK */ #endif /* CONFIG_SUPPLICANT_TASK */
#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */ #endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
} }
@ -790,27 +798,32 @@ cleanup:
int esp_supplicant_post_evt(uint32_t evt_id, uint32_t data) int esp_supplicant_post_evt(uint32_t evt_id, uint32_t data)
{ {
supplicant_event_t *evt = os_zalloc(sizeof(supplicant_event_t)); supplicant_event_t *evt = os_zalloc(sizeof(supplicant_event_t));
if (evt == NULL) { if (!evt) {
wpa_printf(MSG_ERROR, "Failed to allocated memory");
return -1; return -1;
} }
evt->id = evt_id; evt->id = evt_id;
evt->data = data; evt->data = data;
/* Make sure lock exists before taking it */ /* Make sure lock exists before taking it */
if (s_supplicant_api_lock) { SUPPLICANT_API_LOCK();
SUPPLICANT_API_LOCK();
} else { /* Make sure no event can be sent when deletion event is sent or task not initialized */
if (!s_supplicant_task_init_done) {
SUPPLICANT_API_UNLOCK();
os_free(evt); os_free(evt);
return -1; return -1;
} }
if (os_queue_send(s_supplicant_evt_queue, &evt, os_task_ms_to_tick(10)) != TRUE) { if (os_queue_send(s_supplicant_evt_queue, &evt, os_task_ms_to_tick(10)) != TRUE) {
SUPPLICANT_API_UNLOCK(); SUPPLICANT_API_UNLOCK();
os_free(evt); os_free(evt);
return -1; return -1;
} }
if (evt_id != SIG_SUPPLICANT_DEL_TASK) { if (evt_id == SIG_SUPPLICANT_DEL_TASK) {
SUPPLICANT_API_UNLOCK(); s_supplicant_task_init_done = false;
} }
SUPPLICANT_API_UNLOCK();
return 0; return 0;
} }
#endif /* CONFIG_SUPPLICANT_TASK */ #endif /* CONFIG_SUPPLICANT_TASK */