Commit 1d21789
wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode
[ Upstream commit 63b7af4 ]
ath11k_hal_srng_* should be used with srng->lock to protect srng data.
For ath11k_dp_rx_mon_dest_process() and ath11k_dp_full_mon_process_rx(),
they use ath11k_hal_srng_* for many times but never call srng->lock.
So when running (full) monitor mode, warning will occur:
RIP: 0010:ath11k_hal_srng_dst_peek+0x18/0x30 [ath11k]
Call Trace:
? ath11k_hal_srng_dst_peek+0x18/0x30 [ath11k]
ath11k_dp_rx_process_mon_status+0xc45/0x1190 [ath11k]
? idr_alloc_u32+0x97/0xd0
ath11k_dp_rx_process_mon_rings+0x32a/0x550 [ath11k]
ath11k_dp_service_srng+0x289/0x5a0 [ath11k]
ath11k_pcic_ext_grp_napi_poll+0x30/0xd0 [ath11k]
__napi_poll+0x30/0x1f0
net_rx_action+0x198/0x320
__do_softirq+0xdd/0x319
So add srng->lock for them to avoid such warnings.
Inorder to fetch the srng->lock, should change srng's definition from
'void' to 'struct hal_srng'. And initialize them elsewhere to prevent
one line of code from being too long. This is consistent with other ring
process functions, such as ath11k_dp_process_rx().
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
Fixes: d5c6515 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Link: https://patch.msgid.link/20241219110531.2096-3-quic_kangyang@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
Signed-off-by: Li hongliang <1468888505@139.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>1 parent 823ec0e commit 1d21789
1 file changed
Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5142 | 5142 | | |
5143 | 5143 | | |
5144 | 5144 | | |
5145 | | - | |
| 5145 | + | |
5146 | 5146 | | |
5147 | 5147 | | |
5148 | 5148 | | |
| |||
5159 | 5159 | | |
5160 | 5160 | | |
5161 | 5161 | | |
| 5162 | + | |
5162 | 5163 | | |
5163 | 5164 | | |
5164 | 5165 | | |
| |||
5217 | 5218 | | |
5218 | 5219 | | |
5219 | 5220 | | |
| 5221 | + | |
5220 | 5222 | | |
5221 | 5223 | | |
5222 | 5224 | | |
| |||
5606 | 5608 | | |
5607 | 5609 | | |
5608 | 5610 | | |
5609 | | - | |
| 5611 | + | |
5610 | 5612 | | |
5611 | 5613 | | |
5612 | 5614 | | |
| |||
5622 | 5624 | | |
5623 | 5625 | | |
5624 | 5626 | | |
| 5627 | + | |
| 5628 | + | |
| 5629 | + | |
5625 | 5630 | | |
5626 | 5631 | | |
5627 | 5632 | | |
| |||
5665 | 5670 | | |
5666 | 5671 | | |
5667 | 5672 | | |
| 5673 | + | |
5668 | 5674 | | |
5669 | 5675 | | |
5670 | 5676 | | |
| |||
0 commit comments