net: hns3: Remove tx budget to clean more TX descriptors in a napi

The the actual Tx work is minimal, driver can clean up as more
Tx descriptors as possible in a irq.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index 837c6d62c29ff3166daa743d97ccd42d199c70a4..99209a0a64e06cd15f084a9a402df498771035e9 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1955,7 +1955,7 @@ static int is_valid_clean_head(struct hns3_enet_ring *ring, int h)
        return u > c ? (h > c && h <= u) : (h > c || h <= u);
 }
 
-bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget)
+void hns3_clean_tx_ring(struct hns3_enet_ring *ring)
 {
        struct net_device *netdev = ring->tqp->handle->kinfo.netdev;
        struct netdev_queue *dev_queue;
@@ -1966,7 +1966,7 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget)
        rmb(); /* Make sure head is ready before touch any data */
 
        if (is_ring_empty(ring) || head == ring->next_to_clean)
-               return true; /* no data to poll */
+               return; /* no data to poll */
 
        if (unlikely(!is_valid_clean_head(ring, head))) {
                netdev_err(netdev, "wrong head (%d, %d-%d)\n", head,
@@ -1975,16 +1975,15 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget)
                u64_stats_update_begin(&ring->syncp);
                ring->stats.io_err_cnt++;
                u64_stats_update_end(&ring->syncp);
-               return true;
+               return;
        }
 
        bytes = 0;
        pkts = 0;
-       while (head != ring->next_to_clean && budget) {
+       while (head != ring->next_to_clean) {
                hns3_nic_reclaim_one_desc(ring, &bytes, &pkts);
                /* Issue prefetch for next Tx descriptor */
                prefetch(&ring->desc_cb[ring->next_to_clean]);
-               budget--;
        }
 
        ring->tqp_vector->tx_group.total_bytes += bytes;
@@ -2009,8 +2008,6 @@ bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget)
                        ring->stats.restart_queue++;
                }
        }
-
-       return !!budget;
 }
 
 static int hns3_desc_unused(struct hns3_enet_ring *ring)
@@ -2544,10 +2541,8 @@ static int hns3_nic_common_poll(struct napi_struct *napi, int budget)
        /* Since the actual Tx work is minimal, we can give the Tx a larger
         * budget and be more aggressive about cleaning up the Tx descriptors.
         */
-       hns3_for_each_ring(ring, tqp_vector->tx_group) {
-               if (!hns3_clean_tx_ring(ring, budget))
-                       clean_complete = false;
-       }
+       hns3_for_each_ring(ring, tqp_vector->tx_group)
+               hns3_clean_tx_ring(ring);
 
        /* make sure rx ring budget not smaller than 1 */
        rx_budget = max(budget / tqp_vector->num_tqps, 1);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
index 31fa21f3a7b938d3ccb96a9529662af88434a236..4a56c3d2204f735e4295a64c7e1369eb1a4c1e9b 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
@@ -617,7 +617,7 @@ void hns3_ethtool_set_ops(struct net_device *netdev);
 int hns3_set_channels(struct net_device *netdev,
                      struct ethtool_channels *ch);
 
-bool hns3_clean_tx_ring(struct hns3_enet_ring *ring, int budget);
+void hns3_clean_tx_ring(struct hns3_enet_ring *ring);
 int hns3_init_all_ring(struct hns3_nic_priv *priv);
 int hns3_uninit_all_ring(struct hns3_nic_priv *priv);
 int hns3_nic_reset_all_ring(struct hnae3_handle *h);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index 3019007d7ceb9d07c5b35684ac145e52639aedc6..3cfb6b881c390acdf1ac969210c7f86dcfd0f38d 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -200,7 +200,7 @@ static void hns3_lb_clear_tx_ring(struct hns3_nic_priv *priv, u32 start_ringid,
        for (i = start_ringid; i <= end_ringid; i++) {
                struct hns3_enet_ring *ring = priv->ring_data[i].ring;
 
-               hns3_clean_tx_ring(ring, budget);
+               hns3_clean_tx_ring(ring);
        }
 }