replace minstrel with minstrel_ht
v3 cover replace minstrel with minstrel_ht
The legacy minstrel code is essentially unmaintained and receives only very little testing. In order to bring the significant algorithm improvements from minstrel_ht to legacy clients, this patch adds support for OFDM rates to minstrel_ht and removes the fallback to the legacy codepath.
This also makes it work much better on hardware with rate selection constraints, e.g. mt76.
Changes in v3:
- add cover letter
- fix uninitialized stack variable
- add extra patch to fix significant rounding error in tpt calculation
Changes in v2:
- fix using legacy-rates overhead in tpt calculation
Felix Fietkau (9):
mac80211: minstrel_ht: clean up CCK code
mac80211: minstrel_ht: add support for OFDM rates on non-HT clients
mac80211: remove legacy minstrel rate control
mac80211: minstrel_ht: remove old ewma based rate average code
mac80211: minstrel_ht: improve ampdu length estimation
mac80211: minstrel_ht: improve sample rate selection
mac80211: minstrel_ht: fix max probability rate selection
mac80211: minstrel_ht: increase stats update interval
mac80211: minstrel_ht: fix rounding error in throughput calculation
net/mac80211/Makefile | 2 - net/mac80211/rc80211_minstrel.c | 574 --------------------- net/mac80211/rc80211_minstrel.h | 184 ------- net/mac80211/rc80211_minstrel_debugfs.c | 172 ------ net/mac80211/rc80211_minstrel_ht.c | 560 +++++++++++++------- net/mac80211/rc80211_minstrel_ht.h | 96 +++- net/mac80211/rc80211_minstrel_ht_debugfs.c | 57 +- 7 files changed, 482 insertions(+), 1163 deletions(-) delete mode 100644 net/mac80211/rc80211_minstrel.c delete mode 100644 net/mac80211/rc80211_minstrel.h delete mode 100644 net/mac80211/rc80211_minstrel_debugfs.c
Signature · 1 line
2.28.0
PATCH v3 1/9 mac80211: minstrel_ht: clean up CCK code
- move ack overhead out of rate duration table
- remove cck_supported, cck_supported_short
Preparation for adding OFDM legacy rates support
--- net/mac80211/rc80211_minstrel_ht.c | 54 +++++++++++++++++------------- net/mac80211/rc80211_minstrel_ht.h | 5 ++- 2 files changed, 32 insertions(+), 27 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +30 -24
@@ -136,20 +136,16 @@__VHT_GROUP (_streams, _sgi, _bw, \ VHT_GROUP_SHIFT(_streams, _sgi, _bw)) -#define CCK_DURATION (_bitrate, _short, _len) \ +#define CCK_DURATION (_bitrate, _short) \ (1000 * (10 /* SIFS */ + \ (_short ? 72 + 24 : 144 + 48) + \ - (8 * (_len + 4) * 10) / (_bitrate))) - -#define CCK_ACK_DURATION (_bitrate, _short) \ - (CCK_DURATION((_bitrate > 10 ? 20 : 10), false, 60) + \ - CCK_DURATION(_bitrate, _short, AVG_PKT_SIZE)) + (8 * (AVG_PKT_SIZE + 4) * 10) / (_bitrate)))#define CCK_DURATION_LIST (_short, _s) \ - CCK_ACK_DURATION(10, _short) >> _s, \ - CCK_ACK_DURATION(20, _short) >> _s, \ - CCK_ACK_DURATION(55, _short) >> _s, \ - CCK_ACK_DURATION(110, _short) >> _s + CCK_DURATION(10, _short) >> _s, \ + CCK_DURATION(20, _short) >> _s, \ + CCK_DURATION(55, _short) >> _s, \ + CCK_DURATION(110, _short) >> _s#define __CCK_GROUP (_s) \ [MINSTREL_CCK_GROUP] = { \
@@ -163,7 +159,7 @@ }#define CCK_GROUP_SHIFT \ - GROUP_SHIFT(CCK_ACK_DURATION(10, false)) + GROUP_SHIFT(CCK_DURATION(10, false))#define CCK_GROUP __CCK_GROUP(CCK_GROUP_SHIFT)
@@ -349,15 +345,19 @@ int minstrel_ht_get_tp_avg(struct minstrel_ht_sta *mi, int group, int rate, int prob_avg) { - unsigned int nsecs = 0; + unsigned int nsecs = 0, overhead = mi->overhead; +unsigned int ampdu_len =1 ;/* do not account throughput if sucess prob is below 10% */ if (prob_avg <MINSTREL_FRAC (10 ,100 ))return 0 ; -if (group !=MINSTREL_CCK_GROUP ) - nsecs =1000 * mi->overhead /minstrel_ht_avg_ampdu_len (mi); +if (group ==MINSTREL_CCK_GROUP ) + overhead = mi->overhead_legacy; +else + ampdu_len =minstrel_ht_avg_ampdu_len (mi); + nsecs =1000 * overhead / ampdu_len; nsecs += minstrel_mcs_groups[group].duration[rate] << minstrel_mcs_groups[group].shift;
@@ -1031,7 +1031,10 @@ minstrel_calc_retransmit(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, ctime += (t_slot * cw) >>1 ; cw =min ((cw <<1 ) |1 , mp->cw_max); -if (index /MCS_GROUP_RATES !=MINSTREL_CCK_GROUP ) { +if (index /MCS_GROUP_RATES ==MINSTREL_CCK_GROUP ) { + overhead = mi->overhead_legacy; + overhead_rtscts = mi->overhead_legacy_rtscts; + }else { overhead = mi->overhead; overhead_rtscts = mi->overhead_rtscts; }
@@ -1369,18 +1372,14 @@ minstrel_ht_update_cck(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,if (!ieee80211_hw_check (mp->hw,SUPPORTS_HT_CCK_RATES ))return ; - mi->cck_supported =0 ; - mi->cck_supported_short =0 ;for (i =0 ; i <4 ; i++) {if (!rate_supported (sta, sband->band, mp->cck_rates[i]))continue ; - mi->cck_supported |=BIT (i); + mi->supported[MINSTREL_CCK_GROUP ] |=BIT (i);if (sband->bitrates[i].flags &IEEE80211_RATE_SHORT_PREAMBLE ) - mi->cck_supported_short |=BIT (i); + mi->supported[MINSTREL_CCK_GROUP ] |=BIT (i +4 ); } - - mi->supported[MINSTREL_CCK_GROUP ] = mi->cck_supported; } static void
@@ -1394,12 +1393,13 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;u16 ht_cap = sta->ht_cap.cap;struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap; +const struct ieee80211_rate *ctl_rate; +bool ldpc, erp;int use_vht;int n_supported =0 ;int ack_dur;int stbc;int i; -bool ldpc;/* fall back to the old minstrel for legacy stations */ if (!sta->ht_cap.ht_supported)
@@ -1423,6 +1423,14 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband, mi->overhead += ack_dur; mi->overhead_rtscts = mi->overhead +2 * ack_dur; + ctl_rate = &sband->bitrates[rate_lowest_index (sband, sta)]; + erp = ctl_rate->flags &IEEE80211_RATE_ERP_G ; + ack_dur =ieee80211_frame_duration (sband->band,10 , + ctl_rate->bitrate, erp,1 , +ieee80211_chandef_get_shift (chandef)); + mi->overhead_legacy = ack_dur; + mi->overhead_legacy_rtscts = mi->overhead_legacy +2 * ack_dur; + mi->avg_ampdu_len =MINSTREL_FRAC (1 ,1 );/* When using MRR, sample more on the first attempt, without delay */
@@ -1523,8 +1531,6 @@ minstrel_ht_update_caps(void *priv, struct ieee80211_supported_band *sband,if (!n_supported) goto use_legacy; - mi->supported[MINSTREL_CCK_GROUP ] |= mi->cck_supported_short <<4 ; -/* create an initial rate table with the lowest supported rates */ minstrel_ht_update_stats (mp, mi, true);minstrel_ht_update_rates (mp, mi);
net/mac80211/rc80211_minstrel_ht.h +2 -3
@@ -77,6 +77,8 @@ struct minstrel_ht_sta {/* overhead time in usec for each frame */ unsigned int overhead;unsigned int overhead_rtscts; +unsigned int overhead_legacy; +unsigned int overhead_legacy_rtscts;unsigned int total_packets_last;unsigned int total_packets_cur;
@@ -97,9 +99,6 @@ struct minstrel_ht_sta {/* current MCS group to be sampled */ u8 sample_group; -u8 cck_supported; -u8 cck_supported_short; -/* Bitfield of supported MCS rates of all groups */ u16 supported[MINSTREL_GROUPS_NB ];
Signature · 1 line
2.28.0
PATCH v3 2/9 mac80211: minstrel_ht: add support for OFDM rates on non-HT clients
In reply to Felix FietkauThe legacy minstrel code is essentially unmaintained and receives only very little testing. In order to bring the significant algorithm improvements from minstrel_ht to legacy clients, this patch adds support for OFDM rates to minstrel_ht and removes the fallback to the legacy codepath.
This also makes it work much better on hardware with rate selection constraints, e.g. mt76.
--- net/mac80211/rc80211_minstrel.h | 1 + net/mac80211/rc80211_minstrel_ht.c | 283 ++++++++++++++------- net/mac80211/rc80211_minstrel_ht.h | 17 +- net/mac80211/rc80211_minstrel_ht_debugfs.c | 39 ++- 4 files changed, 224 insertions(+), 116 deletions(-)
net/mac80211/rc80211_minstrel.h +1 -0
@@ -152,6 +152,7 @@ struct minstrel_priv {unsigned int lookaround_rate_mrr;u8 cck_rates[4 ]; +u8 ofdm_rates[NUM_NL80211_BANDS ][8 ];#ifdef CONFIG_MAC80211_DEBUGFS /*
net/mac80211/rc80211_minstrel_ht.c +196 -87
547 lines not on this page · raw message
net/mac80211/rc80211_minstrel_ht.h +9 -8
@@ -18,14 +18,15 @@ MINSTREL_HT_STREAM_GROUPS)#define MINSTREL_VHT_GROUPS_NB (MINSTREL_MAX_STREAMS * \ MINSTREL_VHT_STREAM_GROUPS) -#define MINSTREL_CCK_GROUPS_NB 1 +#define MINSTREL_LEGACY_GROUPS_NB 2#define MINSTREL_GROUPS_NB (MINSTREL_HT_GROUPS_NB + \ MINSTREL_VHT_GROUPS_NB + \ - MINSTREL_CCK_GROUPS_NB) + MINSTREL_LEGACY_GROUPS_NB)#define MINSTREL_HT_GROUP_0 0#define MINSTREL_CCK_GROUP (MINSTREL_HT_GROUP_0 + MINSTREL_HT_GROUPS_NB) -#define MINSTREL_VHT_GROUP_0 (MINSTREL_CCK_GROUP + 1) +#define MINSTREL_OFDM_GROUP (MINSTREL_CCK_GROUP + 1) +#define MINSTREL_VHT_GROUP_0 (MINSTREL_OFDM_GROUP + 1)#define MCS_GROUP_RATES 10
@@ -37,6 +38,8 @@ struct mcs_group {u16 duration[MCS_GROUP_RATES ]; }; +extern const s16 minstrel_cck_bitrates[4 ]; +extern const s16 minstrel_ofdm_bitrates[8 ];extern const struct mcs_group minstrel_mcs_groups[];struct minstrel_mcs_group_data {
@@ -99,6 +102,8 @@ struct minstrel_ht_sta {/* current MCS group to be sampled */ u8 sample_group; +u8 band; +/* Bitfield of supported MCS rates of all groups */ u16 supported[MINSTREL_GROUPS_NB ];
@@ -107,13 +112,9 @@ struct minstrel_ht_sta { };struct minstrel_ht_sta_priv { -union { -struct minstrel_ht_sta ht; -struct minstrel_sta_info legacy; - }; +struct minstrel_ht_sta ht;void *ratelist;void *sample_table; -bool is_ht; };void minstrel_ht_add_sta_debugfs (void *priv,void *priv_sta,struct dentry *dir);
net/mac80211/rc80211_minstrel_ht_debugfs.c +18 -21
@@ -52,7 +52,6 @@ minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p)for (j =0 ; j <MCS_GROUP_RATES ; j++) {struct minstrel_rate_stats *mrs = &mi->groups[i].rates[j]; -static const int bitrates[4 ] = {10 ,20 ,55 ,110 };int idx = i *MCS_GROUP_RATES + j;unsigned int duration;
@@ -67,6 +66,9 @@ minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p) p +=sprintf (p,"VHT%c0 " , htmode); p +=sprintf (p,"%cGI " , gimode); p +=sprintf (p,"%d " , mg->streams); + }else if (i ==MINSTREL_OFDM_GROUP ) { + p +=sprintf (p,"OFDM " ); + p +=sprintf (p,"1 " ); }else { p +=sprintf (p,"CCK " ); p +=sprintf (p,"%cP " , j <4 ?'L' :'S' );
@@ -84,7 +86,12 @@ minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p) }else if (gflags &IEEE80211_TX_RC_VHT_MCS ) { p +=sprintf (p," MCS%-1u/%1u" , j, mg->streams); }else { -int r = bitrates[j %4 ]; +int r; + +if (i ==MINSTREL_OFDM_GROUP ) + r = minstrel_ofdm_bitrates[j %8 ]; +else + r = minstrel_cck_bitrates[j %4 ]; p +=sprintf (p," %2u.%1uM" , r /10 , r %10 ); }
@@ -124,16 +131,8 @@ minstrel_ht_stats_open(struct inode *inode, struct file *file)struct minstrel_ht_sta *mi = &msp->ht;struct minstrel_debugfs_info *ms;unsigned int i; -int ret;char *p; -if (!msp->is_ht) { - inode->i_private = &msp->legacy; - ret =minstrel_stats_open (inode, file); - inode->i_private = msp; -return ret; - } - ms =kmalloc (32768 ,GFP_KERNEL );if (!ms)return -ENOMEM ;
@@ -199,7 +198,6 @@ minstrel_ht_stats_csv_dump(struct minstrel_ht_sta *mi, int i, char *p)for (j =0 ; j <MCS_GROUP_RATES ; j++) {struct minstrel_rate_stats *mrs = &mi->groups[i].rates[j]; -static const int bitrates[4 ] = {10 ,20 ,55 ,110 };int idx = i *MCS_GROUP_RATES + j;unsigned int duration;
@@ -214,6 +212,8 @@ minstrel_ht_stats_csv_dump(struct minstrel_ht_sta *mi, int i, char *p) p +=sprintf (p,"VHT%c0," , htmode); p +=sprintf (p,"%cGI," , gimode); p +=sprintf (p,"%d," , mg->streams); + }else if (i ==MINSTREL_OFDM_GROUP ) { + p +=sprintf (p,"OFDM,,1," ); }else { p +=sprintf (p,"CCK," ); p +=sprintf (p,"%cP," , j <4 ?'L' :'S' );
@@ -231,7 +231,13 @@ minstrel_ht_stats_csv_dump(struct minstrel_ht_sta *mi, int i, char *p) }else if (gflags &IEEE80211_TX_RC_VHT_MCS ) { p +=sprintf (p,",MCS%-1u/%1u," , j, mg->streams); }else { -int r = bitrates[j %4 ]; +int r; + +if (i ==MINSTREL_OFDM_GROUP ) + r = minstrel_ofdm_bitrates[j %8 ]; +else + r = minstrel_cck_bitrates[j %4 ]; + p +=sprintf (p,",%2u.%1uM," , r /10 , r %10 ); }
@@ -274,18 +280,9 @@ minstrel_ht_stats_csv_open(struct inode *inode, struct file *file)struct minstrel_ht_sta *mi = &msp->ht;struct minstrel_debugfs_info *ms;unsigned int i; -int ret;char *p; -if (!msp->is_ht) { - inode->i_private = &msp->legacy; - ret =minstrel_stats_csv_open (inode, file); - inode->i_private = msp; -return ret; - } - ms =kmalloc (32768 ,GFP_KERNEL ); -if (!ms)return -ENOMEM ;
Signature · 1 line
2.28.0
PATCH v3 3/9 mac80211: remove legacy minstrel rate control
In reply to Felix FietkauNow that minstrel_ht supports legacy rates, it is no longer needed
--- net/mac80211/Makefile | 2 - net/mac80211/rc80211_minstrel.c | 574 --------------------- net/mac80211/rc80211_minstrel.h | 185 ------- net/mac80211/rc80211_minstrel_debugfs.c | 172 ------ net/mac80211/rc80211_minstrel_ht.c | 126 +++-- net/mac80211/rc80211_minstrel_ht.h | 79 ++- net/mac80211/rc80211_minstrel_ht_debugfs.c | 18 +- 7 files changed, 167 insertions(+), 989 deletions(-) delete mode 100644 net/mac80211/rc80211_minstrel.c delete mode 100644 net/mac80211/rc80211_minstrel.h delete mode 100644 net/mac80211/rc80211_minstrel_debugfs.c
net/mac80211/Makefile +0 -2
@@ -56,11 +56,9 @@ mac80211-$(CONFIG_PM) += pm.o CFLAGS_trace.o := -I$(src) rc80211_minstrel-y := \ - rc80211_minstrel.o \ rc80211_minstrel_ht.o rc80211_minstrel-$(CONFIG_MAC80211_DEBUGFS) += \ - rc80211_minstrel_debugfs.o \ rc80211_minstrel_ht_debugfs.o mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)
net/mac80211/rc80211_minstrel.c deleted +0 -574
574 lines not on this page · raw message
net/mac80211/rc80211_minstrel.h deleted +0 -185
185 lines not on this page · raw message
net/mac80211/rc80211_minstrel_debugfs.c deleted +0 -172
172 lines not on this page · raw message
net/mac80211/rc80211_minstrel_ht.c +85 -41
191 lines not on this page · raw message
net/mac80211/rc80211_minstrel_ht.h +73 -6
103 lines not on this page · raw message
net/mac80211/rc80211_minstrel_ht_debugfs.c +9 -9
@@ -9,9 +9,13 @@#include <linux/ieee80211.h> #include <linux/export.h> #include <net/mac80211.h> -#include "rc80211_minstrel.h" #include "rc80211_minstrel_ht.h" +struct minstrel_debugfs_info { +size_t len; +char buf[]; +}; +static ssize_t minstrel_stats_read (struct file *file,char __user *buf,size_t len,loff_t *ppos) {
@@ -127,8 +131,7 @@ minstrel_ht_stats_dump(struct minstrel_ht_sta *mi, int i, char *p)static int minstrel_ht_stats_open (struct inode *inode,struct file *file) { -struct minstrel_ht_sta_priv *msp = inode->i_private; -struct minstrel_ht_sta *mi = &msp->ht; +struct minstrel_ht_sta *mi = inode->i_private;struct minstrel_debugfs_info *ms;unsigned int i;char *p;
@@ -276,8 +279,7 @@ minstrel_ht_stats_csv_dump(struct minstrel_ht_sta *mi, int i, char *p)static int minstrel_ht_stats_csv_open (struct inode *inode,struct file *file) { -struct minstrel_ht_sta_priv *msp = inode->i_private; -struct minstrel_ht_sta *mi = &msp->ht; +struct minstrel_ht_sta *mi = inode->i_private;struct minstrel_debugfs_info *ms;unsigned int i;char *p;
@@ -313,10 +315,8 @@ static const struct file_operations minstrel_ht_stat_csv_fops = {void minstrel_ht_add_sta_debugfs (void *priv,void *priv_sta,struct dentry *dir) { -struct minstrel_ht_sta_priv *msp = priv_sta; - -debugfs_create_file ("rc_stats" ,0444 , dir, msp, +debugfs_create_file ("rc_stats" ,0444 , dir, priv_sta, &minstrel_ht_stat_fops); -debugfs_create_file ("rc_stats_csv" ,0444 , dir, msp, +debugfs_create_file ("rc_stats_csv" ,0444 , dir, priv_sta, &minstrel_ht_stat_csv_fops); }
Signature · 1 line
2.28.0
PATCH v3 4/9 mac80211: minstrel_ht: remove old ewma based rate average code
In reply to Felix FietkauThe new noise filter has been the default for a while now with no reported downside and significant improvement compared to the old code.
--- net/mac80211/rc80211_minstrel_ht.c | 31 ++++++++---------------------- net/mac80211/rc80211_minstrel_ht.h | 1 - 2 files changed, 8 insertions(+), 24 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +8 -23
@@ -769,17 +769,8 @@ minstrel_ht_calc_rate_stats(struct minstrel_priv *mp,if (unlikely (mrs->attempts >0 )) { mrs->sample_skipped =0 ; cur_prob =MINSTREL_FRAC (mrs->success, mrs->attempts); -if (mp->new_avg) { -minstrel_filter_avg_add (&mrs->prob_avg, - &mrs->prob_avg_1, cur_prob); - }else if (unlikely (!mrs->att_hist)) { - mrs->prob_avg = cur_prob; - }else { -/*update exponential weighted moving avarage */ - mrs->prob_avg =minstrel_ewma (mrs->prob_avg, - cur_prob, -EWMA_LEVEL ); - } +minstrel_filter_avg_add (&mrs->prob_avg, + &mrs->prob_avg_1, cur_prob); mrs->att_hist += mrs->attempts; mrs->succ_hist += mrs->success; }else {
@@ -913,10 +904,8 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,/* Try to increase robustness of max_prob_rate*/ minstrel_ht_prob_rate_reduce_streams (mi); -/* try to sample all available rates during each interval */ - mi->sample_count *=8 ; -if (mp->new_avg) - mi->sample_count /=2 ; +/* try to sample half of all available rates during each interval */ + mi->sample_count *=4 ;if (sample)minstrel_ht_rate_sample_switch (mp, mi);
@@ -1040,7 +1029,7 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,struct ieee80211_tx_rate *ar = info->status.rates;struct minstrel_rate_stats *rate, *rate2, *rate_sample =NULL ;struct minstrel_priv *mp = priv; -u32 update_interval = mp->update_interval /2 ; +u32 update_interval = mp->update_interval;bool last, update = false;bool sample_status = false;int i;
@@ -1090,9 +1079,8 @@ minstrel_ht_tx_status(void *priv, struct ieee80211_supported_band *sband,switch (mi->sample_mode) {case MINSTREL_SAMPLE_IDLE : -if (mp->new_avg && - (mp->hw->max_rates >1 || - mi->total_packets_cur <SAMPLE_SWITCH_THR )) +if (mp->hw->max_rates >1 || + mi->total_packets_cur <SAMPLE_SWITCH_THR ) update_interval /=2 ;break ;
@@ -1832,8 +1820,7 @@ minstrel_ht_alloc(struct ieee80211_hw *hw) mp->has_mrr = true; mp->hw = hw; - mp->update_interval =HZ /10 ; - mp->new_avg = true; + mp->update_interval =HZ /20 ;minstrel_ht_init_cck_rates (mp);for (i =0 ; i <ARRAY_SIZE (mp->hw->wiphy->bands); i++)
@@ -1853,8 +1840,6 @@ static void minstrel_ht_add_debugfs(struct ieee80211_hw *hw, void *priv, &mp->fixed_rate_idx);debugfs_create_u32 ("sample_switch" ,S_IRUGO |S_IWUSR , debugfsdir, &mp->sample_switch); -debugfs_create_bool ("new_avg" ,S_IRUGO |S_IWUSR , debugfsdir, - &mp->new_avg); }#endif
net/mac80211/rc80211_minstrel_ht.h +0 -1
@@ -60,7 +60,6 @@struct minstrel_priv {struct ieee80211_hw *hw;bool has_mrr; -bool new_avg;u32 sample_switch;unsigned int cw_min;unsigned int cw_max;
Signature · 1 line
2.28.0
PATCH v3 5/9 mac80211: minstrel_ht: improve ampdu length estimation
In reply to Felix FietkauIf the driver does not report A-MPDU length, estimate it based on the rate.
--- net/mac80211/rc80211_minstrel_ht.c | 38 +++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +27 -11
@@ -382,13 +382,37 @@ minstrel_get_ratestats(struct minstrel_ht_sta *mi, int index)return &mi->groups[index /MCS_GROUP_RATES ].rates[index %MCS_GROUP_RATES ]; } +static inline int +minstrel_get_duration (int index) +{ +const struct mcs_group *group = &minstrel_mcs_groups[index /MCS_GROUP_RATES ]; +unsigned int duration = group->duration[index %MCS_GROUP_RATES ]; +return duration << group->shift; +} +static unsigned int minstrel_ht_avg_ampdu_len (struct minstrel_ht_sta *mi) { -if (!mi->avg_ampdu_len) -return AVG_AMPDU_SIZE ; +int duration; + +if (mi->avg_ampdu_len) +return MINSTREL_TRUNC (mi->avg_ampdu_len); + +if (minstrel_ht_is_legacy_group (mi->max_tp_rate[0 ] /MCS_GROUP_RATES )) +return 1 ; + + duration =minstrel_get_duration (mi->max_tp_rate[0 ]); -return MINSTREL_TRUNC (mi->avg_ampdu_len); +if (duration >400 *1000 ) +return 2 ; + +if (duration >250 *1000 ) +return 4 ; + +if (duration >150 *1000 ) +return 8 ; + +return 16 ; }/*
@@ -588,14 +612,6 @@ minstrel_ht_prob_rate_reduce_streams(struct minstrel_ht_sta *mi) } } -static inline int -minstrel_get_duration (int index) -{ -const struct mcs_group *group = &minstrel_mcs_groups[index /MCS_GROUP_RATES ]; -unsigned int duration = group->duration[index %MCS_GROUP_RATES ]; -return duration << group->shift; -} -static bool minstrel_ht_probe_group (struct minstrel_ht_sta *mi,const struct mcs_group *tp_group,int tp_idx,const struct mcs_group *group)
Signature · 1 line
2.28.0
PATCH v3 6/9 mac80211: minstrel_ht: improve sample rate selection
In reply to Felix FietkauAlways allow sampling of rates faster than the primary max throughput rate. When the second max_tp_rate is higher than the first one, sample attempts were previously skipped, potentially causing rate control to get stuck at a slightly lower rate
--- net/mac80211/rc80211_minstrel_ht.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +3 -3
@@ -1379,13 +1379,13 @@ minstrel_get_sample_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi) mrs = &mg->rates[sample_idx]; sample_idx += sample_group *MCS_GROUP_RATES ; -/* Set tp_rate1, tp_rate2 to the highest / second highest max_tp_rate */ + tp_rate1 = mi->max_tp_rate[0 ]; + +/* Set tp_rate2 to the second highest max_tp_rate */ if (minstrel_get_duration (mi->max_tp_rate[0 ]) >minstrel_get_duration (mi->max_tp_rate[1 ])) { - tp_rate1 = mi->max_tp_rate[1 ]; tp_rate2 = mi->max_tp_rate[0 ]; }else { - tp_rate1 = mi->max_tp_rate[0 ]; tp_rate2 = mi->max_tp_rate[1 ]; }
Signature · 1 line
2.28.0
PATCH v3 7/9 mac80211: minstrel_ht: fix max probability rate selection
In reply to Felix Fietkau- do not select rates faster than the max throughput rate if probability is lower
- reset previous rate before sorting again
This ensures that the max prob rate gets set to a more reliable rate
--- net/mac80211/rc80211_minstrel_ht.c | 47 ++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 9 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +38 -9
@@ -495,12 +495,13 @@ minstrel_ht_sort_best_tp_rates(struct minstrel_ht_sta *mi, u16 index,* Find and set the topmost probability rate per sta and per group */ static void -minstrel_ht_set_best_prob_rate (struct minstrel_ht_sta *mi,u16 index) +minstrel_ht_set_best_prob_rate (struct minstrel_ht_sta *mi,u16 *dest,u16 index) {struct minstrel_mcs_group_data *mg;struct minstrel_rate_stats *mrs;int tmp_group, tmp_idx, tmp_tp_avg, tmp_prob; -int max_tp_group, cur_tp_avg, cur_group, cur_idx; +int max_tp_group, max_tp_idx, max_tp_prob; +int cur_tp_avg, cur_group, cur_idx;int max_gpr_group, max_gpr_idx;int max_gpr_tp_avg, max_gpr_prob;
@@ -509,18 +510,26 @@ minstrel_ht_set_best_prob_rate(struct minstrel_ht_sta *mi, u16 index) mg = &mi->groups[index /MCS_GROUP_RATES ]; mrs = &mg->rates[index %MCS_GROUP_RATES ]; - tmp_group = mi->max_prob_rate /MCS_GROUP_RATES ; - tmp_idx = mi->max_prob_rate %MCS_GROUP_RATES ; + tmp_group = *dest /MCS_GROUP_RATES ; + tmp_idx = *dest %MCS_GROUP_RATES ; tmp_prob = mi->groups[tmp_group].rates[tmp_idx].prob_avg; tmp_tp_avg =minstrel_ht_get_tp_avg (mi, tmp_group, tmp_idx, tmp_prob);/* if max_tp_rate[0] is from MCS_GROUP max_prob_rate get selected from * MCS_GROUP as well as CCK_GROUP rates do not allow aggregation */ max_tp_group = mi->max_tp_rate[0 ] /MCS_GROUP_RATES ; + max_tp_idx = mi->max_tp_rate[0 ] %MCS_GROUP_RATES ; + max_tp_prob = mi->groups[max_tp_group].rates[max_tp_idx].prob_avg; +if (minstrel_ht_is_legacy_group (index /MCS_GROUP_RATES ) && !minstrel_ht_is_legacy_group (max_tp_group))return ; +/* skip rates faster than max tp rate with lower prob */ +if (minstrel_get_duration (mi->max_tp_rate[0 ]) >minstrel_get_duration (index) && + mrs->prob_avg < max_tp_prob) +return ; + max_gpr_group = mg->max_group_prob_rate /MCS_GROUP_RATES ; max_gpr_idx = mg->max_group_prob_rate %MCS_GROUP_RATES ; max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_avg;
@@ -538,7 +547,7 @@ minstrel_ht_set_best_prob_rate(struct minstrel_ht_sta *mi, u16 index) mg->max_group_prob_rate = index; }else {if (mrs->prob_avg > tmp_prob) - mi->max_prob_rate = index; + *dest = index;if (mrs->prob_avg > max_gpr_prob) mg->max_group_prob_rate = index; }
@@ -816,7 +825,8 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,struct minstrel_rate_stats *mrs;int group, i, j, cur_prob;u16 tmp_mcs_tp_rate[MAX_THR_RATES ], tmp_group_tp_rate[MAX_THR_RATES ]; -u16 tmp_legacy_tp_rate[MAX_THR_RATES ], index; +u16 tmp_legacy_tp_rate[MAX_THR_RATES ], tmp_max_prob_rate; +u16 index;bool ht_supported = mi->sta->ht_cap.ht_supported; mi->sample_mode =MINSTREL_SAMPLE_IDLE ;
@@ -863,6 +873,7 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,else index =MINSTREL_OFDM_GROUP *MCS_GROUP_RATES ; + tmp_max_prob_rate = index;for (j =0 ; j <ARRAY_SIZE (tmp_mcs_tp_rate); j++) tmp_mcs_tp_rate[j] = index;
@@ -903,9 +914,6 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi,/* Find max throughput rate set within a group */ minstrel_ht_sort_best_tp_rates (mi, index, tmp_group_tp_rate); - -/* Find max probability rate per group and global */ -minstrel_ht_set_best_prob_rate (mi, index); } memcpy(mg->max_group_tp_rate, tmp_group_tp_rate,
@@ -917,6 +925,27 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, tmp_legacy_tp_rate);memcpy (mi->max_tp_rate, tmp_mcs_tp_rate,sizeof (mi->max_tp_rate)); +for (group =0 ; group <ARRAY_SIZE (minstrel_mcs_groups); group++) { +if (!mi->supported[group]) +continue ; + + mg = &mi->groups[group]; + mg->max_group_prob_rate =MCS_GROUP_RATES * group; + +for (i =0 ; i <MCS_GROUP_RATES ; i++) { +if (!(mi->supported[group] &BIT (i))) +continue ; + + index =MCS_GROUP_RATES * group + i; + +/* Find max probability rate per group and global */ +minstrel_ht_set_best_prob_rate (mi, &tmp_max_prob_rate, + index); + } + } + + mi->max_prob_rate = tmp_max_prob_rate; +/* Try to increase robustness of max_prob_rate*/ minstrel_ht_prob_rate_reduce_streams (mi);
Signature · 1 line
2.28.0
PATCH v3 8/9 mac80211: minstrel_ht: increase stats update interval
In reply to Felix FietkauThe shorter interval was leading to too many frames being used for probing
--- net/mac80211/rc80211_minstrel_ht.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/rc80211_minstrel_ht.c +1 -1
@@ -1865,7 +1865,7 @@ minstrel_ht_alloc(struct ieee80211_hw *hw) mp->has_mrr = true; mp->hw = hw; - mp->update_interval =HZ /20 ; + mp->update_interval =HZ /10 ;minstrel_ht_init_cck_rates (mp);for (i =0 ; i <ARRAY_SIZE (mp->hw->wiphy->bands); i++)
Signature · 1 line
2.28.0
PATCH v3 9/9 mac80211: minstrel_ht: fix rounding error in throughput calculation
In reply to Felix FietkauOn lower data rates, the throughput calculation has a significant rounding error, causing rates like 48M and 54M OFDM to share the same throughput value with >= 90% success probablity.
This is because the result of the division (prob_avg * 1000) / nsecs is really small (8 in this example).
Improve accuracy by moving over some zeroes, making better use of the full range of u32 before the division.
--- net/mac80211/rc80211_minstrel_ht.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/mac80211/rc80211_minstrel_ht.c +3 -4
@@ -445,10 +445,9 @@ minstrel_ht_get_tp_avg(struct minstrel_ht_sta *mi, int group, int rate,* (prob is scaled - see MINSTREL_FRAC above) */ if (prob_avg >MINSTREL_FRAC (90 ,100 )) -return MINSTREL_TRUNC (100000 * ((MINSTREL_FRAC (90 ,100 ) *1000 ) - / nsecs)); -else -return MINSTREL_TRUNC (100000 * ((prob_avg *1000 ) / nsecs)); + prob_avg =MINSTREL_FRAC (90 ,100 ); + +return MINSTREL_TRUNC (100 * ((prob_avg *1000000 ) / nsecs)); }/*
Signature · 1 line
2.28.0