ixgbe: Introduce adaptive interrupt moderation

82598 can produce a formidable interrupt rate, and is largely
unusable without some form of moderation. The default behaviour
before this patch is to limit irq's to a reasonable number.
However, just like our other drivers we can reduce latency
for small packet-type traffic considerably by allowing the
irq rate to go up dynamically.

This patch introduces a simple irq moderation algorithm based
on traffic analysis. The driver will use more CPU to service
small packets quicker but will perform the same on bulk traffic
as the old code.

Signed-off-by: Ayyappan Veeraiyan <ayyappan.veeraiyan@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 85b7d15e1217..4e463778bcfd 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -886,13 +886,13 @@ static int ixgbe_get_coalesce(struct net_device *netdev,
 {
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-        if (adapter->rx_eitr == 0)
-                ec->rx_coalesce_usecs = 0;
+        if (adapter->rx_eitr < IXGBE_MIN_ITR_USECS)
+                ec->rx_coalesce_usecs = adapter->rx_eitr;
         else
                 ec->rx_coalesce_usecs = 1000000 / adapter->rx_eitr;
 
-        if (adapter->tx_eitr == 0)
-                ec->tx_coalesce_usecs = 0;
+        if (adapter->tx_eitr < IXGBE_MIN_ITR_USECS)
+                ec->tx_coalesce_usecs = adapter->tx_eitr;
         else
                 ec->tx_coalesce_usecs = 1000000 / adapter->tx_eitr;
 
@@ -906,22 +906,26 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
         if ((ec->rx_coalesce_usecs > IXGBE_MAX_ITR_USECS) ||
-            ((ec->rx_coalesce_usecs > 0) &&
+            ((ec->rx_coalesce_usecs != 0) &&
+             (ec->rx_coalesce_usecs != 1) &&
+             (ec->rx_coalesce_usecs != 3) &&
              (ec->rx_coalesce_usecs < IXGBE_MIN_ITR_USECS)))
                 return -EINVAL;
         if ((ec->tx_coalesce_usecs > IXGBE_MAX_ITR_USECS) ||
-            ((ec->tx_coalesce_usecs > 0) &&
+            ((ec->tx_coalesce_usecs != 0) &&
+             (ec->tx_coalesce_usecs != 1) &&
+             (ec->tx_coalesce_usecs != 3) &&
              (ec->tx_coalesce_usecs < IXGBE_MIN_ITR_USECS)))
                 return -EINVAL;
 
         /* convert to rate of irq's per second */
-        if (ec->rx_coalesce_usecs == 0)
-                adapter->rx_eitr = 0;
+        if (ec->rx_coalesce_usecs < IXGBE_MIN_ITR_USECS)
+                adapter->rx_eitr = ec->rx_coalesce_usecs;
         else
                 adapter->rx_eitr = (1000000 / ec->rx_coalesce_usecs);
 
-        if (ec->tx_coalesce_usecs == 0)
-                adapter->tx_eitr = 0;
+        if (ec->tx_coalesce_usecs < IXGBE_MIN_ITR_USECS)
+                adapter->tx_eitr = ec->rx_coalesce_usecs;
         else
                 adapter->tx_eitr = (1000000 / ec->tx_coalesce_usecs);