[incubator-nuttx] branch master updated: wireless/bcm43xxx: improve throughput of net driver

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new b33a709213 wireless/bcm43xxx: improve throughput of net driver
b33a709213 is described below

commit b33a709213cd66b97f8814681f98b07d2dbc01ee
Author: chao.an <an...@xiaomi.com>
AuthorDate: Thu Jun 16 13:59:02 2022 +0800

    wireless/bcm43xxx: improve throughput of net driver
    
    1. Wake up tx if there is data alreay to sent after rx update
    2. Try tx queue again after every data frame sent
    
    iperf test:
    
    ```
    TCP RX  4M->16M
    ⁣TCP TX  2M->14M
    ⁣UDP RX 18M->26M
    UDP TX  2M->18M
    ```
    
    Signed-off-by: chao.an <an...@xiaomi.com>
---
 drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c | 34 ++++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c
index 1eba0f8d95..1a87db2c47 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c
@@ -50,6 +50,7 @@
 #include "bcmf_cdc.h"
 #include "bcmf_bdc.h"
 #include "bcmf_ioctl.h"
+#include "bcmf_netdev.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -144,6 +145,9 @@ int bcmf_netdev_alloc_tx_frame(FAR struct bcmf_dev_s *priv)
       return -ENOMEM;
     }
 
+  priv->bc_dev.d_buf = priv->cur_tx_frame->data;
+  priv->bc_dev.d_len = 0;
+
   return OK;
 }
 
@@ -218,6 +222,7 @@ static void bcmf_receive(FAR struct bcmf_dev_s *priv)
         {
           /* No more frame to process */
 
+          bcmf_netdev_notify_tx(priv);
           break;
         }
 
@@ -498,13 +503,22 @@ static void bcmf_tx_poll_work(FAR void *arg)
     {
       /* Check if there is room in the hardware to hold another packet. */
 
-      if (bcmf_netdev_alloc_tx_frame(priv) == OK)
+      while (bcmf_netdev_alloc_tx_frame(priv) == OK)
         {
           /* If so, then poll the network for new XMIT data */
 
-          priv->bc_dev.d_buf = priv->cur_tx_frame->data;
-          priv->bc_dev.d_len = 0;
           devif_poll(&priv->bc_dev, bcmf_txpoll);
+
+          /* Break out the continuous send if :
+           * 1. IP stack has no data to send.
+           * 2. RX worker ready.
+           */
+
+          if (priv->cur_tx_frame != NULL ||
+              !work_available(&priv->bc_rxwork))
+            {
+              break;
+            }
         }
     }
 
@@ -530,6 +544,7 @@ static void bcmf_tx_poll_work(FAR void *arg)
 static void bcmf_rxpoll_work(FAR void *arg)
 {
   FAR struct bcmf_dev_s *priv = (FAR struct bcmf_dev_s *)arg;
+  FAR void *oldbuf;
 
   /* Lock the network and serialize driver operations if necessary.
    * NOTE: Serialization is only required in the case where the driver work
@@ -539,8 +554,16 @@ static void bcmf_rxpoll_work(FAR void *arg)
 
   net_lock();
 
+  /* Tx work will hold the d_buf until there is data to send,
+   * replace and cache the d_buf temporarily
+   */
+
+  oldbuf = priv->bc_dev.d_buf;
+
   bcmf_receive(priv);
 
+  priv->bc_dev.d_buf = oldbuf;
+
   /* Check if a packet transmission just completed.  If so, call bcmf_txdone.
    * This may disable further Tx interrupts if there are no pending
    * transmissions.
@@ -587,7 +610,10 @@ void bcmf_netdev_notify_rx(FAR struct bcmf_dev_s *priv)
 {
   /* Queue a job to process RX frames */
 
-  work_queue(BCMFWORK, &priv->bc_rxwork, bcmf_rxpoll_work, priv, 0);
+  if (work_available(&priv->bc_rxwork))
+    {
+      work_queue(BCMFWORK, &priv->bc_rxwork, bcmf_rxpoll_work, priv, 0);
+    }
 }
 
 /****************************************************************************