[PATCH v3 0/2] wifi: ath11k: fix full monitor mode for QCN9074

[PATCH v3 0/2] wifi: ath11k: fix full monitor mode for QCN9074

[Kang Yang]

Fix a warning and a bug for full monitor mode. With these two fixes,
full monitor mode can work properly to capture packets on QCN9074.

v3:
    1. add fix tag for all patches.
    2. typo error: occurr/occur.
    3. delete unnecessary Unicode characters in patch #1.
v2:
    1. delete duplicate commit message in patch #1.
    2. explain this fix is for QCN9074.

Kang Yang (1):
  wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode

P Praneesh (1):
  wifi: ath11k: fix RCU stall while reaping monitor destination ring

 drivers/net/wireless/ath/ath11k/dp_rx.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)


base-commit: d35bb26e150d7fb7434959fad9fcaeaac99906e6
-- 
2.34.1

[PATCH v3 1/2] wifi: ath11k: fix RCU stall while reaping monitor destination ring

[Kang Yang]

From: P Praneesh <quic_ppranees@quicinc.com>

While processing the monitor destination ring, MSDUs are reaped from the
link descriptor based on the corresponding buf_id.

However, sometimes the driver cannot obtain a valid buffer corresponding
to the buf_id received from the hardware. This causes an infinite loop
in the destination processing, resulting in a kernel crash.

kernel log:
ath11k_pci 0000:58:00.0: data msdu_pop: invalid buf_id 309
ath11k_pci 0000:58:00.0: data dp_rx_monitor_link_desc_return failed
ath11k_pci 0000:58:00.0: data msdu_pop: invalid buf_id 309
ath11k_pci 0000:58:00.0: data dp_rx_monitor_link_desc_return failed

Fix this by skipping the problematic buf_id and reaping the next entry,
replacing the break with the next MSDU processing.

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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
---
 drivers/net/wireless/ath/ath11k/dp_rx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
index c087d8a0f5b2..072963d3396c 100644
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -4781,7 +4781,7 @@ ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id,
 			if (!msdu) {
 				ath11k_dbg(ar->ab, ATH11K_DBG_DATA,
 					   "msdu_pop: invalid buf_id %d\n", buf_id);
-				break;
+				goto next_msdu;
 			}
 			rxcb = ATH11K_SKB_RXCB(msdu);
 			if (!rxcb->unmapped) {
@@ -5405,7 +5405,7 @@ ath11k_dp_rx_full_mon_mpdu_pop(struct ath11k *ar,
 					   "full mon msdu_pop: invalid buf_id %d\n",
 					    buf_id);
 				spin_unlock_bh(&rx_ring->idr_lock);
-				break;
+				goto next_msdu;
 			}
 			idr_remove(&rx_ring->bufs_idr, buf_id);
 			spin_unlock_bh(&rx_ring->idr_lock);
-- 
2.34.1

Re: [PATCH v3 1/2] wifi: ath11k: fix RCU stall while reaping monitor destination ring

[Jeff Johnson]

On 10/7/2024 10:37 PM, Kang Yang wrote:
> From: P Praneesh <quic_ppranees@quicinc.com>
> 
> While processing the monitor destination ring, MSDUs are reaped from the
> link descriptor based on the corresponding buf_id.
> 
> However, sometimes the driver cannot obtain a valid buffer corresponding
> to the buf_id received from the hardware. This causes an infinite loop
> in the destination processing, resulting in a kernel crash.
> 
> kernel log:
> ath11k_pci 0000:58:00.0: data msdu_pop: invalid buf_id 309
> ath11k_pci 0000:58:00.0: data dp_rx_monitor_link_desc_return failed
> ath11k_pci 0000:58:00.0: data msdu_pop: invalid buf_id 309
> ath11k_pci 0000:58:00.0: data dp_rx_monitor_link_desc_return failed
> 
> Fix this by skipping the problematic buf_id and reaping the next entry,
> replacing the break with the next MSDU processing.
> 
> 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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>

Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>

Re: [PATCH v3 1/2] wifi: ath11k: fix RCU stall while reaping monitor destination ring

[Kalle Valo]

Kang Yang <quic_kangyang@quicinc.com> wrote:

> From: P Praneesh <quic_ppranees@quicinc.com>
> 
> While processing the monitor destination ring, MSDUs are reaped from the
> link descriptor based on the corresponding buf_id.
> 
> However, sometimes the driver cannot obtain a valid buffer corresponding
> to the buf_id received from the hardware. This causes an infinite loop
> in the destination processing, resulting in a kernel crash.
> 
> kernel log:
> ath11k_pci 0000:58:00.0: data msdu_pop: invalid buf_id 309
> ath11k_pci 0000:58:00.0: data dp_rx_monitor_link_desc_return failed
> ath11k_pci 0000:58:00.0: data msdu_pop: invalid buf_id 309
> ath11k_pci 0000:58:00.0: data dp_rx_monitor_link_desc_return failed
> 
> Fix this by skipping the problematic buf_id and reaping the next entry,
> replacing the break with the next MSDU processing.
> 
> 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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>

Acked-by: Kalle Valo <kvalo@kernel.org>

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20241008053744.1070-2-quic_kangyang@quicinc.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
https://docs.kernel.org/process/submitting-patches.html

[PATCH v3 2/2] wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode

[Kang Yang]

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.

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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: Kang Yang <quic_kangyang@quicinc.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 072963d3396c..5fd681b5df2e 100644
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -5146,7 +5146,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,
 	struct ath11k_mon_data *pmon = (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;
@@ -5163,6 +5163,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,
 
 	spin_lock_bh(&pmon->mon_lock);
 
+	spin_lock_bh(&mon_dst_srng->lock);
 	ath11k_hal_srng_access_begin(ar->ab, mon_dst_srng);
 
 	ppdu_id = pmon->mon_ppdu_info.ppdu_id;
@@ -5221,6 +5222,7 @@ static void ath11k_dp_rx_mon_dest_process(struct ath11k *ar, int mac_id,
 								mon_dst_srng);
 	}
 	ath11k_hal_srng_access_end(ar->ab, mon_dst_srng);
+	spin_unlock_bh(&mon_dst_srng->lock);
 
 	spin_unlock_bh(&pmon->mon_lock);
 
@@ -5607,7 +5609,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_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 = &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 = 0, mpdu_rx_bufs_used;
 	int quota = 0, ret;
@@ -5623,6 +5625,9 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
 		goto reap_status_ring;
 	}
 
+	mon_dst_srng = &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 = ath11k_hal_srng_dst_peek(ar->ab, mon_dst_srng))) {
 		head_msdu = NULL;
@@ -5666,6 +5671,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
 	}
 
 	ath11k_hal_srng_access_end(ar->ab, mon_dst_srng);
+	spin_unlock_bh(&mon_dst_srng->lock);
 	spin_unlock_bh(&pmon->mon_lock);
 
 	if (rx_bufs_used) {
-- 
2.34.1

Re: [PATCH v3 2/2] wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode

[Jeff Johnson]

On 10/7/2024 10:37 PM, Kang Yang wrote:
> 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.
> 
> 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: d5c65159f289 ("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>

(note that since this has a locking change Kalle wants to review/approve so
I've assigned this series back to him in patchwork)

Re: [PATCH v3 2/2] wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode

[Kalle Valo]

Kang Yang <quic_kangyang@quicinc.com> writes:

> 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.
>
> 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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>

[...]

> @@ -5607,7 +5609,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_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 = &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 = 0, mpdu_rx_bufs_used;
>  	int quota = 0, ret;
> @@ -5623,6 +5625,9 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
>  		goto reap_status_ring;
>  	}
>  
> +	mon_dst_srng = &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id];
> +	spin_lock_bh(&mon_dst_srng->lock);

Why initialise mon_dst_srng differently? The commit message mentions
nothing about this change.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH v3 2/2] wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode

[Kang Yang]

On 12/12/2024 10:53 PM, Kalle Valo wrote:
> Kang Yang <quic_kangyang@quicinc.com> writes:
> 
>> 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.
>>
>> 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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
>> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
> 
> [...]
> 
>> @@ -5607,7 +5609,7 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_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 = &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 = 0, mpdu_rx_bufs_used;
>>   	int quota = 0, ret;
>> @@ -5623,6 +5625,9 @@ static int ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
>>   		goto reap_status_ring;
>>   	}
>>   
>> +	mon_dst_srng = &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id];
>> +	spin_lock_bh(&mon_dst_srng->lock);
> 
> Why initialise mon_dst_srng differently? The commit message mentions
> nothing about this change.


Because need to fetch spin lock inside 'struct hal_srng'. If still use 
'void *mon_dst_srng', need to perform a variable type cast.

Bur 'struct hal_srng' will make this line too long:
'struct hal_srng *mon_dst_srng = 
&ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id];'
So I separated the definition and initialization.

ath11k_dp_rx_reap_mon_status_ring()/ath11k_dp_process_rx and others ring 
process function is the same.



> 

Re: [PATCH v3 2/2] wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode

[Kang Yang]

On 12/13/2024 2:17 PM, Kang Yang wrote:
> 
> 
> On 12/12/2024 10:53 PM, Kalle Valo wrote:
>> Kang Yang <quic_kangyang@quicinc.com> writes:
>>
>>> 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.
>>>
>>> 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: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax 
>>> devices")
>>> Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
>>
>> [...]
>>
>>> @@ -5607,7 +5609,7 @@ static int ath11k_dp_full_mon_process_rx(struct 
>>> ath11k_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 = &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 = 0, mpdu_rx_bufs_used;
>>>       int quota = 0, ret;
>>> @@ -5623,6 +5625,9 @@ static int ath11k_dp_full_mon_process_rx(struct 
>>> ath11k_base *ab, int mac_id,
>>>           goto reap_status_ring;
>>>       }
>>> +    mon_dst_srng = &ar->ab->hal.srng_list[dp- 
>>> >rxdma_mon_dst_ring.ring_id];
>>> +    spin_lock_bh(&mon_dst_srng->lock);
>>
>> Why initialise mon_dst_srng differently? The commit message mentions
>> nothing about this change.
> 
> 
> Because need to fetch spin lock inside 'struct hal_srng'. If still use 
> 'void *mon_dst_srng', need to perform a variable type cast.
> 
> Bur 'struct hal_srng' will make this line too long:
> 'struct hal_srng *mon_dst_srng = &ar->ab->hal.srng_list[dp- 
>  >rxdma_mon_dst_ring.ring_id];'
> So I separated the definition and initialization.
> 
> ath11k_dp_rx_reap_mon_status_ring()/ath11k_dp_process_rx and others ring 
> process function is the same.
> 

Do i need to send a new version for this?

> 
> 
>>
> 
> 

Re: [PATCH v3 2/2] wifi: ath11k: add srng->lock for ath11k_hal_srng_* in monitor mode

[Kalle Valo]

Kang Yang <quic_kangyang@quicinc.com> writes:

>>>> @@ -5623,6 +5625,9 @@ static int
>>>> ath11k_dp_full_mon_process_rx(struct ath11k_base *ab, int mac_id,
>>>>           goto reap_status_ring;
>>>>       }
>>>> +    mon_dst_srng = &ar->ab->hal.srng_list[dp-
>>>> >rxdma_mon_dst_ring.ring_id];
>>>> +    spin_lock_bh(&mon_dst_srng->lock);
>>>
>>> Why initialise mon_dst_srng differently? The commit message mentions
>>> nothing about this change.
>> Because need to fetch spin lock inside 'struct hal_srng'. If still
>> use 'void *mon_dst_srng', need to perform a variable type cast.
>> Bur 'struct hal_srng' will make this line too long:
>> 'struct hal_srng *mon_dst_srng = &ar->ab->hal.srng_list[dp-
>> >rxdma_mon_dst_ring.ring_id];'
>> So I separated the definition and initialization.
>> ath11k_dp_rx_reap_mon_status_ring()/ath11k_dp_process_rx and others
>> ring process function is the same.
>> 
>
> Do i need to send a new version for this?

Yeah, please mention in the commit message why you mon_dst_srng
initialisation.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches