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

qcacmn: Disable bottom half in wmi show routine

Browse Source 
We have a case in which user context was reading
wmi debugfs entries and then an interrupt context
waits on same lock resulting in deadlock and cpu stall.

Disable bh to prevent cpu stall.

Change-Id: I8e2b443317950b4cf2c8c228a98f638dd165ca2b
This commit is contained in:
Uraj Sasan
2019-05-21 19:24:06 +05:30
committed by nshrivas
parent 09e10eb5e2
commit 485478ae4e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wmi/src/wmi_unified.c
View File

@@ -1054,9 +1054,9 @@ wmi_print_mgmt_event_log(wmi_unified_t wmi, uint32_t count,
int i; \ int i; \
uint64_t secs, usecs; \ uint64_t secs, usecs; \
\ \
qdf_spin_lock(&wmi_handle->log_info.wmi_record_lock); \ qdf_spin_lock_bh(&wmi_handle->log_info.wmi_record_lock);\
if (!wmi_log->length) { \ if (!wmi_log->length) { \
qdf_spin_unlock(&wmi_handle->log_info.wmi_record_lock);\ qdf_spin_unlock_bh(&wmi_handle->log_info.wmi_record_lock);\
return wmi_bp_seq_printf(m, \ return wmi_bp_seq_printf(m, \
"no elements to read from ring buffer!\n"); \ "no elements to read from ring buffer!\n"); \
} \ } \
@@ -1073,7 +1073,7 @@ wmi_print_mgmt_event_log(wmi_unified_t wmi, uint32_t count,
pos = *(wmi_log->p_buf_tail_idx) - 1; \ pos = *(wmi_log->p_buf_tail_idx) - 1; \
\ \
outlen = wmi_bp_seq_printf(m, "Length = %d\n", wmi_log->length);\ outlen = wmi_bp_seq_printf(m, "Length = %d\n", wmi_log->length);\
qdf_spin_unlock(&wmi_handle->log_info.wmi_record_lock); \ qdf_spin_unlock_bh(&wmi_handle->log_info.wmi_record_lock);\
while (nread--) { \ while (nread--) { \
struct wmi_command_debug *wmi_record; \ struct wmi_command_debug *wmi_record; \
\ \
@@ -1112,9 +1112,9 @@ wmi_print_mgmt_event_log(wmi_unified_t wmi, uint32_t count,
int i; \ int i; \
uint64_t secs, usecs; \ uint64_t secs, usecs; \
\ \
qdf_spin_lock(&wmi_handle->log_info.wmi_record_lock); \ qdf_spin_lock_bh(&wmi_handle->log_info.wmi_record_lock);\
if (!wmi_log->length) { \ if (!wmi_log->length) { \
qdf_spin_unlock(&wmi_handle->log_info.wmi_record_lock);\ qdf_spin_unlock_bh(&wmi_handle->log_info.wmi_record_lock);\
return wmi_bp_seq_printf(m, \ return wmi_bp_seq_printf(m, \
"no elements to read from ring buffer!\n"); \ "no elements to read from ring buffer!\n"); \
} \ } \
@@ -1131,7 +1131,7 @@ wmi_print_mgmt_event_log(wmi_unified_t wmi, uint32_t count,
pos = *(wmi_log->p_buf_tail_idx) - 1; \ pos = *(wmi_log->p_buf_tail_idx) - 1; \
\ \
outlen = wmi_bp_seq_printf(m, "Length = %d\n", wmi_log->length);\ outlen = wmi_bp_seq_printf(m, "Length = %d\n", wmi_log->length);\
qdf_spin_unlock(&wmi_handle->log_info.wmi_record_lock); \ qdf_spin_unlock_bh(&wmi_handle->log_info.wmi_record_lock);\
while (nread--) { \ while (nread--) { \
struct wmi_event_debug *wmi_record; \ struct wmi_event_debug *wmi_record; \
\ \
@@ -1239,12 +1239,12 @@ static int debug_wmi_log_size_show(struct seq_file *m, void *v)
return -EINVAL; \ return -EINVAL; \
} \ } \
\ \
qdf_spin_lock(&wmi_handle->log_info.wmi_record_lock); \ qdf_spin_lock_bh(&wmi_handle->log_info.wmi_record_lock);\
qdf_mem_zero(wmi_log->buf, wmi_ring_size * \ qdf_mem_zero(wmi_log->buf, wmi_ring_size * \
sizeof(struct wmi_record_type)); \ sizeof(struct wmi_record_type)); \
wmi_log->length = 0; \ wmi_log->length = 0; \
*(wmi_log->p_buf_tail_idx) = 0; \ *(wmi_log->p_buf_tail_idx) = 0; \
qdf_spin_unlock(&wmi_handle->log_info.wmi_record_lock); \ qdf_spin_unlock_bh(&wmi_handle->log_info.wmi_record_lock);\
\ \
return count; \ return count; \
} }