[net-next 02/14] ixgbe: remove tie between NAPI work limits and interrupt moderation

STALE5294d SUPERSEDED: 1 (0M)

From: Jeff Kirsher <hidden>
Date: 2012-03-13 04:03:57
Subsystem: intel ethernet drivers, networking drivers, the rest · Maintainers: Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 228 in this series; 1 review trailer.

Revisions (228)

2011-01-22 v1
2011-01-28 v1
2011-01-28 v2 [diff vs current]
2011-01-28 v1
2011-02-08 v1
2011-02-08 v1
2011-02-11 v2 [diff vs current]
2011-02-17 v1
2011-02-24 v1
2011-03-02 v1
2011-03-03 v1
2011-03-08 v1
2011-03-11 v1
2011-03-12 v1
2011-09-16 v1
2011-09-17 v1
2011-09-17 v1
2011-09-23 v2 [diff vs current]
2011-09-30 v1
2011-10-05 v3 [diff vs current]
2011-10-06 v1
2011-10-07 v1
2011-10-08 v1
2011-10-11 v2 [diff vs current]
2011-10-13 v2 [diff vs current]
2011-10-14 v1
2011-10-16 v2 [diff vs current]
2011-10-17 v1
2011-10-17 v2 [diff vs current]
2011-10-18 v3 [diff vs current]
2011-10-21 v1
2011-11-16 v1
2011-12-03 v1
2011-12-05 v2 [diff vs current]
2011-12-23 v1
2012-01-03 v1
2012-01-03 v1
2012-01-05 v2 [diff vs current]
2012-01-19 v1
2012-01-26 v1
2012-01-27 v1
2012-02-07 v1
2012-02-08 v1
2012-02-09 v2 [diff vs current]
2012-02-09 v1
2012-02-10 v2 [diff vs current]
2012-02-11 v1
2012-02-13 v1
2012-02-24 v1
2012-02-25 v1
2012-03-01 v1
2012-03-03 v1
2012-03-03 v1
2012-03-03 v1
2012-03-13 v1 current
2012-03-14 v1
2012-03-17 v1
2012-03-19 v1
2012-03-28 v1
2012-04-03 v1
2012-04-03 v1
2012-04-14 v1
2012-04-14 v1
2012-04-17 v1
2012-04-25 v1
2012-04-27 v1
2012-04-30 v1
2012-05-01 v2 [diff vs current]
2012-05-01 v1
2012-05-02 v2 [diff vs current]
2012-05-03 v1
2012-05-04 v1
2012-05-04 v2 [diff vs current]
2012-05-05 v1
2012-05-10 v1
2012-05-11 v1
2012-05-12 v2 [diff vs current]
2012-05-12 v3 [diff vs current]
2012-05-17 v1
2012-05-17 v2 [diff vs current]
2012-06-06 v1
2012-06-09 v1
2012-06-14 v1
2012-06-20 v1
2012-06-20 v1
2012-07-11 v1
2012-07-14 v1
2012-07-14 v1
2012-07-17 v1
2012-07-18 v1
2012-07-18 v1
2012-07-20 v1
2012-07-20 v1
2012-07-21 v1
2012-08-21 v1
2012-08-23 v1
2012-08-31 v1
2012-09-05 v1
2012-09-05 v1
2012-09-17 v1
2012-09-17 v1
2012-09-19 v1
2012-09-20 v2 [diff vs current]
2012-09-22 v1
2012-09-24 v1
2012-10-03 v1
2012-10-09 v1
2012-10-19 v1
2012-10-20 v1
2012-10-23 v1
2012-10-23 v1
2012-10-26 v1
2012-10-27 v2 [diff vs current]
2012-10-30 v1
2012-11-01 v1
2012-11-13 v1
2012-11-15 v1
2012-11-21 v1
2012-11-22 v2 [diff vs current]
2012-11-28 v1
2012-12-01 v1
2012-12-07 v1
2013-01-11 v1
2013-01-16 v1
2013-01-16 v2 [diff vs current]
2013-01-17 v1
2013-01-18 v2 [diff vs current]
2013-01-19 v1
2013-01-23 v1
2013-01-28 v1
2013-02-08 v1
2013-03-05 v1
2013-03-07 v1
2013-03-08 v1
2013-03-26 v1
2013-03-27 v1
2013-03-28 v1
2013-04-04 v1
2013-04-12 v1
2013-04-18 v2 [diff vs current]
2013-04-18 v1
2013-04-20 v1
2013-04-25 v2 [diff vs current]
2013-04-26 v1
2013-05-21 v1
2013-06-14 v1
2013-06-26 v1
2013-07-28 v1
2013-07-29 v1
2013-07-31 v2 [diff vs current]
2013-08-21 v1
2013-08-22 v2 [diff vs current]
2013-08-23 v2 [diff vs current]
2013-08-28 v1
2013-08-29 v2 [diff vs current]
2013-08-30 v3 [diff vs current]
2013-09-04 v1
2013-09-04 v4 [diff vs current]
2013-09-06 v1
2013-09-06 v5 [diff vs current]
2013-09-06 v6 [diff vs current]
2013-09-11 v7 [diff vs current]
2013-09-13 v1
2013-09-24 v1
2013-09-27 v2 [diff vs current]
2013-10-01 v1
2013-10-10 v1
2013-10-18 v1
2013-10-22 v2 [diff vs current]
2013-10-24 v1
2013-10-29 v1
2013-11-01 v1
2013-11-19 v1
2013-11-28 v1
2013-11-30 v2 [diff vs current]
2013-12-06 v1
2013-12-07 v1
2013-12-10 v1
2013-12-12 v1
2013-12-16 v2 [diff vs current]
2013-12-18 v1
2013-12-18 v1
2013-12-19 v1
2013-12-20 v2 [diff vs current]
2013-12-20 v3 [diff vs current]
2013-12-28 v4 [diff vs current]
2014-01-01 v1
2014-01-02 v1
2014-01-03 v2 [diff vs current]
2014-01-04 v5 [diff vs current]
2014-01-05 v1
2014-01-06 v1
2014-01-07 v1
2014-01-08 v2 [diff vs current]
2014-01-09 v1
2014-01-10 v1
2014-01-10 v2 [diff vs current]
2014-01-11 v3 [diff vs current]
2014-03-06 v1
2014-03-07 v2 [diff vs current]
2014-03-08 v1
2014-03-12 v1
2014-03-13 v2 [diff vs current]
2014-03-14 v1
2014-03-14 v2 [diff vs current]
2014-03-17 v1
2014-03-19 v2 [diff vs current]
2014-03-20 v3 [diff vs current]
2014-03-20 v1
2014-03-21 v1
2014-03-26 v1
2014-03-28 v2 [diff vs current]
2014-03-31 v1
2014-04-11 v1
2014-04-19 v1
2014-04-22 v1
2014-04-23 v1
2014-04-24 v1
2014-04-25 v2 [diff vs current]
2014-04-28 v1
2014-05-05 v1
2014-05-14 v1
2014-05-21 v1
2014-05-23 v2 [diff vs current]
2014-05-27 v1
2014-05-29 v1
2014-06-03 v1
2014-06-04 v2 [diff vs current]

As noted by Ben Hutchings and David Miller, work limits for NAPI
should not be tied to interrupt moderation parameters.  This
should be handled by NAPI, possibly through sysfs.

Neil Horman & Stephen Hemminger are working on a solution for
NAPI currently.  In the meantime, remove this tie between
work limits and interrupt moderation.

Signed-off-by: Jeff Kirsher <redacted>
CC: Ben Hutchings <redacted>
Tested-by: Phil Schmitt <redacted>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 8e2e473..4846206 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

@@ -2108,8 +2108,6 @@ static int ixgbe_get_coalesce(struct net_device *netdev,
 {
 	struct ixgbe_adapter *adapter = netdev_priv(netdev);
 
-	ec->tx_max_coalesced_frames_irq = adapter->tx_work_limit;
-
 	/* only valid if in constant ITR mode */
 	if (adapter->rx_itr_setting <= 1)
 		ec->rx_coalesce_usecs = adapter->rx_itr_setting;

@@ -2177,9 +2175,6 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
 	    && ec->tx_coalesce_usecs)
 		return -EINVAL;
 
-	if (ec->tx_max_coalesced_frames_irq)
-		adapter->tx_work_limit = ec->tx_max_coalesced_frames_irq;
-
 	if ((ec->rx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)) ||
 	    (ec->tx_coalesce_usecs > (IXGBE_MAX_EITR >> 2)))
 		return -EINVAL;

@@ -2214,7 +2209,6 @@ static int ixgbe_set_coalesce(struct net_device *netdev,
 
 	for (i = 0; i < num_vectors; i++) {
 		q_vector = adapter->q_vector[i];
-		q_vector->tx.work_limit = adapter->tx_work_limit;
 		if (q_vector->tx.count && !q_vector->rx.count)
 			/* tx only */
 			q_vector->itr = tx_itr_param;

-- 
1.7.7.6

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help