mac80211: use DECLARE_EWMA for mesh_fail_avg

As moving average is not considering fractional part, it will
get stuck at the same level after certain state. For example,
with current values, it can get stuck at 96. Fortunately the
current threshold 95%, but if it were increased to 96 or more
mesh paths would never be deactivated. Fix failure average
movement by using EWMA helpers, which does take into account
fractional parts.

Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
[johannes: pick a larger EWMA factor for more precision with
 the limited range that we will feed into it, adjust to new API]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index b747c9645e432bffe5b9d266a51e7ffca3b75ec3..d07ee3ca07ee97c91318139b12c5c2a3b662cc1b 100644 (file)
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -307,10 +307,11 @@ void ieee80211s_update_metric(struct ieee80211_local *local,
 
        failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK);
 
-       /* moving average, scaled to 100 */
-       sta->mesh->fail_avg =
-               ((80 * sta->mesh->fail_avg + 5) / 100 + 20 * failed);
-       if (sta->mesh->fail_avg > 95)
+       /* moving average, scaled to 100.
+        * feed failure as 100 and success as 0
+        */
+       ewma_mesh_fail_avg_add(&sta->mesh->fail_avg, failed * 100);
+       if (ewma_mesh_fail_avg_read(&sta->mesh->fail_avg) > 95)
                mesh_plink_broken(sta);
 }
 
@@ -325,6 +326,8 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
        int rate, err;
        u32 tx_time, estimated_retx;
        u64 result;
+       unsigned long fail_avg =
+               ewma_mesh_fail_avg_read(&sta->mesh->fail_avg);
 
        /* Try to get rate based on HW/SW RC algorithm.
         * Rate is returned in units of Kbps, correct this
@@ -336,7 +339,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
        if (rate) {
                err = 0;
        } else {
-               if (sta->mesh->fail_avg >= 100)
+               if (fail_avg >= 100)
                        return MAX_METRIC;
 
                sta_set_rate_info_tx(sta, &sta->tx_stats.last_rate, &rinfo);
@@ -344,7 +347,7 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
                if (WARN_ON(!rate))
                        return MAX_METRIC;
 
-               err = (sta->mesh->fail_avg << ARITH_SHIFT) / 100;
+               err = (fail_avg << ARITH_SHIFT) / 100;
        }
 
        /* bitrate is in units of 100 Kbps, while we need rate in units of
@@ -484,6 +487,9 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata,
                                          ?  mpath->exp_time : exp_time;
                        mesh_path_activate(mpath);
                        spin_unlock_bh(&mpath->state_lock);
+                       ewma_mesh_fail_avg_init(&sta->mesh->fail_avg);
+                       /* init it at a low value - 0 start is tricky */
+                       ewma_mesh_fail_avg_add(&sta->mesh->fail_avg, 1);
                        mesh_path_tx_pending(mpath);
                        /* draft says preq_id should be saved to, but there does
                         * not seem to be any use for it, skipping by now
@@ -522,6 +528,9 @@ static u32 hwmp_route_info_get(struct ieee80211_sub_if_data *sdata,
                                          ?  mpath->exp_time : exp_time;
                        mesh_path_activate(mpath);
                        spin_unlock_bh(&mpath->state_lock);
+                       ewma_mesh_fail_avg_init(&sta->mesh->fail_avg);
+                       /* init it at a low value - 0 start is tricky */
+                       ewma_mesh_fail_avg_add(&sta->mesh->fail_avg, 1);
                        mesh_path_tx_pending(mpath);
                } else
                        spin_unlock_bh(&mpath->state_lock);

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index f0e6175a9821f01d7aac2dfbda02c1ee5eeb31ec..98a3b1c0c3385cea00cecea740ee4e027bbe8ddf 100644 (file)
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -829,6 +829,9 @@ void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop)
        mpath->flags = MESH_PATH_FIXED | MESH_PATH_SN_VALID;
        mesh_path_activate(mpath);
        spin_unlock_bh(&mpath->state_lock);
+       ewma_mesh_fail_avg_init(&next_hop->mesh->fail_avg);
+       /* init it at a low value - 0 start is tricky */
+       ewma_mesh_fail_avg_add(&next_hop->mesh->fail_avg, 1);
        mesh_path_tx_pending(mpath);
 }
 

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index e65cda34d2bc000fb7e3738a6235ba5d53b8fde6..cc413f52108e1304aacaf1d360232ffed4632386 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -324,6 +324,9 @@ struct ieee80211_fast_rx {
        struct rcu_head rcu_head;
 };
 
+/* we use only values in the range 0-100, so pick a large precision */
+DECLARE_EWMA(mesh_fail_avg, 20, 8)
+
 /**
  * struct mesh_sta - mesh STA information
  * @plink_lock: serialize access to plink fields
@@ -369,7 +372,7 @@ struct mesh_sta {
        enum nl80211_mesh_power_mode nonpeer_pm;
 
        /* moving percentage of failed MSDUs */
-       unsigned int fail_avg;
+       struct ewma_mesh_fail_avg fail_avg;
 };
 
 DECLARE_EWMA(signal, 10, 8)