ath10k: reduce rx_lock contention for htt rx indication

Received frame indications are queued into a skb list and latest
processed by txrx tasklet. This skb queue is protected by htt rx lock.
Since the entire rx processing till delivering frame to mac80211 and
replenish tasks are processed under rx_lock protection, there might be
some delay in queuing newly received rx frame into that list on
multicore systems. Optimize this by using skb list lock while accessing
rx completion queue instead of htt rx lock.

Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index bf778f29113340c422751499caa7bf1d84008ac9..a31de7b82da28f2ef2e9001aea7d21c4680fae2e 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -2011,9 +2011,7 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                break;
        }
        case HTT_T2H_MSG_TYPE_RX_IND:
-               spin_lock_bh(&htt->rx_ring.lock);
-               __skb_queue_tail(&htt->rx_compl_q, skb);
-               spin_unlock_bh(&htt->rx_ring.lock);
+               skb_queue_tail(&htt->rx_compl_q, skb);
                tasklet_schedule(&htt->txrx_compl_task);
                return;
        case HTT_T2H_MSG_TYPE_PEER_MAP: {
@@ -2111,9 +2109,7 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                break;
        }
        case HTT_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND: {
-               spin_lock_bh(&htt->rx_ring.lock);
-               __skb_queue_tail(&htt->rx_in_ord_compl_q, skb);
-               spin_unlock_bh(&htt->rx_ring.lock);
+               skb_queue_tail(&htt->rx_in_ord_compl_q, skb);
                tasklet_schedule(&htt->txrx_compl_task);
                return;
        }
@@ -2170,16 +2166,18 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr)
                dev_kfree_skb_any(skb);
        }
 
-       spin_lock_bh(&htt->rx_ring.lock);
-       while ((skb = __skb_dequeue(&htt->rx_compl_q))) {
+       while ((skb = skb_dequeue(&htt->rx_compl_q))) {
                resp = (struct htt_resp *)skb->data;
+               spin_lock_bh(&htt->rx_ring.lock);
                ath10k_htt_rx_handler(htt, &resp->rx_ind);
+               spin_unlock_bh(&htt->rx_ring.lock);
                dev_kfree_skb_any(skb);
        }
 
-       while ((skb = __skb_dequeue(&htt->rx_in_ord_compl_q))) {
+       while ((skb = skb_dequeue(&htt->rx_in_ord_compl_q))) {
+               spin_lock_bh(&htt->rx_ring.lock);
                ath10k_htt_rx_in_ord_ind(ar, skb);
+               spin_unlock_bh(&htt->rx_ring.lock);
                dev_kfree_skb_any(skb);
        }
-       spin_unlock_bh(&htt->rx_ring.lock);
 }