bes2600: Patch D — atomicize ba_lock counters, drop the spinlock (#7)
This commit was merged in pull request #7.
This commit is contained in:
+13
-10
@@ -995,14 +995,18 @@ bes2600_tx_h_ba_stat(struct bes2600_vif *priv,
|
||||
if (!ieee80211_is_data(t->hdr->frame_control))
|
||||
return;
|
||||
|
||||
spin_lock_bh(&hw_priv->ba_lock);
|
||||
hw_priv->ba_acc += t->skb->len - t->hdrlen;
|
||||
if (!(hw_priv->ba_cnt_rx || hw_priv->ba_cnt)) {
|
||||
/*
|
||||
* Patch D: lock-free hot-path BA accounting. atomic_inc + atomic_add
|
||||
* each per-frame; the once-per-window timer-arm uses cmpxchg on
|
||||
* ba_armed so concurrent TX/RX can't both try to set the timer and
|
||||
* we don't need cross-counter coherency on the ba_cnt/ba_cnt_rx pair.
|
||||
*/
|
||||
atomic_add(t->skb->len - t->hdrlen, &hw_priv->ba_acc);
|
||||
atomic_inc(&hw_priv->ba_cnt);
|
||||
if (atomic_cmpxchg(&hw_priv->ba_armed, 0, 1) == 0) {
|
||||
mod_timer(&hw_priv->ba_timer,
|
||||
jiffies + BES2600_BLOCK_ACK_INTERVAL);
|
||||
}
|
||||
hw_priv->ba_cnt++;
|
||||
spin_unlock_bh(&hw_priv->ba_lock);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -1629,14 +1633,13 @@ bes2600_rx_h_ba_stat(struct bes2600_vif *priv,
|
||||
if (!priv->setbssparams_done)
|
||||
return;
|
||||
|
||||
spin_lock_bh(&hw_priv->ba_lock);
|
||||
hw_priv->ba_acc_rx += skb_len - hdrlen;
|
||||
if (!(hw_priv->ba_cnt_rx || hw_priv->ba_cnt)) {
|
||||
/* Patch D: lock-free hot-path BA accounting; see TX side comment. */
|
||||
atomic_add(skb_len - hdrlen, &hw_priv->ba_acc_rx);
|
||||
atomic_inc(&hw_priv->ba_cnt_rx);
|
||||
if (atomic_cmpxchg(&hw_priv->ba_armed, 0, 1) == 0) {
|
||||
mod_timer(&hw_priv->ba_timer,
|
||||
jiffies + BES2600_BLOCK_ACK_INTERVAL);
|
||||
}
|
||||
hw_priv->ba_cnt_rx++;
|
||||
spin_unlock_bh(&hw_priv->ba_lock);
|
||||
}
|
||||
|
||||
void bes2600_rx_cb(struct bes2600_vif *priv,
|
||||
|
||||
Reference in New Issue
Block a user