forcedeth: Support for byte queue limits

Changes to forcedeth to use byte queue limits.

Signed-off-by: Tom Herbert <therbert@google.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 8db0b376d5b7..5245dacc3a49 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -1928,6 +1928,7 @@ static void nv_init_tx(struct net_device *dev)
                 np->last_tx.ex = &np->tx_ring.ex[np->tx_ring_size-1];
         np->get_tx_ctx = np->put_tx_ctx = np->first_tx_ctx = np->tx_skb;
         np->last_tx_ctx = &np->tx_skb[np->tx_ring_size-1];
+        netdev_reset_queue(np->dev);
         np->tx_pkts_in_progress = 0;
         np->tx_change_owner = NULL;
         np->tx_end_flip = NULL;
@@ -2276,6 +2277,9 @@ static netdev_tx_t nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* set tx flags */
         start_tx->flaglen |= cpu_to_le32(tx_flags | tx_flags_extra);
+
+        netdev_sent_queue(np->dev, skb->len);
+
         np->put_tx.orig = put_tx;
 
         spin_unlock_irqrestore(&np->lock, flags);
@@ -2420,6 +2424,9 @@ static netdev_tx_t nv_start_xmit_optimized(struct sk_buff *skb,
 
         /* set tx flags */
         start_tx->flaglen |= cpu_to_le32(tx_flags | tx_flags_extra);
+
+        netdev_sent_queue(np->dev, skb->len);
+
         np->put_tx.ex = put_tx;
 
         spin_unlock_irqrestore(&np->lock, flags);
@@ -2457,6 +2464,7 @@ static int nv_tx_done(struct net_device *dev, int limit)
         u32 flags;
         int tx_work = 0;
         struct ring_desc *orig_get_tx = np->get_tx.orig;
+        unsigned int bytes_compl = 0;
 
         while ((np->get_tx.orig != np->put_tx.orig) &&
                !((flags = le32_to_cpu(np->get_tx.orig->flaglen)) & NV_TX_VALID) &&
@@ -2476,6 +2484,7 @@ static int nv_tx_done(struct net_device *dev, int limit)
                                         np->stat_tx_bytes += np->get_tx_ctx->skb->len;
                                         u64_stats_update_end(&np->swstats_tx_syncp);
                                 }
+                                bytes_compl += np->get_tx_ctx->skb->len;
                                 dev_kfree_skb_any(np->get_tx_ctx->skb);
                                 np->get_tx_ctx->skb = NULL;
                                 tx_work++;
@@ -2492,6 +2501,7 @@ static int nv_tx_done(struct net_device *dev, int limit)
                                         np->stat_tx_bytes += np->get_tx_ctx->skb->len;
                                         u64_stats_update_end(&np->swstats_tx_syncp);
                                 }
+                                bytes_compl += np->get_tx_ctx->skb->len;
                                 dev_kfree_skb_any(np->get_tx_ctx->skb);
                                 np->get_tx_ctx->skb = NULL;
                                 tx_work++;
@@ -2502,6 +2512,9 @@ static int nv_tx_done(struct net_device *dev, int limit)
                 if (unlikely(np->get_tx_ctx++ == np->last_tx_ctx))
                         np->get_tx_ctx = np->first_tx_ctx;
         }
+
+        netdev_completed_queue(np->dev, tx_work, bytes_compl);
+
         if (unlikely((np->tx_stop == 1) && (np->get_tx.orig != orig_get_tx))) {
                 np->tx_stop = 0;
                 netif_wake_queue(dev);
@@ -2515,6 +2528,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)
         u32 flags;
         int tx_work = 0;
         struct ring_desc_ex *orig_get_tx = np->get_tx.ex;
+        unsigned long bytes_cleaned = 0;
 
         while ((np->get_tx.ex != np->put_tx.ex) &&
                !((flags = le32_to_cpu(np->get_tx.ex->flaglen)) & NV_TX2_VALID) &&
@@ -2538,6 +2552,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)
                                 u64_stats_update_end(&np->swstats_tx_syncp);
                         }
 
+                        bytes_cleaned += np->get_tx_ctx->skb->len;
                         dev_kfree_skb_any(np->get_tx_ctx->skb);
                         np->get_tx_ctx->skb = NULL;
                         tx_work++;
@@ -2545,6 +2560,9 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)
                         if (np->tx_limit)
                                 nv_tx_flip_ownership(dev);
                 }
+
+                netdev_completed_queue(np->dev, tx_work, bytes_cleaned);
+
                 if (unlikely(np->get_tx.ex++ == np->last_tx.ex))
                         np->get_tx.ex = np->first_tx.ex;
                 if (unlikely(np->get_tx_ctx++ == np->last_tx_ctx))