From nobody Sun Feb 8 22:22:47 2026 Received: from n169-110.mail.139.com (n169-110.mail.139.com [120.232.169.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9A8F1509AB; Tue, 3 Feb 2026 03:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=120.232.169.110 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770088447; cv=none; b=sKhsZCvIbBQfcDnl9bccVYqopzSu8w9RSwNq1oWZ+kh8l+ioSPRE+NpEzlwoR6LvHIHSqU/JUDGhYJkbjNXgaoKAHQdDH261KmGiZJea3H8kdxYipUoyljMRqBGuDc2BimEyPVqT2EgcI6G5C9mXs68YTSfTgMX0/A4aDbgQbp4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770088447; c=relaxed/simple; bh=SS5F5dyw8QnB6n9567Uf4Xb0YdzCcKXxnN7nDnfU4zQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=tl5499QbBmgmncsV+jEeiIhOWrdYfE6EC16FpLMOqoR/EfWBkBHlSE6BPJlvVRsLWN+YKt8tT2CT77CiTavzqzvzcr9r+FB4E0t/8IondqryqheN5/AYG92yN54EmATS1sH6b6wDcNAkWHs1JTQLaLk4mWfPm4uYKT5x4ddURM0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=139.com; spf=pass smtp.mailfrom=139.com; dkim=pass (1024-bit key) header.d=139.com header.i=@139.com header.b=CM3Ge6Vl; arc=none smtp.client-ip=120.232.169.110 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=139.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=139.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=139.com header.i=@139.com header.b="CM3Ge6Vl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=139.com; s=dkim; l=0; h=from:subject:message-id:to:cc:mime-version; bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=CM3Ge6Vl/N/TAHyFvv+Y5RzRTyxtfIPEz2RiQcpYL+c/5lgcR612aXhP5d+NNtZ03kgdt2HiSXLGR PCkIoTN9MYPVIX3cA3jgUt49wc0pBRYs4DoTXFCc1wWljj2/kC71jsSnaCIFl16AEsTmEB/ciIBukL JVEysUxkHbj9dKlw= X-RM-TagInfo: emlType=0 X-RM-SPAM: X-RM-SPAM-FLAG: 00000000 Received: from NTT-kernel-dev (unknown[60.247.85.88]) by rmsmtp-lg-appmail-03-12081 (RichMail) with SMTP id 2f31698167e54ae-024dc; Tue, 03 Feb 2026 11:13:47 +0800 (CST) X-RM-TRANSID: 2f31698167e54ae-024dc From: Li hongliang <1468888505@139.com> To: gregkh@linuxfoundation.org, stable@vger.kernel.org, quic_kangyang@quicinc.com Cc: patches@lists.linux.dev, linux-kernel@vger.kernel.org, kvalo@kernel.org, jjohnson@kernel.org, quic_vthiagar@quicinc.com, quic_vnaralas@quicinc.com, quic_msinada@quicinc.com, gseset@codeaurora.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, quic_jjohnson@quicinc.com, jeff.johnson@oss.qualcomm.com Subject: [PATCH 6.12.y] wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode Date: Tue, 3 Feb 2026 11:13:55 +0800 Message-Id: <20260203031355.1359867-1-1468888505@139.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kang Yang [ Upstream commit 63b7af49496d0e32f7a748b6af3361ec138b1bd3 ] 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_L= ITE-3.6510.30 Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") Signed-off-by: Kang Yang Acked-by: Jeff Johnson Link: https://patch.msgid.link/20241219110531.2096-3-quic_kangyang@quicinc.= com Signed-off-by: Jeff Johnson Signed-off-by: Li hongliang <1468888505@139.com> --- drivers/net/wireless/ath/ath11k/dp_rx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless= /ath/ath11k/dp_rx.c index 9373bfe50526..ff97c2649ce5 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -5142,7 +5142,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath1= 1k *ar, int mac_id, struct ath11k_mon_data *pmon =3D (struct ath11k_mon_data *)&dp->mon_data; const struct ath11k_hw_hal_params *hal_params; void *ring_entry; - void *mon_dst_srng; + struct hal_srng *mon_dst_srng; u32 ppdu_id; u32 rx_bufs_used; u32 ring_id; @@ -5159,6 +5159,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath1= 1k *ar, int mac_id, =20 spin_lock_bh(&pmon->mon_lock); =20 + spin_lock_bh(&mon_dst_srng->lock); ath11k_hal_srng_access_begin(ar->ab, mon_dst_srng); =20 ppdu_id =3D pmon->mon_ppdu_info.ppdu_id; @@ -5217,6 +5218,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath1= 1k *ar, int mac_id, mon_dst_srng); } ath11k_hal_srng_access_end(ar->ab, mon_dst_srng); + spin_unlock_bh(&mon_dst_srng->lock); =20 spin_unlock_bh(&pmon->mon_lock); =20 @@ -5606,7 +5608,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11= k_base *ab, int mac_id, struct hal_sw_mon_ring_entries *sw_mon_entries; struct ath11k_pdev_mon_stats *rx_mon_stats; struct sk_buff *head_msdu, *tail_msdu; - void *mon_dst_srng =3D &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring= _id]; + struct hal_srng *mon_dst_srng; void *ring_entry; u32 rx_bufs_used =3D 0, mpdu_rx_bufs_used; int quota =3D 0, ret; @@ -5622,6 +5624,9 @@ static int ath11k_dp_full_mon_process_rx(struct ath11= k_base *ab, int mac_id, goto reap_status_ring; } =20 + mon_dst_srng =3D &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id]; + spin_lock_bh(&mon_dst_srng->lock); + ath11k_hal_srng_access_begin(ar->ab, mon_dst_srng); while ((ring_entry =3D ath11k_hal_srng_dst_peek(ar->ab, mon_dst_srng))) { head_msdu =3D NULL; @@ -5665,6 +5670,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11= k_base *ab, int mac_id, } =20 ath11k_hal_srng_access_end(ar->ab, mon_dst_srng); + spin_unlock_bh(&mon_dst_srng->lock); spin_unlock_bh(&pmon->mon_lock); =20 if (rx_bufs_used) { --=20 2.34.1