mac80211: add HE TX rate reporting to radiotap
Subsystems (2)
cover mac80211: add HE TX rate reporting to radiotap
Right now struct ieee80211_tx_rate cannot hold HE rates. Lets extend struct ieee80211_tx_status instead and use ieee80211_tx_status_ext() to propagate the information to the subsystem.
John Crispin (6):
mac80211: add xmit rate to struct ieee80211_tx_status
mac80211: propagate struct ieee80211_tx_status into
ieee80211_tx_monitor()
mac80211: add struct ieee80211_tx_status support to
ieee80211_add_tx_radiotap_header ath11k: drop tx_info from ath11k_sta
ath11k: add HE rate accounting to driver
ath11k: switch to using ieee80211_tx_status_ext()
drivers/net/wireless/ath/ath11k/core.h | 3 +- drivers/net/wireless/ath/ath11k/debugfs_sta.c | 7 + drivers/net/wireless/ath/ath11k/dp.h | 9 + drivers/net/wireless/ath/ath11k/dp_rx.c | 82 ++++---- drivers/net/wireless/ath/ath11k/dp_tx.c | 20 +- drivers/net/wireless/ath/ath11k/hal_rx.c | 13 +- drivers/net/wireless/ath/ath11k/hal_rx.h | 30 +++ drivers/net/wireless/ath/ath11k/rx_desc.h | 8 + include/net/mac80211.h | 2 + net/mac80211/ieee80211_i.h | 3 +- net/mac80211/status.c | 180 ++++++++++++++++-- net/mac80211/tx.c | 3 +- 12 files changed, 291 insertions(+), 69 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/6 mac80211: add xmit rate to struct ieee80211_tx_status
Right now struct ieee80211_tx_rate cannot hold HE rates. Lets use struct ieee80211_tx_status instead. This will also make the code future-proof for when we have EHT.
--- include/net/mac80211.h | 2 ++ 1 file changed, 2 insertions(+)
include/net/mac80211.h +2 -0
@@ -1066,11 +1066,13 @@ struct ieee80211_tx_info {* @sta: Station that the packet was transmitted for * @info: Basic tx status information * @skb: Packet skb (can be NULL if not provided by the driver) +* @rate: The TX rate that was when sending the packet */ struct ieee80211_tx_status {struct ieee80211_sta *sta;struct ieee80211_tx_info *info;struct sk_buff *skb; +struct rate_info *rate; };/**
Signature · 1 line
2.20.1
PATCH 2/6 mac80211: propagate struct ieee80211_tx_status into ieee80211_tx_monitor()
In reply to John CrispinThis will allow use to report HE rates on the radiotap interface.
--- net/mac80211/ieee80211_i.h | 3 ++- net/mac80211/status.c | 6 ++++-- net/mac80211/tx.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-)
net/mac80211/ieee80211_i.h +2 -1
@@ -1776,7 +1776,8 @@ ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u32 info_flags);void ieee80211_tx_monitor (struct ieee80211_local *local,struct sk_buff *skb,struct ieee80211_supported_band *sband, -int retry_count,int shift,bool send_to_cooked); +int retry_count,int shift,bool send_to_cooked, +struct ieee80211_tx_status *status);void ieee80211_check_fast_xmit (struct sta_info *sta);void ieee80211_check_fast_xmit_all (struct ieee80211_local *local);
net/mac80211/status.c +4 -2
@@ -648,7 +648,8 @@ static int ieee80211_tx_get_rates(struct ieee80211_hw *hw,void ieee80211_tx_monitor (struct ieee80211_local *local,struct sk_buff *skb,struct ieee80211_supported_band *sband, -int retry_count,int shift,bool send_to_cooked) +int retry_count,int shift,bool send_to_cooked, +struct ieee80211_tx_status *status) {struct sk_buff *skb2;struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);
@@ -904,7 +905,8 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, }/* send to monitor interfaces */ -ieee80211_tx_monitor (local, skb, sband, retry_count, shift, send_to_cooked); +ieee80211_tx_monitor (local, skb, sband, retry_count, shift, + send_to_cooked, status); }void ieee80211_tx_status (struct ieee80211_hw *hw,struct sk_buff *skb)
net/mac80211/tx.c +2 -1
@@ -4794,7 +4794,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,if (!sband)return bcn; -ieee80211_tx_monitor (hw_to_local (hw), copy, sband,1 , shift, false); +ieee80211_tx_monitor (hw_to_local (hw), copy, sband,1 , shift, false, +NULL );return bcn; }
Signature · 1 line
2.20.1
PATCH 3/6 mac80211: add struct ieee80211_tx_status support to ieee80211_add_tx_radiotap_header
In reply to John CrispinAdd support to ieee80211_add_tx_radiotap_header() for handling rates reported via ieee80211_tx_status. This allows us to also report HE rates. Reporting 60GHz rates is now also possible but is not part of the patch due to lack of test HW.
--- net/mac80211/status.c | 174 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 162 insertions(+), 12 deletions(-)
net/mac80211/status.c +162 -12
@@ -257,7 +257,8 @@ static void ieee80211_set_bar_pending(struct sta_info *sta, u8 tid, u16 ssn) tid_tx->bar_pending = true; } -static int ieee80211_tx_radiotap_len (struct ieee80211_tx_info *info) +static int ieee80211_tx_radiotap_len (struct ieee80211_tx_info *info, +struct ieee80211_tx_status *status) {int len =sizeof (struct ieee80211_radiotap_header );
@@ -275,7 +276,14 @@ static int ieee80211_tx_radiotap_len(struct ieee80211_tx_info *info)/* IEEE80211_RADIOTAP_MCS * IEEE80211_RADIOTAP_VHT */ -if (info->status.rates[0 ].idx >=0 ) { +if (status && status->rate) { +if (status->rate->flags &RATE_INFO_FLAGS_MCS ) + len +=3 ; +else if (status->rate->flags &RATE_INFO_FLAGS_VHT_MCS ) + len =ALIGN (len,2 ) +12 ; +else if (status->rate->flags &RATE_INFO_FLAGS_HE_MCS ) + len =ALIGN (len,2 ) +12 ; + }else if (info->status.rates[0 ].idx >=0 ) {if (info->status.rates[0 ].flags &IEEE80211_TX_RC_MCS ) len +=3 ;else if (info->status.rates[0 ].flags &IEEE80211_TX_RC_VHT_MCS )
@@ -289,12 +297,14 @@ static void ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, struct ieee80211_supported_band *sband, struct sk_buff *skb, int retry_count, - int rtap_len, int shift) + int rtap_len, int shift, + struct ieee80211_tx_status *status) { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;struct ieee80211_radiotap_header *rthdr;unsigned char *pos; +u16 legacy_rate =0 ;u16 txflags; rthdr =skb_push (skb, rtap_len);
@@ -313,14 +323,22 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local,*/ /* IEEE80211_RADIOTAP_RATE */ -if (info->status.rates[0 ].idx >=0 && - !(info->status.rates[0 ].flags & (IEEE80211_TX_RC_MCS | -IEEE80211_TX_RC_VHT_MCS ))) { -u16 rate; +if (status && status->rate && !(status->rate->flags & + (RATE_INFO_FLAGS_MCS | +RATE_INFO_FLAGS_60G | +RATE_INFO_FLAGS_VHT_MCS | +RATE_INFO_FLAGS_HE_MCS ))) + legacy_rate = status->rate->legacy; +else if (info->status.rates[0 ].idx >=0 && + !(info->status.rates[0 ].flags & (IEEE80211_TX_RC_MCS | +IEEE80211_TX_RC_VHT_MCS ))) + legacy_rate = + sband->bitrates[info->status.rates[0 ].idx].bitrate; + +if (legacy_rate) { rthdr->it_present |=cpu_to_le32 (1 <<IEEE80211_RADIOTAP_RATE ); - rate = sband->bitrates[info->status.rates[0 ].idx].bitrate; - *pos =DIV_ROUND_UP (rate,5 * (1 << shift)); + *pos =DIV_ROUND_UP (legacy_rate,5 * (1 << shift));/* padding for tx flags */ pos +=2 ; }
@@ -344,7 +362,139 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, *pos = retry_count; pos++; -if (info->status.rates[0 ].idx <0 ) +if (status && status->rate && + (status->rate->flags &RATE_INFO_FLAGS_MCS )) { + rthdr->it_present |=cpu_to_le32 (1 <<IEEE80211_RADIOTAP_MCS ); + pos[0 ] =IEEE80211_RADIOTAP_MCS_HAVE_MCS | +IEEE80211_RADIOTAP_MCS_HAVE_GI | +IEEE80211_RADIOTAP_MCS_HAVE_BW ; +if (status->rate->flags &RATE_INFO_FLAGS_SHORT_GI ) + pos[1 ] |=IEEE80211_RADIOTAP_MCS_SGI ; +if (status->rate->bw ==RATE_INFO_BW_40 ) + pos[1 ] |=IEEE80211_RADIOTAP_MCS_BW_40 ; + pos[2 ] = status->rate->mcs; + pos +=3 ; + }else if (status && status->rate && + (status->rate->flags &RATE_INFO_FLAGS_VHT_MCS )) { +u16 known = local->hw.radiotap_vht_details & + (IEEE80211_RADIOTAP_VHT_KNOWN_GI | +IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH ); + + rthdr->it_present |=cpu_to_le32 (1 <<IEEE80211_RADIOTAP_VHT ); + +/* required alignment from rthdr */ + pos = (u8 *)rthdr +ALIGN (pos - (u8 *)rthdr,2 ); + +/* u16 known - IEEE80211_RADIOTAP_VHT_KNOWN_* */ +put_unaligned_le16 (known, pos); + pos +=2 ; + +/* u8 flags - IEEE80211_RADIOTAP_VHT_FLAG_* */ +if (status->rate->flags &RATE_INFO_FLAGS_SHORT_GI ) + *pos |=IEEE80211_RADIOTAP_VHT_FLAG_SGI ; + pos++; + +/* u8 bandwidth */ +switch (status->rate->bw) { +case RATE_INFO_BW_160 : + *pos =11 ; +break ; +case RATE_INFO_BW_80 : + *pos =2 ; +break ; +case RATE_INFO_BW_40 : + *pos =1 ; +break ; +default : + *pos =0 ; +break ; + } + +/* u8 mcs_nss[4] */ + *pos = (status->rate->mcs <<4 ) | status->rate->nss; + pos +=4 ; + +/* u8 coding */ + pos++; +/* u8 group_id */ + pos++; +/* u16 partial_aid */ + pos +=2 ; + }else if (status && status->rate && + (status->rate->flags &RATE_INFO_FLAGS_HE_MCS )) { +struct ieee80211_radiotap_he *he; + + rthdr->it_present |=cpu_to_le32 (1 <<IEEE80211_RADIOTAP_HE ); + +/* required alignment from rthdr */ + pos = (u8 *)rthdr +ALIGN (pos - (u8 *)rthdr,2 ); + he = (struct ieee80211_radiotap_he *)pos; + + he->data1 =IEEE80211_RADIOTAP_HE_DATA1_FORMAT_SU | +IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN | +IEEE80211_RADIOTAP_HE_DATA1_DATA_DCM_KNOWN | +IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN ; + + he->data2 =IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN ; + +#define HE_PREP (f, val) le16_encode_bits(val, IEEE80211_RADIOTAP_HE_##f) + + he->data6 |=HE_PREP (DATA6_NSTS , status->rate->nss); + +#define CHECK_GI (s) \ + BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA5_GI_##s != \ + (int)NL80211_RATE_INFO_HE_GI_##s) + + CHECK_GI(0_8); + CHECK_GI(1_6); + CHECK_GI(3_2); + + he->data3 |=HE_PREP (DATA3_DATA_MCS , status->rate->mcs); + he->data3 |=HE_PREP (DATA3_DATA_DCM , status->rate->he_dcm); + + he->data5 |=HE_PREP (DATA5_GI , status->rate->he_gi); + +switch (status->rate->bw) { +case RATE_INFO_BW_20 : + he->data5 |=HE_PREP (DATA5_DATA_BW_RU_ALLOC , +IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_20MHZ ); +break ; +case RATE_INFO_BW_40 : + he->data5 |=HE_PREP (DATA5_DATA_BW_RU_ALLOC , +IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_40MHZ ); +break ; +case RATE_INFO_BW_80 : + he->data5 |=HE_PREP (DATA5_DATA_BW_RU_ALLOC , +IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_80MHZ ); +break ; +case RATE_INFO_BW_160 : + he->data5 |=HE_PREP (DATA5_DATA_BW_RU_ALLOC , +IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_160MHZ ); +break ; +case RATE_INFO_BW_HE_RU : +#define CHECK_RU_ALLOC (s) \ + BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC_##s##T != \ + NL80211_RATE_INFO_HE_RU_ALLOC_##s + 4) + +CHECK_RU_ALLOC (26 ); +CHECK_RU_ALLOC (52 ); +CHECK_RU_ALLOC (106 ); +CHECK_RU_ALLOC (242 ); +CHECK_RU_ALLOC (484 ); +CHECK_RU_ALLOC (996 ); + CHECK_RU_ALLOC(2x996); + + he->data5 |=HE_PREP (DATA5_DATA_BW_RU_ALLOC , + status->rate->he_ru_alloc +4 ); +break ; +default : +WARN_ONCE (1 ,"Invalid SU BW %d\n" , status->rate->bw); + } + + pos +=sizeof (struct ieee80211_radiotap_he ); + } + +if ((status && status->rate) || info->status.rates[0 ].idx <0 )return ;/* IEEE80211_RADIOTAP_MCS
@@ -658,14 +808,14 @@ void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb,int rtap_len;/* send frame to monitor interfaces now */ - rtap_len =ieee80211_tx_radiotap_len (info); + rtap_len =ieee80211_tx_radiotap_len (info, status);if (WARN_ON_ONCE (skb_headroom (skb) < rtap_len)) {pr_err ("ieee80211_tx_status: headroom too small\n" );dev_kfree_skb (skb);return ; }ieee80211_add_tx_radiotap_header (local, sband, skb, retry_count, - rtap_len, shift); + rtap_len, shift, status);/* XXX: is this sufficient for BPF? */ skb_reset_mac_header (skb);
Signature · 1 line
2.20.1
PATCH 4/6 ath11k: drop tx_info from ath11k_sta
In reply to John CrispinWe will start using ieee80211_tx_status_ext() so we do not need to track tx rates inside a struct ieee80211_tx_info. It is currently not possible to populate that struct with HE rate info anyhow.
--- drivers/net/wireless/ath/ath11k/core.h | 1 - drivers/net/wireless/ath/ath11k/dp_rx.c | 52 +------------------------ 2 files changed, 2 insertions(+), 51 deletions(-)
drivers/net/wireless/ath/ath11k/core.h +0 -1
@@ -331,7 +331,6 @@ struct ath11k_sta {u32 smps;struct work_struct update_wk; -struct ieee80211_tx_info tx_info;struct rate_info txrate;struct rate_info last_txrate;u64 rx_duration;
drivers/net/wireless/ath/ath11k/dp_rx.c +2 -50
96 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 5/6 ath11k: add HE rate accounting to driver
In reply to John CrispinParse and store the out-of-band rates reported by the FW.
--- drivers/net/wireless/ath/ath11k/core.h | 2 + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 7 +++ drivers/net/wireless/ath/ath11k/dp.h | 9 ++++ drivers/net/wireless/ath/ath11k/dp_rx.c | 48 +++++++++++++++++-- drivers/net/wireless/ath/ath11k/dp_tx.c | 1 + drivers/net/wireless/ath/ath11k/hal_rx.c | 13 +++-- drivers/net/wireless/ath/ath11k/hal_rx.h | 30 ++++++++++++ drivers/net/wireless/ath/ath11k/rx_desc.h | 8 ++++ 8 files changed, 112 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath11k/core.h +2 -0
@@ -243,6 +243,8 @@ struct ath11k_rx_peer_stats {u64 tid_count[IEEE80211_NUM_TIDS +1 ];u64 pream_cnt[HAL_RX_PREAMBLE_MAX ];u64 reception_type[HAL_RX_RECEPTION_TYPE_MAX ]; +u64 dcm_count; +u64 ru_alloc_cnt[HAL_RX_RU_ALLOC_TYPE_MAX ]; };#define ATH11K_HE_MCS_NUM 12
drivers/net/wireless/ath/ath11k/debugfs_sta.c +7 -0
@@ -389,6 +389,13 @@ static ssize_t ath11k_dbg_sta_dump_rx_stats(struct file *file, len +=scnprintf (buf + len, size - len,"\nNSS(1-8):" );for (i =0 ; i <HAL_RX_MAX_NSS ; i++) len +=scnprintf (buf + len, size - len,"%llu " , rx_stats->nss_count[i]); + len +=scnprintf (buf + len, size - len, +"\nDCM: %llu\nRU: 26 %llu 52: %llu 106: %llu 242: %llu 484: %llu 996: %llu\n" , + rx_stats->dcm_count, rx_stats->ru_alloc_cnt[0 ], + rx_stats->ru_alloc_cnt[1 ], rx_stats->ru_alloc_cnt[2 ], + rx_stats->ru_alloc_cnt[3 ], rx_stats->ru_alloc_cnt[4 ], + rx_stats->ru_alloc_cnt[5 ]); + len +=scnprintf (buf + len, size - len,"\n" );spin_unlock_bh (&ar->ab->data_lock);
drivers/net/wireless/ath/ath11k/dp.h +9 -0
@@ -1055,6 +1055,13 @@ struct htt_ppdu_stats_common {u16 bw_mhz; } __packed; +enum htt_ppdu_stats_gi { +HTT_PPDU_STATS_SGI_0_8_US , +HTT_PPDU_STATS_SGI_0_4_US , +HTT_PPDU_STATS_SGI_1_6_US , +HTT_PPDU_STATS_SGI_3_2_US , +}; +#define HTT_PPDU_STATS_USER_RATE_INFO0_USER_POS_M GENMASK(3, 0)#define HTT_PPDU_STATS_USER_RATE_INFO0_MU_GROUP_ID_M GENMASK(11, 4)
@@ -1083,6 +1090,8 @@ struct htt_ppdu_stats_common { FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_MCS_M, _val)#define HTT_USR_RATE_GI (_val) \ FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M, _val) +#define HTT_USR_RATE_DCM (_val) \ + FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M, _val)#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LTF_SIZE_M GENMASK(1, 0)#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_STBC_M BIT(2)
drivers/net/wireless/ath/ath11k/dp_rx.c +45 -3
94 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/dp_tx.c +1 -0
@@ -7,6 +7,7 @@#include "dp_tx.h" #include "debug.h" #include "hw.h" +#include "peer.h" /* NOTE: Any of the mapped ring id value must not exceed DP_TCL_NUM_RING_MAX */ static const u8
drivers/net/wireless/ath/ath11k/hal_rx.c +10 -3
@@ -1045,6 +1045,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, } ppdu_info->nss = nsts +1 ; + ppdu_info->dcm = dcm; ppdu_info->reception_type =HAL_RX_RECEPTION_TYPE_SU ;break ; }
@@ -1082,9 +1083,15 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab,break ; }case HAL_PHYRX_HE_SIG_B1_MU : { -/* TODO: Check if resource unit(RU) allocation stats -* are required -*/ +struct hal_rx_he_sig_b1_mu_info *he_sig_b1_mu = + (struct hal_rx_he_sig_b1_mu_info *)tlv_data; +u16 ru_tones; + + info0 =__le32_to_cpu (he_sig_b1_mu->info0); + + ru_tones =FIELD_GET (HAL_RX_HE_SIG_B1_MU_INFO_INFO0_RU_ALLOCATION , + info0); + ppdu_info->ru_alloc =ath11k_he_ru_tones_to_nl80211_he_ru_alloc (ru_tones); ppdu_info->reception_type =HAL_RX_RECEPTION_TYPE_MU_MIMO ;break ; }
drivers/net/wireless/ath/ath11k/hal_rx.h +30 -0
@@ -123,6 +123,8 @@ struct hal_rx_mon_ppdu_info {u8 beamformed;u8 rssi_comb;u8 tid; +u8 dcm; +u8 ru_alloc;u8 reception_type; };
@@ -337,6 +339,34 @@ enum hal_rx_mon_status ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab, struct hal_rx_mon_ppdu_info *ppdu_info, u8 *data); + +static inline u32 ath11k_he_ru_tones_to_nl80211_he_ru_alloc (u16 ru_tones) +{ +u32 ret =0 ; + +switch (ru_tones) { +case RU_26 : + ret =NL80211_RATE_INFO_HE_RU_ALLOC_26 ; +break ; +case RU_52 : + ret =NL80211_RATE_INFO_HE_RU_ALLOC_52 ; +break ; +case RU_106 : + ret =NL80211_RATE_INFO_HE_RU_ALLOC_106 ; +break ; +case RU_242 : + ret =NL80211_RATE_INFO_HE_RU_ALLOC_242 ; +break ; +case RU_484 : + ret =NL80211_RATE_INFO_HE_RU_ALLOC_484 ; +break ; +case RU_996 : + ret =NL80211_RATE_INFO_HE_RU_ALLOC_996 ; +break ; + } +return ret; +} +#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0 0xDDBEEF#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1 0xADBEEF#define REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2 0xBDBEEF
drivers/net/wireless/ath/ath11k/rx_desc.h +8 -0
@@ -1209,4 +1209,12 @@ struct hal_rx_desc { u8 msdu_payload[0]; } __packed; +#define HAL_RX_RU_ALLOC_TYPE_MAX 6 +#define RU_26 1 +#define RU_52 2 +#define RU_106 4 +#define RU_242 9 +#define RU_484 18 +#define RU_996 37 +#endif /* ATH11K_RX_DESC_H */
Signature · 1 line
2.20.1
PATCH 6/6 ath11k: switch to using ieee80211_tx_status_ext()
In reply to John CrispinThis allows us to pass HE rates down into the stack.
--- drivers/net/wireless/ath/ath11k/dp_tx.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath11k/dp_tx.c +14 -5
@@ -365,9 +365,12 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,struct sk_buff *msdu, struct hal_tx_status *ts) { + struct ieee80211_tx_status status = { 0 };struct ath11k_base *ab = ar->ab;struct ieee80211_tx_info *info;struct ath11k_skb_cb *skb_cb; +struct ath11k_peer *peer; +struct ath11k_sta *arsta;if (WARN_ON_ONCE (ts->buf_rel_source !=HAL_WBM_REL_SRC_MODULE_TQM )) {/* Must not happen */
@@ -431,12 +434,18 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar,ath11k_dp_tx_cache_peer_stats (ar, msdu, ts); } -/* NOTE: Tx rate status reporting. Tx completion status does not have -* necessary information (for example nss) to build the tx rate. -* Might end up reporting it out-of-band from HTT stats. -*/ -ieee80211_tx_status (ar->hw, msdu); +spin_lock_bh (&ab->data_lock); + peer =ath11k_peer_find_by_id (ab, ts->peer_id); + arsta = (struct ath11k_sta *)peer->sta->drv_priv; + status.sta = peer->sta; + status.skb = msdu; + status.info = info; + status.rate = &arsta->last_txrate; +rcu_read_unlock (); +ieee80211_tx_status_ext (ar->hw, &status); +spin_unlock_bh (&ab->data_lock); +return ; exit:rcu_read_unlock ();
Signature · 1 line
2.20.1
Re: [PATCH 6/6] ath11k: switch to using ieee80211_tx_status_ext()
drivers/net/wireless/ath/ath11k/dp_tx.c static void ath11k_dp_tx_complete_msdu(struct · line 437
Quoted 7 lines
drivers/net/wireless/ath/ath11k/dp_tx.c +3
-1@@ -431,12 +434,18 @@ static void ath11k_dp_tx_complete_msdu(struct ath11k *ar, -ieee80211_tx_status (ar->hw, msdu); +spin_lock_bh (&ab->data_lock); + peer =ath11k_peer_find_by_id (ab, ts->peer_id); + arsta = (struct ath11k_sta *)peer->sta->drv_priv;
Hi John,
Accesing sta when peer is deleted is causing null pointer dereference issue.
Thanks
Pradeep