This patch allows for tuning parameters to be set through sysfs. Note that
this lacks locking, as another copy of the whole parameters data would have
been needed and this won't be the final approach anyway, so don't bother
too much.
Signed-off-by: Stefano Brivio <stefano.brivio@xxxxxxxxx>
---
Mattias: oops. Just noticed that my previous approach to locking here was
bogus due to misconceptions about sysfs parameters. It's possible to get
locking right here, but quite troublesome.
Everybody: this lacks proper locking. Never apply this to any sane tree,
please.
---
Index: wireless-2.6/net/mac80211/rc80211_pid.c
===================================================================
--- wireless-2.6.orig/net/mac80211/rc80211_pid.c
+++ wireless-2.6/net/mac80211/rc80211_pid.c
@@ -60,6 +60,51 @@
* RC_PID_ARITH_SHIFT.
*/
+static int modparam_rc_imul = 1;
+module_param_named(rc_imul, modparam_rc_imul, int, 0644);
+MODULE_PARM_DESC(rc_imul, "PID rate control interval multiplier");
+
+static int modparam_rc_idiv = 1;
+module_param_named(rc_idiv, modparam_rc_idiv, int, 0644);
+MODULE_PARM_DESC(rc_idiv, "PID rate control interval divider");
+
+static int modparam_rc_pf = 1;
+module_param_named(rc_pf, modparam_rc_pf, int, 0644);
+MODULE_PARM_DESC(rc_pf, "PID rate control failed frames percentage target");
+
+static int modparam_rc_p = 1;
+module_param_named(rc_p, modparam_rc_p, int, 0644);
+MODULE_PARM_DESC(rc_p, "PID rate control proportional coefficient");
+
+static int modparam_rc_i = 1;
+module_param_named(rc_i, modparam_rc_i, int, 0644);
+MODULE_PARM_DESC(rc_i, "PID rate control integral coefficient");
+
+static int modparam_rc_d = 1;
+module_param_named(rc_d, modparam_rc_d, int, 0644);
+MODULE_PARM_DESC(rc_d, "PID rate control derivative coefficient");
+
+static int modparam_rc_sm_s = 3;
+module_param_named(rc_sm_s, modparam_rc_sm_s, int, 0644);
+MODULE_PARM_DESC(rc_sm_s, "PID rate control smoothing factor shift");
+
+static int modparam_rc_sh_s = 2;
+module_param_named(rc_sh_s, modparam_rc_sh_s, int, 0644);
+MODULE_PARM_DESC(rc_sh_s, "PID rate control sharpening factor shift");
+
+static int modparam_rc_sh_d = 3;
+module_param_named(rc_sh_d, modparam_rc_sh_d, int, 0644);
+MODULE_PARM_DESC(rc_sh_d, "PID rate control sharpening factor duration");
+
+static int modparam_rc_norm_factor = 3;
+module_param_named(rc_norm_factor, modparam_rc_norm_factor, int, 0644);
+MODULE_PARM_DESC(rc_norm_factor, "PID rate behaviour normalization factor");
+
+static int modparam_rc_fast_start = 0;
+module_param_named(rc_fast_start, modparam_rc_fast_start, int, 0644);
+MODULE_PARM_DESC(rc_fast_start, "PID allowance for high rates right after"
+ "loading");
+
/* Sampling frequency for measuring percentage of failed frames. */
#define RC_PID_INTERVAL (HZ / 1)
@@ -158,13 +203,28 @@ struct rc_pid_rateinfo {
struct rc_pid_info {
+ /* Rate control interval multiplier and divider. */
+ int mul;
+ int div;
+
/* The failed frames percentage target. */
- u32 target;
+ int target;
/* P, I and D coefficients. */
- s32 coeff_p;
- s32 coeff_i;
- s32 coeff_d;
+ int coeff_p;
+ int coeff_i;
+ int coeff_d;
+
+ /* Smoothing and sharpening factors. */
+ int sm_s;
+ int sh_s;
+ int sh_d;
+
+ /* Rate behaviour normalization factor. */
+ int norm_factor;
+
+ /* Fast start. */
+ bool fast_start;
/* Rates information. */
struct rc_pid_rateinfo *rinfo;
@@ -245,20 +305,27 @@ static void rate_control_pid_adjust_rate
}
/* Normalize the failed frames per-rate differences. */
-static void rate_control_pid_normalize(struct rc_pid_rateinfo *r, int l)
+static void rate_control_pid_normalize(struct rc_pid_info *p, int l)
{
- int i;
+ int i, nf;
+ struct rc_pid_rateinfo *r = p->rinfo;
- if (r[0].diff > RC_PID_NORM_FACTOR)
- r[0].diff -= RC_PID_NORM_FACTOR;
- else if (r[0].diff < -RC_PID_NORM_FACTOR)
- r[0].diff += RC_PID_NORM_FACTOR;
+ /* TODO: RCU lock needed here when implemented properly. */
+ p->norm_factor = modparam_rc_norm_factor;
+ /* TODO: RCU unlock. */
+
+ nf = p->norm_factor;
+
+ if (r[0].diff > nf)
+ r[0].diff -= nf;
+ else if (r[0].diff < -nf)
+ r[0].diff += nf;
for (i = 0; i < l - 1; i++)
if (likely(r[i + 1].valid)) {
- if (r[i + 1].diff > r[i].diff + RC_PID_NORM_FACTOR)
- r[i + 1].diff -= RC_PID_NORM_FACTOR;
+ if (r[i + 1].diff > r[i].diff + nf)
+ r[i + 1].diff -= nf;
else if (r[i + 1].diff <= r[i].diff)
- r[i + 1].diff += RC_PID_NORM_FACTOR;
+ r[i + 1].diff += nf;
}
}
@@ -280,12 +347,22 @@ static void rate_control_pid_sample(stru
spinfo = sta->rate_ctrl_priv;
spinfo->last_sample = jiffies;
+ /* TODO: RCU lock needed here when implemented properly. */
+ pinfo->target = modparam_rc_pf;
+ pinfo->coeff_p = modparam_rc_p;
+ pinfo->coeff_i = modparam_rc_i;
+ pinfo->coeff_d = modparam_rc_d;
+ pinfo->sm_s = modparam_rc_sm_s;
+ pinfo->sh_s = modparam_rc_sh_s;
+ pinfo->sh_d = modparam_rc_sh_d;
+ /* TODO: RCU unlock. */
+
/* If no frames were transmitted, we assume the old sample is
* still a good measurement and copy it, and turn the sharpening factor
* on. */
if (spinfo->tx_num_xmit == 0) {
pf = spinfo->last_pf;
- spinfo->sharp_cnt = RATE_CONTROL_SHARPENING_DURATION;
+ spinfo->sharp_cnt = pinfo->sh_d;
} else {
pf = spinfo->tx_num_failed * 100 / spinfo->tx_num_xmit;
pf <<= RC_PID_ARITH_SHIFT;
@@ -317,17 +394,17 @@ static void rate_control_pid_sample(stru
rinfo[j].valid = 1;
pinfo->oldrate = sta->txrate;
}
- rate_control_pid_normalize(rinfo, mode->num_rates);
+ rate_control_pid_normalize(pinfo, mode->num_rates);
/* Compute the proportional, integral and derivative errors. */
err_prop = RC_PID_TARGET_PF - pf;
- err_avg = spinfo->err_avg_sc >> RC_PID_SMOOTHING_SHIFT;
+ err_avg = spinfo->err_avg_sc >> pinfo->sm_s;
spinfo->err_avg_sc = spinfo->err_avg_sc - err_avg + err_prop;
- err_int = spinfo->err_avg_sc >> RC_PID_SMOOTHING_SHIFT;
+ err_int = spinfo->err_avg_sc >> pinfo->sm_s;
err_der = pf - spinfo->last_pf
- * (1 + RATE_CONTROL_SHARPENING * spinfo->sharp_cnt);
+ * (1 + (1 << pinfo->sh_s) * spinfo->sharp_cnt);
spinfo->last_pf = pf;
if (spinfo->sharp_cnt)
spinfo->sharp_cnt--;
@@ -389,7 +466,12 @@ static void rate_control_pid_tx_status(v
sta->tx_num_mpdu_fail += status->retry_count;
/* Update PID controller state. */
- if (time_after(jiffies, spinfo->last_sample + RC_PID_INTERVAL))
+ /* TODO: RCU lock needed here when implemented properly. */
+ pinfo->mul = modparam_rc_imul;
+ pinfo->div = modparam_rc_idiv;
+ /* TODO: RCU unlock. */
+ if (time_after(jiffies, spinfo->last_sample
+ + (HZ * pinfo->mul) / pinfo->div))
rate_control_pid_sample(pinfo, local, sta);
sta_info_put(sta);
@@ -457,11 +539,14 @@ static void *rate_control_pid_alloc(stru
return NULL;
}
+ /* TODO: RCU lock needed here when implemented properly. */
+ pinfo->fast_start = modparam_rc_fast_start;
+ /* TODO: RCU unlock. */
/* Sort the rates. This is optimized for the most common case (i.e.
* almost-sorted CCK+OFDM rates). */
for (i = 0; i < mode->num_rates; i++) {
rinfo[i].index = i;
- if (RC_PID_FAST_START) {
+ if (pinfo->fast_start) {
rinfo[i].valid = 1;
rinfo[i].diff = 0;
} else
@@ -484,10 +569,6 @@ static void *rate_control_pid_alloc(stru
rinfo[0].diff = 0;
rinfo[0].valid = 1;
- pinfo->target = RC_PID_TARGET_PF;
- pinfo->coeff_p = RC_PID_COEFF_P;
- pinfo->coeff_i = RC_PID_COEFF_I;
- pinfo->coeff_d = RC_PID_COEFF_D;
pinfo->rinfo = rinfo;
pinfo->oldrate = 0;
--
Ciao
Stefano
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
