Commit 7a0adc83 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo

ath10k: improve tx scheduling

Recent changes revolving around implementing
wake_tx_queue support introduced a significant
performance regressions on some (slower, uni-proc)
systems.
Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 651b4cdc
...@@ -2291,7 +2291,6 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) ...@@ -2291,7 +2291,6 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
ath10k_htt_tx_mgmt_dec_pending(htt); ath10k_htt_tx_mgmt_dec_pending(htt);
spin_unlock_bh(&htt->tx_lock); spin_unlock_bh(&htt->tx_lock);
} }
ath10k_mac_tx_push_pending(ar);
break; break;
} }
case HTT_T2H_MSG_TYPE_TX_COMPL_IND: case HTT_T2H_MSG_TYPE_TX_COMPL_IND:
...@@ -2442,8 +2441,6 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr) ...@@ -2442,8 +2441,6 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
ath10k_mac_tx_push_pending(ar);
num_mpdus = atomic_read(&htt->num_mpdus_ready); num_mpdus = atomic_read(&htt->num_mpdus_ready);
while (num_mpdus) { while (num_mpdus) {
......
...@@ -3781,6 +3781,9 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) ...@@ -3781,6 +3781,9 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar)
int ret; int ret;
int max; int max;
if (ar->htt.num_pending_tx >= (ar->htt.max_num_pending_tx / 2))
return;
spin_lock_bh(&ar->txqs_lock); spin_lock_bh(&ar->txqs_lock);
rcu_read_lock(); rcu_read_lock();
...@@ -4051,9 +4054,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw, ...@@ -4051,9 +4054,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,
list_add_tail(&artxq->list, &ar->txqs); list_add_tail(&artxq->list, &ar->txqs);
spin_unlock_bh(&ar->txqs_lock); spin_unlock_bh(&ar->txqs_lock);
if (ath10k_mac_tx_can_push(hw, txq)) ath10k_mac_tx_push_pending(ar);
tasklet_schedule(&ar->htt.txrx_compl_task);
ath10k_htt_tx_txq_update(hw, txq); ath10k_htt_tx_txq_update(hw, txq);
} }
......
...@@ -117,6 +117,9 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt, ...@@ -117,6 +117,9 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
ieee80211_tx_status(htt->ar->hw, msdu); ieee80211_tx_status(htt->ar->hw, msdu);
/* we do not own the msdu anymore */ /* we do not own the msdu anymore */
ath10k_mac_tx_push_pending(ar);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment