Skip to content

Commit 1d21789

Browse files
Kang Yanggregkh
authored andcommitted
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

File tree

  • drivers/net/wireless/ath/ath11k

drivers/net/wireless/ath/ath11k/dp_rx.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5142,7 +5142,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,
51425142
struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&dp->mon_data;
51435143
const struct ath11k_hw_hal_params *hal_params;
51445144
void *ring_entry;
5145-
void *mon_dst_srng;
5145+
struct hal_srng *mon_dst_srng;
51465146
u32 ppdu_id;
51475147
u32 rx_bufs_used;
51485148
u32 ring_id;
@@ -5159,6 +5159,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,
51595159

51605160
spin_lock_bh(&pmon->mon_lock);
51615161

5162+
spin_lock_bh(&mon_dst_srng->lock);
51625163
ath11k_hal_srng_access_begin(ar->ab, mon_dst_srng);
51635164

51645165
ppdu_id = pmon->mon_ppdu_info.ppdu_id;
@@ -5217,6 +5218,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,
52175218
mon_dst_srng);
52185219
}
52195220
ath11k_hal_srng_access_end(ar->ab, mon_dst_srng);
5221+
spin_unlock_bh(&mon_dst_srng->lock);
52205222

52215223
spin_unlock_bh(&pmon->mon_lock);
52225224

@@ -5606,7 +5608,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
56065608
struct hal_sw_mon_ring_entries *sw_mon_entries;
56075609
struct ath11k_pdev_mon_stats *rx_mon_stats;
56085610
struct sk_buff *head_msdu, *tail_msdu;
5609-
void *mon_dst_srng = &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id];
5611+
struct hal_srng *mon_dst_srng;
56105612
void *ring_entry;
56115613
u32 rx_bufs_used = 0, mpdu_rx_bufs_used;
56125614
int quota = 0, ret;
@@ -5622,6 +5624,9 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
56225624
goto reap_status_ring;
56235625
}
56245626

5627+
mon_dst_srng = &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id];
5628+
spin_lock_bh(&mon_dst_srng->lock);
5629+
56255630
ath11k_hal_srng_access_begin(ar->ab, mon_dst_srng);
56265631
while ((ring_entry = ath11k_hal_srng_dst_peek(ar->ab, mon_dst_srng))) {
56275632
head_msdu = NULL;
@@ -5665,6 +5670,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
56655670
}
56665671

56675672
ath11k_hal_srng_access_end(ar->ab, mon_dst_srng);
5673+
spin_unlock_bh(&mon_dst_srng->lock);
56685674
spin_unlock_bh(&pmon->mon_lock);
56695675

56705676
if (rx_bufs_used) {

0 commit comments

Comments
 (0)