wifi: ath12k: add rx_info and replace the usage of rx desc
cover wifi: ath12k: add rx_info and replace the usage of rx desc
This series adds rx_info to capture required field from rx descriptor and corruption in rx path.
P Praneesh (2):
wifi: ath12k: add rx_info to capture required field from rx descriptor
wifi: ath12k: replace the usage of rx desc with rx_info
drivers/net/wireless/ath/ath12k/dp_mon.c | 4 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 171 +++++++++++++---------- drivers/net/wireless/ath/ath12k/dp_rx.h | 26 +++- 3 files changed, 122 insertions(+), 79 deletions(-)
base-commit: ba613742db305037ca2193b2b552b769c4f2a5f7
Signature · 1 line
2.34.1
PATCH 1/2 wifi: ath12k: add rx_info to capture required field from rx descriptor
In ath12k_dp_rx_h_mpdu(), as part of undecap to native wifi mode, the rx descriptor memory is getting overwritten. After this function call, all the rx descriptor related memory accesses give invalid values. To handle this scenario, introduce a new structure ath12k_dp_rx_info which pre-caches all the required fields from the rx descriptor before calling ath12k_dp_rx_h_ppdu(). This rx_info structure will be used in the next patch.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_rx.c | 80 ++++++++++++++++++------- drivers/net/wireless/ath/ath12k/dp_rx.h | 18 ++++++ 2 files changed, 78 insertions(+), 20 deletions(-)
drivers/net/wireless/ath/ath12k/dp_rx.c +60 -20
@@ -2412,6 +2412,30 @@ static void ath12k_dp_rx_h_rate(struct ath12k *ar, struct hal_rx_desc *rx_desc, } } +static void ath12k_dp_rx_h_fetch_info (struct ath12k_base *ab, +struct hal_rx_desc *rx_desc, +struct ath12k_dp_rx_info *rx_info) +{ + rx_info->ip_csum_fail =ath12k_dp_rx_h_ip_cksum_fail (ab, rx_desc); + rx_info->l4_csum_fail =ath12k_dp_rx_h_l4_cksum_fail (ab, rx_desc); + rx_info->is_mcbc =ath12k_dp_rx_h_is_da_mcbc (ab, rx_desc); + rx_info->decap_type =ath12k_dp_rx_h_decap_type (ab, rx_desc); + rx_info->pkt_type =ath12k_dp_rx_h_pkt_type (ab, rx_desc); + rx_info->sgi =ath12k_dp_rx_h_sgi (ab, rx_desc); + rx_info->rate_mcs =ath12k_dp_rx_h_rate_mcs (ab, rx_desc); + rx_info->bw =ath12k_dp_rx_h_rx_bw (ab, rx_desc); + rx_info->nss =ath12k_dp_rx_h_nss (ab, rx_desc); + rx_info->tid =ath12k_dp_rx_h_tid (ab, rx_desc); + rx_info->peer_id =ath12k_dp_rx_h_peer_id (ab, rx_desc); + rx_info->phy_meta_data =ath12k_dp_rx_h_freq (ab, rx_desc); + +if (ath12k_dp_rxdesc_mac_addr2_valid (ab, rx_desc)) { +ether_addr_copy (rx_info->addr2, +ath12k_dp_rxdesc_get_mpdu_start_addr2 (ab, rx_desc)); + rx_info->addr2_present = true; + } +} +void ath12k_dp_rx_h_ppdu (struct ath12k *ar,struct hal_rx_desc *rx_desc,struct ieee80211_rx_status *rx_status) {
@@ -2574,7 +2598,7 @@ static bool ath12k_dp_rx_check_nwifi_hdr_len_valid(struct ath12k_base *ab,static int ath12k_dp_rx_process_msdu (struct ath12k *ar,struct sk_buff *msdu,struct sk_buff_head *msdu_list, -struct ieee80211_rx_status *rx_status) +struct ath12k_dp_rx_info *rx_info) {struct ath12k_base *ab = ar->ab;struct hal_rx_desc *rx_desc, *lrx_desc;
@@ -2634,10 +2658,11 @@ static int ath12k_dp_rx_process_msdu(struct ath12k *ar, goto free_out; } -ath12k_dp_rx_h_ppdu (ar, rx_desc, rx_status); -ath12k_dp_rx_h_mpdu (ar, msdu, rx_desc, rx_status); +ath12k_dp_rx_h_fetch_info (ab, rx_desc, rx_info); +ath12k_dp_rx_h_ppdu (ar, rx_desc, rx_info->rx_status); +ath12k_dp_rx_h_mpdu (ar, msdu, rx_desc, rx_info->rx_status); - rx_status->flag |=RX_FLAG_SKIP_MONITOR |RX_FLAG_DUP_VALIDATED ; + rx_info->rx_status->flag |=RX_FLAG_SKIP_MONITOR |RX_FLAG_DUP_VALIDATED ;return 0 ;
@@ -2657,12 +2682,16 @@ static void ath12k_dp_rx_process_received_packets(struct ath12k_base *ab,struct ath12k *ar;struct ath12k_hw_link *hw_links = ag->hw_links;struct ath12k_base *partner_ab; +struct ath12k_dp_rx_info rx_info;u8 hw_link_id, pdev_id;int ret;if (skb_queue_empty (msdu_list))return ; + rx_info.addr2_present = false; + rx_info.rx_status = &rx_status; +rcu_read_lock ();while ((msdu =__skb_dequeue (msdu_list))) {
@@ -2683,7 +2712,7 @@ static void ath12k_dp_rx_process_received_packets(struct ath12k_base *ab,continue ; } - ret =ath12k_dp_rx_process_msdu (ar, msdu, msdu_list, &rx_status); + ret =ath12k_dp_rx_process_msdu (ar, msdu, msdu_list, &rx_info);if (ret) {ath12k_dbg (ab,ATH12K_DBG_DATA ,"Unable to process msdu %d" , ret);
@@ -2984,6 +3013,7 @@ static int ath12k_dp_rx_h_verify_tkip_mic(struct ath12k *ar, struct ath12k_peerstruct ieee80211_rx_status *rxs =IEEE80211_SKB_RXCB (msdu);struct ieee80211_key_conf *key_conf;struct ieee80211_hdr *hdr; +struct ath12k_dp_rx_info rx_info;u8 mic[IEEE80211_CCMP_MIC_LEN ];int head_len, tail_len, ret;size_t data_len;
@@ -2994,6 +3024,9 @@ static int ath12k_dp_rx_h_verify_tkip_mic(struct ath12k *ar, struct ath12k_peerif (ath12k_dp_rx_h_enctype (ab, rx_desc) !=HAL_ENCRYPT_TYPE_TKIP_MIC )return 0 ; + rx_info.addr2_present = false; + rx_info.rx_status = rxs; + hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); hdr_len =ieee80211_hdrlen (hdr->frame_control); head_len = hdr_len + hal_rx_desc_sz +IEEE80211_TKIP_IV_LEN ;
@@ -3020,6 +3053,8 @@ static int ath12k_dp_rx_h_verify_tkip_mic(struct ath12k *ar, struct ath12k_peer (ATH12K_SKB_RXCB (msdu))->is_first_msdu = true; (ATH12K_SKB_RXCB (msdu))->is_last_msdu = true; +ath12k_dp_rx_h_fetch_info (ab, rx_desc, &rx_info); + rxs->flag |=RX_FLAG_MMIC_ERROR |RX_FLAG_MMIC_STRIPPED |RX_FLAG_IV_STRIPPED |RX_FLAG_DECRYPTED ;skb_pull (msdu, hal_rx_desc_sz);
@@ -3716,7 +3751,7 @@ static void ath12k_dp_rx_null_q_desc_sg_drop(struct ath12k *ar, }static int ath12k_dp_rx_h_null_q_desc (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status, +struct ath12k_dp_rx_info *rx_info,struct sk_buff_head *msdu_list) {struct ath12k_base *ab = ar->ab;
@@ -3772,9 +3807,9 @@ static int ath12k_dp_rx_h_null_q_desc(struct ath12k *ar, struct sk_buff *msdu,if (unlikely (!ath12k_dp_rx_check_nwifi_hdr_len_valid (ab, desc, msdu)))return -EINVAL ; -ath12k_dp_rx_h_ppdu (ar, desc, status); - -ath12k_dp_rx_h_mpdu (ar, msdu, desc, status); +ath12k_dp_rx_h_fetch_info (ab, desc, rx_info); +ath12k_dp_rx_h_ppdu (ar, desc, rx_info->rx_status); +ath12k_dp_rx_h_mpdu (ar, msdu, desc, rx_info->rx_status); rxcb->tid =ath12k_dp_rx_h_tid (ab, desc);
@@ -3786,7 +3821,7 @@ static int ath12k_dp_rx_h_null_q_desc(struct ath12k *ar, struct sk_buff *msdu, }static bool ath12k_dp_rx_h_reo_err (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status, +struct ath12k_dp_rx_info *rx_info,struct sk_buff_head *msdu_list) {struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu);
@@ -3796,7 +3831,7 @@ static bool ath12k_dp_rx_h_reo_err(struct ath12k *ar, struct sk_buff *msdu,switch (rxcb->err_code) {case HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO : -if (ath12k_dp_rx_h_null_q_desc (ar, msdu, status, msdu_list)) +if (ath12k_dp_rx_h_null_q_desc (ar, msdu, rx_info, msdu_list)) drop = true;break ;case HAL_REO_DEST_RING_ERROR_CODE_PN_CHECK_FAILED :
@@ -3817,7 +3852,7 @@ static bool ath12k_dp_rx_h_reo_err(struct ath12k *ar, struct sk_buff *msdu, }static bool ath12k_dp_rx_h_tkip_mic_err (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status) +struct ath12k_dp_rx_info *rx_info) {struct ath12k_base *ab = ar->ab;u16 msdu_len;
@@ -3837,18 +3872,18 @@ static bool ath12k_dp_rx_h_tkip_mic_err(struct ath12k *ar, struct sk_buff *msdu,if (unlikely (!ath12k_dp_rx_check_nwifi_hdr_len_valid (ab, desc, msdu)))return true; -ath12k_dp_rx_h_ppdu (ar, desc, status); +ath12k_dp_rx_h_ppdu (ar, desc, rx_info->rx_status); - status->flag |= (RX_FLAG_MMIC_STRIPPED |RX_FLAG_MMIC_ERROR | -RX_FLAG_DECRYPTED ); + rx_info->rx_status->flag |= (RX_FLAG_MMIC_STRIPPED |RX_FLAG_MMIC_ERROR | +RX_FLAG_DECRYPTED );ath12k_dp_rx_h_undecap (ar, msdu, desc, -HAL_ENCRYPT_TYPE_TKIP_MIC , status, false); +HAL_ENCRYPT_TYPE_TKIP_MIC , rx_info->rx_status, false);return false; }static bool ath12k_dp_rx_h_rxdma_err (struct ath12k *ar,struct sk_buff *msdu, -struct ieee80211_rx_status *status) +struct ath12k_dp_rx_info *rx_info) {struct ath12k_base *ab = ar->ab;struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu);
@@ -3863,7 +3898,8 @@ static bool ath12k_dp_rx_h_rxdma_err(struct ath12k *ar, struct sk_buff *msdu,case HAL_REO_ENTR_RING_RXDMA_ECODE_TKIP_MIC_ERR : err_bitmap =ath12k_dp_rx_h_mpdu_err (ab, rx_desc);if (err_bitmap &HAL_RX_MPDU_ERR_TKIP_MIC ) { - drop =ath12k_dp_rx_h_tkip_mic_err (ar, msdu, status); +ath12k_dp_rx_h_fetch_info (ab, rx_desc, rx_info); + drop =ath12k_dp_rx_h_tkip_mic_err (ar, msdu, rx_info);break ; } fallthrough;
@@ -3885,14 +3921,18 @@ static void ath12k_dp_rx_wbm_err(struct ath12k *ar, {struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu);struct ieee80211_rx_status rxs = {0 }; +struct ath12k_dp_rx_info rx_info;bool drop = true; + rx_info.addr2_present = false; + rx_info.rx_status = &rxs; +switch (rxcb->err_rel_src) {case HAL_WBM_REL_SRC_MODULE_REO : - drop =ath12k_dp_rx_h_reo_err (ar, msdu, &rxs, msdu_list); + drop =ath12k_dp_rx_h_reo_err (ar, msdu, &rx_info, msdu_list);break ;case HAL_WBM_REL_SRC_MODULE_RXDMA : - drop =ath12k_dp_rx_h_rxdma_err (ar, msdu, &rxs); + drop =ath12k_dp_rx_h_rxdma_err (ar, msdu, &rx_info);break ;default :/* msdu will get freed */
drivers/net/wireless/ath/ath12k/dp_rx.h +18 -0
@@ -65,6 +65,24 @@ struct ath12k_dp_rx_rfc1042_hdr {__be16 snap_type; } __packed; +struct ath12k_dp_rx_info { +struct ieee80211_rx_status *rx_status; +u32 phy_meta_data; +u16 peer_id; +u8 decap_type; +u8 pkt_type; +u8 sgi; +u8 rate_mcs; +u8 bw; +u8 nss; +u8 addr2[ETH_ALEN ]; +u8 tid; +bool ip_csum_fail; +bool l4_csum_fail; +bool is_mcbc; +bool addr2_present; +}; +static inline u32 ath12k_he_gi_to_nl80211_he_gi (u8 sgi) {u32 ret =0 ;
Signature · 1 line
2.34.1
Re: [PATCH ath-next 1/2] wifi: ath12k: add rx_info to capture required field from rx descriptor
Quoted 8 lines · P Praneesh
In
ath12k_dp_rx_h_mpdu(), as part of undecap to native wifi mode, the rx descriptor memory is getting overwritten. After this function call, all the rx descriptor related memory accesses give invalid values. To handle this scenario, introduce a new structureath12k_dp_rx_infowhich pre-caches all the required fields from the rx descriptor before callingath12k_dp_rx_h_ppdu(). Thisrx_infostructure will be used in the next patch.
Quoted 6 lines
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3Co-developed-by Karthikeyan Periyasamy <[email protected]>Signed-off-by Karthikeyan Periyasamy <[email protected]>Signed-off-by P Praneesh <[email protected]>
PATCH 2/2 wifi: ath12k: replace the usage of rx desc with rx_info
In reply to P PraneeshIn ath12k_dp_rx_h_mpdu(), during the undecap to native wifi mode, the rx descriptor memory is overwritten. After this function call, any subsequent accesses to rx descriptor related memory yield invalid values. Fix this by replacing instances where rx_desc was used with the pre-cached information in rx_info. This ensures that the values populated from the rx descriptor are accurate and prevents invalid memory access.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/dp_mon.c | 4 +- drivers/net/wireless/ath/ath12k/dp_rx.c | 107 ++++++++++------------- drivers/net/wireless/ath/ath12k/dp_rx.h | 8 +- 3 files changed, 52 insertions(+), 67 deletions(-)
drivers/net/wireless/ath/ath12k/dp_mon.c +3 -1
@@ -2080,6 +2080,7 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_structstruct ieee80211_sta *pubsta =NULL ;struct ath12k_peer *peer;struct ath12k_skb_rxcb *rxcb =ATH12K_SKB_RXCB (msdu); +struct ath12k_dp_rx_info rx_info;bool is_mcbc = rxcb->is_mcbc;bool is_eapol_tkip = rxcb->is_eapol;
@@ -2093,7 +2094,8 @@ static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_struct }spin_lock_bh (&ar->ab->base_lock); - peer =ath12k_dp_rx_h_find_peer (ar->ab, msdu); + rx_info.addr2_present = false; + peer =ath12k_dp_rx_h_find_peer (ar->ab, msdu, &rx_info);if (peer && peer->sta) { pubsta = peer->sta;if (pubsta->valid_links) {
drivers/net/wireless/ath/ath12k/dp_rx.c +44 -63
264 lines not on this page · raw message
drivers/net/wireless/ath/ath12k/dp_rx.h +5 -3
@@ -149,13 +149,13 @@ int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, const u8 *peer_mac, int vdevu8 ath12k_dp_rx_h_l3pad (struct ath12k_base *ab,struct hal_rx_desc *desc);struct ath12k_peer * -ath12k_dp_rx_h_find_peer (struct ath12k_base *ab,struct sk_buff *msdu); +ath12k_dp_rx_h_find_peer (struct ath12k_base *ab,struct sk_buff *msdu, +struct ath12k_dp_rx_info *rx_info);u8 ath12k_dp_rx_h_decap_type (struct ath12k_base *ab,struct hal_rx_desc *desc);u32 ath12k_dp_rx_h_mpdu_err (struct ath12k_base *ab,struct hal_rx_desc *desc); -void ath12k_dp_rx_h_ppdu (struct ath12k *ar,struct hal_rx_desc *rx_desc, -struct ieee80211_rx_status *rx_status); +void ath12k_dp_rx_h_ppdu (struct ath12k *ar,struct ath12k_dp_rx_info *rx_info);int ath12k_dp_rxdma_ring_sel_config_qcn9274 (struct ath12k_base *ab);int ath12k_dp_rxdma_ring_sel_config_wcn7850 (struct ath12k_base *ab);
@@ -163,4 +163,6 @@ int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len,int (*iter)(struct ath12k_base *ar,u16 tag,u16 len,const void *ptr,void *data), void *data); +void ath12k_dp_rx_h_fetch_info (struct ath12k_base *ab,struct hal_rx_desc *rx_desc, +struct ath12k_dp_rx_info *rx_info);#endif /* ATH12K_DP_RX_H */
Signature · 1 line
2.34.1
Re: [PATCH ath-next 2/2] wifi: ath12k: replace the usage of rx desc with rx_info
Quoted 7 lines · P Praneesh
In
ath12k_dp_rx_h_mpdu(), during the undecap to native wifi mode, the rx descriptor memory is overwritten. After this function call, any subsequent accesses to rx descriptor related memory yield invalid values. Fix this by replacing instances whererx_descwas used with the pre-cached information inrx_info. This ensures that the values populated from the rx descriptor are accurate and prevents invalid memory access.
Quoted 6 lines
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3Co-developed-by Karthikeyan Periyasamy <[email protected]>Signed-off-by Karthikeyan Periyasamy <[email protected]>Signed-off-by P Praneesh <[email protected]>
Jeff Johnson
AppliedQuoted 8 lines · P Praneesh
This series adds
rx_infoto capture required field from rx descriptor and corruption in rx path.P Praneesh (2):
wifi: ath12k: addrx_infoto capture required field from rx descriptor
wifi: ath12k: replace the usage of rx desc withrx_info[...]
Applied, thanks!
[1/2] wifi: ath12k: add rx_info to capture required field from rx descriptor
commit: e88e6e3c9ada84ceed3fa223ce11af94fcaf3ad3
[2/2] wifi: ath12k: replace the usage of rx desc with rx_info
commit: bd00cc7e8a4c1048d14c9a9e9790c582119785fbBest regards,
Signature · 1 line
Jeff Johnson <[email protected]>