p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ath9k: dynack: make ewma estimation faster 

In order to make propagation time estimation faster,
use current sample as ewma output value during 'late ack'
tracking

Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Lorenzo Bianconi 2018-11-02 21:49:58 +01:00 committed by Kalle Valo
parent 9d3d65a91f
commit 0c60c49083
4 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@ -272,7 +272,7 @@ struct ath_node {
#endif #endif
u8 key_idx[4]; u8 key_idx[4];
u32 ackto; int ackto;
struct list_head list; struct list_head list;
}; };

28
drivers/net/wireless/ath/ath9k/dynack.c
View File

@ -29,9 +29,13 @@
* ath_dynack_ewma - EWMA (Exponentially Weighted Moving Average) calculation * ath_dynack_ewma - EWMA (Exponentially Weighted Moving Average) calculation
* *
*/ */
static inline u32 ath_dynack_ewma(u32 old, u32 new) static inline int ath_dynack_ewma(int old, int new)
{ {
return (new * (EWMA_DIV - EWMA_LEVEL) + old * EWMA_LEVEL) / EWMA_DIV; if (old > 0)
return (new * (EWMA_DIV - EWMA_LEVEL) +
old * EWMA_LEVEL) / EWMA_DIV;
else
return new;
} }
/** /**
@ -82,10 +86,10 @@ static inline bool ath_dynack_bssidmask(struct ath_hw *ah, const u8 *mac)
*/ */
static void ath_dynack_compute_ackto(struct ath_hw *ah) static void ath_dynack_compute_ackto(struct ath_hw *ah)
{ {
struct ath_node *an;
u32 to = 0;
struct ath_dynack *da = &ah->dynack;
struct ath_common *common = ath9k_hw_common(ah); struct ath_common *common = ath9k_hw_common(ah);
struct ath_dynack *da = &ah->dynack;
struct ath_node *an;
int to = 0;
list_for_each_entry(an, &da->nodes, list) list_for_each_entry(an, &da->nodes, list)
if (an->ackto > to) if (an->ackto > to)
@ -144,7 +148,8 @@ static void ath_dynack_compute_to(struct ath_hw *ah)
an->ackto = ath_dynack_ewma(an->ackto, an->ackto = ath_dynack_ewma(an->ackto,
ackto); ackto);
ath_dbg(ath9k_hw_common(ah), DYNACK, ath_dbg(ath9k_hw_common(ah), DYNACK,
"%pM to %u\n", dst, an->ackto); "%pM to %d [%u]\n", dst,
an->ackto, ackto);
if (time_is_before_jiffies(da->lto)) { if (time_is_before_jiffies(da->lto)) {
ath_dynack_compute_ackto(ah); ath_dynack_compute_ackto(ah);
da->lto = jiffies + COMPUTE_TO; da->lto = jiffies + COMPUTE_TO;
@ -166,10 +171,12 @@ static void ath_dynack_compute_to(struct ath_hw *ah)
* @ah: ath hw * @ah: ath hw
* @skb: socket buffer * @skb: socket buffer
* @ts: tx status info * @ts: tx status info
* @sta: station pointer
* *
*/ */
void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb, void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
struct ath_tx_status *ts) struct ath_tx_status *ts,
struct ieee80211_sta *sta)
{ {
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
struct ath_dynack *da = &ah->dynack; struct ath_dynack *da = &ah->dynack;
@ -191,9 +198,16 @@ void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
ieee80211_is_assoc_resp(hdr->frame_control) || ieee80211_is_assoc_resp(hdr->frame_control) ||
ieee80211_is_auth(hdr->frame_control)) { ieee80211_is_auth(hdr->frame_control)) {
ath_dbg(common, DYNACK, "late ack\n"); ath_dbg(common, DYNACK, "late ack\n");
ath9k_hw_setslottime(ah, (LATEACK_TO - 3) / 2); ath9k_hw_setslottime(ah, (LATEACK_TO - 3) / 2);
ath9k_hw_set_ack_timeout(ah, LATEACK_TO); ath9k_hw_set_ack_timeout(ah, LATEACK_TO);
ath9k_hw_set_cts_timeout(ah, LATEACK_TO); ath9k_hw_set_cts_timeout(ah, LATEACK_TO);
if (sta) {
struct ath_node *an;
an = (struct ath_node *)sta->drv_priv;
an->ackto = -1;
}
da->lto = jiffies + LATEACK_DELAY; da->lto = jiffies + LATEACK_DELAY;
} }

6
drivers/net/wireless/ath/ath9k/dynack.h
View File

@ -86,7 +86,8 @@ void ath_dynack_node_deinit(struct ath_hw *ah, struct ath_node *an);
void ath_dynack_init(struct ath_hw *ah); void ath_dynack_init(struct ath_hw *ah);
void ath_dynack_sample_ack_ts(struct ath_hw *ah, struct sk_buff *skb, u32 ts); void ath_dynack_sample_ack_ts(struct ath_hw *ah, struct sk_buff *skb, u32 ts);
void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb, void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb,
struct ath_tx_status *ts); struct ath_tx_status *ts,
struct ieee80211_sta *sta);
#else #else
static inline void ath_dynack_init(struct ath_hw *ah) {} static inline void ath_dynack_init(struct ath_hw *ah) {}
static inline void ath_dynack_node_init(struct ath_hw *ah, static inline void ath_dynack_node_init(struct ath_hw *ah,
@ -97,7 +98,8 @@ static inline void ath_dynack_sample_ack_ts(struct ath_hw *ah,
struct sk_buff *skb, u32 ts) {} struct sk_buff *skb, u32 ts) {}
static inline void ath_dynack_sample_tx_ts(struct ath_hw *ah, static inline void ath_dynack_sample_tx_ts(struct ath_hw *ah,
struct sk_buff *skb, struct sk_buff *skb,
struct ath_tx_status *ts) {} struct ath_tx_status *ts,
struct ieee80211_sta *sta) {}
#endif #endif
#endif /* DYNACK_H */ #endif /* DYNACK_H */

5
drivers/net/wireless/ath/ath9k/xmit.c
View File

@ -629,7 +629,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
if (bf == bf->bf_lastbf) if (bf == bf->bf_lastbf)
ath_dynack_sample_tx_ts(sc->sc_ah, ath_dynack_sample_tx_ts(sc->sc_ah,
bf->bf_mpdu, bf->bf_mpdu,
ts); ts, sta);
} }
ath_tx_complete_buf(sc, bf, txq, &bf_head, sta, ts, ath_tx_complete_buf(sc, bf, txq, &bf_head, sta, ts,
@ -773,7 +773,8 @@ static void ath_tx_process_buffer(struct ath_softc *sc, struct ath_txq *txq,
memcpy(info->control.rates, bf->rates, memcpy(info->control.rates, bf->rates,
sizeof(info->control.rates)); sizeof(info->control.rates));
ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok); ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
ath_dynack_sample_tx_ts(sc->sc_ah, bf->bf_mpdu, ts); ath_dynack_sample_tx_ts(sc->sc_ah, bf->bf_mpdu, ts,
sta);
} }
ath_tx_complete_buf(sc, bf, txq, bf_head, sta, ts, txok); ath_tx_complete_buf(sc, bf, txq, bf_head, sta, ts, txok);
} else } else