ath10k: optimize ce_lock on post rx buffer processing

After processing received packets from copy engine, host will allocate
new buffer and queue them back to copy engine ring for further
packet reception. On post rx processing path, skb allocation and
dma mapping are unnecessarily handled within ce_lock. This is affecting
peak throughput and also causing more CPU consumption. Optimize this
by acquiring ce_lock only when accessing copy engine ring and moving
skb allocation out of ce_lock.

In AP148 platform with QCA99x0 in conducted environment, UDP uplink peak
throughput is improved from ~1320 Mbps to ~1450 Mbps and TCP uplink peak
throughput is increased from ~1240 Mbps (70% host CPU load) to ~1300 Mbps
(71% CPU load). Similarly ~40Mbps improvement is observed in downlink
path.

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/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index cf28fbebaedcfc9b372d509c6a88fcbc2d808773..8d7ab1ccc00594b75306a8302992bf5ee5d53b4d 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -413,7 +413,7 @@ int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, u32 paddr)
        lockdep_assert_held(&ar_pci->ce_lock);
 
        if (CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0)
-               return -EIO;
+               return -ENOSPC;
 
        desc->addr = __cpu_to_le32(paddr);
        desc->nbytes = 0;

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 7af39118b1f4af4427288b997dfa976a115d1a20..4401779af25375f1524d5f38a15dc543aef94cb2 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -686,8 +686,6 @@ static int __ath10k_pci_rx_post_buf(struct ath10k_pci_pipe *pipe)
        dma_addr_t paddr;
        int ret;
 
-       lockdep_assert_held(&ar_pci->ce_lock);
-
        skb = dev_alloc_skb(pipe->buf_sz);
        if (!skb)
                return -ENOMEM;
@@ -705,9 +703,10 @@ static int __ath10k_pci_rx_post_buf(struct ath10k_pci_pipe *pipe)
 
        ATH10K_SKB_RXCB(skb)->paddr = paddr;
 
+       spin_lock_bh(&ar_pci->ce_lock);
        ret = __ath10k_ce_rx_post_buf(ce_pipe, skb, paddr);
+       spin_unlock_bh(&ar_pci->ce_lock);
        if (ret) {
-               ath10k_warn(ar, "failed to post pci rx buf: %d\n", ret);
                dma_unmap_single(ar->dev, paddr, skb->len + skb_tailroom(skb),
                                 DMA_FROM_DEVICE);
                dev_kfree_skb_any(skb);
@@ -717,25 +716,27 @@ static int __ath10k_pci_rx_post_buf(struct ath10k_pci_pipe *pipe)
        return 0;
 }
 
-static void __ath10k_pci_rx_post_pipe(struct ath10k_pci_pipe *pipe)
+static void ath10k_pci_rx_post_pipe(struct ath10k_pci_pipe *pipe)
 {
        struct ath10k *ar = pipe->hif_ce_state;
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
        struct ath10k_ce_pipe *ce_pipe = pipe->ce_hdl;
        int ret, num;
 
-       lockdep_assert_held(&ar_pci->ce_lock);
-
        if (pipe->buf_sz == 0)
                return;
 
        if (!ce_pipe->dest_ring)
                return;
 
+       spin_lock_bh(&ar_pci->ce_lock);
        num = __ath10k_ce_rx_num_free_bufs(ce_pipe);
+       spin_unlock_bh(&ar_pci->ce_lock);
        while (num--) {
                ret = __ath10k_pci_rx_post_buf(pipe);
                if (ret) {
+                       if (ret == -ENOSPC)
+                               break;
                        ath10k_warn(ar, "failed to post pci rx buf: %d\n", ret);
                        mod_timer(&ar_pci->rx_post_retry, jiffies +
                                  ATH10K_PCI_RX_POST_RETRY_MS);
@@ -744,25 +745,13 @@ static void __ath10k_pci_rx_post_pipe(struct ath10k_pci_pipe *pipe)
        }
 }
 
-static void ath10k_pci_rx_post_pipe(struct ath10k_pci_pipe *pipe)
-{
-       struct ath10k *ar = pipe->hif_ce_state;
-       struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
-
-       spin_lock_bh(&ar_pci->ce_lock);
-       __ath10k_pci_rx_post_pipe(pipe);
-       spin_unlock_bh(&ar_pci->ce_lock);
-}
-
 static void ath10k_pci_rx_post(struct ath10k *ar)
 {
        struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
        int i;
 
-       spin_lock_bh(&ar_pci->ce_lock);
        for (i = 0; i < CE_COUNT; i++)
-               __ath10k_pci_rx_post_pipe(&ar_pci->pipe_info[i]);
-       spin_unlock_bh(&ar_pci->ce_lock);
+               ath10k_pci_rx_post_pipe(&ar_pci->pipe_info[i]);
 }
 
 static void ath10k_pci_rx_replenish_retry(unsigned long ptr)