336c331ef0
commit 4fe40b8e1566dad04c87fbf299049a1d0d4bd58d upstream.
Deferring sampling attempts to the second stage has some bad interactions
with drivers that process the rate table in hardware and use the probe flag
to indicate probing packets (e.g. most mt76 drivers). On affected drivers
it can lead to probing not working at all.
If the link conditions turn worse, it might not be such a good idea to
do a lot of sampling for lower rates in this case.
Fix this by simply skipping the sample attempt instead of deferring it,
but keep the checks that would allow it to be sampled if it was skipped
too often, but only if it has less than 95% success probability.
Also ensure that IEEE80211_TX_CTL_RATE_CTRL_PROBE is set for all probing
packets.
Cc: stable@vger.kernel.org
Fixes: cccf129f82 ("mac80211: add the 'minstrel' rate control algorithm")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20201111183359.43528-2-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
136 lines
2.9 KiB
C
136 lines
2.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
|
|
*/
|
|
|
|
#ifndef __RC_MINSTREL_H
|
|
#define __RC_MINSTREL_H
|
|
|
|
#define EWMA_LEVEL 96 /* ewma weighting factor [/EWMA_DIV] */
|
|
#define EWMA_DIV 128
|
|
#define SAMPLE_COLUMNS 10 /* number of columns in sample table */
|
|
|
|
/* scaled fraction values */
|
|
#define MINSTREL_SCALE 12
|
|
#define MINSTREL_FRAC(val, div) (((val) << MINSTREL_SCALE) / div)
|
|
#define MINSTREL_TRUNC(val) ((val) >> MINSTREL_SCALE)
|
|
|
|
/* number of highest throughput rates to consider*/
|
|
#define MAX_THR_RATES 4
|
|
|
|
/*
|
|
* Perform EWMA (Exponentially Weighted Moving Average) calculation
|
|
*/
|
|
static inline int
|
|
minstrel_ewma(int old, int new, int weight)
|
|
{
|
|
int diff, incr;
|
|
|
|
diff = new - old;
|
|
incr = (EWMA_DIV - weight) * diff / EWMA_DIV;
|
|
|
|
return old + incr;
|
|
}
|
|
|
|
struct minstrel_rate_stats {
|
|
/* current / last sampling period attempts/success counters */
|
|
u16 attempts, last_attempts;
|
|
u16 success, last_success;
|
|
|
|
/* total attempts/success counters */
|
|
u32 att_hist, succ_hist;
|
|
|
|
/* prob_ewma - exponential weighted moving average of prob */
|
|
u16 prob_ewma;
|
|
|
|
/* maximum retry counts */
|
|
u8 retry_count;
|
|
u8 retry_count_rtscts;
|
|
|
|
u8 sample_skipped;
|
|
bool retry_updated;
|
|
};
|
|
|
|
struct minstrel_rate {
|
|
int bitrate;
|
|
|
|
s8 rix;
|
|
u8 retry_count_cts;
|
|
u8 adjusted_retry_count;
|
|
|
|
unsigned int perfect_tx_time;
|
|
unsigned int ack_time;
|
|
|
|
int sample_limit;
|
|
|
|
struct minstrel_rate_stats stats;
|
|
};
|
|
|
|
struct minstrel_sta_info {
|
|
struct ieee80211_sta *sta;
|
|
|
|
unsigned long last_stats_update;
|
|
unsigned int sp_ack_dur;
|
|
unsigned int rate_avg;
|
|
|
|
unsigned int lowest_rix;
|
|
|
|
u8 max_tp_rate[MAX_THR_RATES];
|
|
u8 max_prob_rate;
|
|
unsigned int total_packets;
|
|
unsigned int sample_packets;
|
|
|
|
unsigned int sample_row;
|
|
unsigned int sample_column;
|
|
|
|
int n_rates;
|
|
struct minstrel_rate *r;
|
|
bool prev_sample;
|
|
|
|
/* sampling table */
|
|
u8 *sample_table;
|
|
};
|
|
|
|
struct minstrel_priv {
|
|
struct ieee80211_hw *hw;
|
|
bool has_mrr;
|
|
u32 sample_switch;
|
|
unsigned int cw_min;
|
|
unsigned int cw_max;
|
|
unsigned int max_retry;
|
|
unsigned int segment_size;
|
|
unsigned int update_interval;
|
|
unsigned int lookaround_rate;
|
|
unsigned int lookaround_rate_mrr;
|
|
|
|
u8 cck_rates[4];
|
|
|
|
#ifdef CONFIG_MAC80211_DEBUGFS
|
|
/*
|
|
* enable fixed rate processing per RC
|
|
* - write static index to debugfs:ieee80211/phyX/rc/fixed_rate_idx
|
|
* - write -1 to enable RC processing again
|
|
* - setting will be applied on next update
|
|
*/
|
|
u32 fixed_rate_idx;
|
|
#endif
|
|
};
|
|
|
|
struct minstrel_debugfs_info {
|
|
size_t len;
|
|
char buf[];
|
|
};
|
|
|
|
extern const struct rate_control_ops mac80211_minstrel;
|
|
void minstrel_add_sta_debugfs(void *priv, void *priv_sta, struct dentry *dir);
|
|
|
|
/* Recalculate success probabilities and counters for a given rate using EWMA */
|
|
void minstrel_calc_rate_stats(struct minstrel_rate_stats *mrs);
|
|
int minstrel_get_tp_avg(struct minstrel_rate *mr, int prob_ewma);
|
|
|
|
/* debugfs */
|
|
int minstrel_stats_open(struct inode *inode, struct file *file);
|
|
int minstrel_stats_csv_open(struct inode *inode, struct file *file);
|
|
|
|
#endif
|