Skip to contentSkip to conversation

ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters

PATCH Applied Jeff Kirsher 3 participants 7 messages Dec 15, 2009 – Dec 16, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters

From: Mallikarjuna R Chilakala <[email protected]>

Fix the restart_queue and non_eop_desc counters from being double-counted. They are cumulative in each ring, so we don't want to add them to the cumulative result in the adapter's master counter. Otherwise, the stats will be inaccurate

---

 drivers/net/ixgbe/ixgbe_main.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +5 -2
index 35ea8c9..22519fa 100644
@@ -4511,6 +4511,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
 	struct ixgbe_hw *hw = &adapter->hw;
 	u64 total_mpc = 0;
 	u32 i, missed_rx = 0, mpc, bprc, lxon, lxoff, xon_off_tot;
+	u64 non_eop_descs = 0, restart_queue = 0;
 
 	if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
 		u64 rsc_count = 0;
@@ -4528,10 +4529,12 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter)
 
 	/* gather some stats to the adapter struct that are per queue */
 	for (i = 0; i < adapter->num_tx_queues; i++)
-		adapter->restart_queue += adapter->tx_ring[i].restart_queue;
+		restart_queue += adapter->tx_ring[i]->restart_queue;
+	adapter->restart_queue = restart_queue;
 
 	for (i = 0; i < adapter->num_rx_queues; i++)
-		adapter->non_eop_descs += adapter->tx_ring[i].non_eop_descs;
+		non_eop_descs += adapter->rx_ring[i]->non_eop_descs;
+	adapter->non_eop_descs = non_eop_descs;
 
 	adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
 	for (i = 0; i < 8; i++) {
#1 lore raw

PATCH v2 2/2 ixgbe: Fix 82598 premature copper PHY link indicatation

From: Mallikarjuna R Chilakala <[email protected]>

Modified patch with Dave's comments to replace mdelay with proper msleep. Fix 82598 copper link issue, where the phy prematurely indicates link before it is ready to process packets. The new function looks for phy link and indicates that, when it is available. If phy is not ready within few seconds of MAC indicating link, the function will return failure which translates to link down indication.

---

 drivers/net/ixgbe/ixgbe_82598.c |   38 ++++++++++++++++++++++++++++++++++++++
 drivers/net/ixgbe/ixgbe_type.h  |    2 ++
 2 files changed, 40 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_82598.c +38 -0
index e2d5343..204177d 100644
@@ -510,6 +510,40 @@ static s32 ixgbe_start_mac_link_82598(struct ixgbe_hw *hw,
 }
 
 /**
+ *  ixgbe_validate_link_ready - Function looks for phy link
+ *  @hw: pointer to hardware structure
+ *
+ *  Function indicates success when phy link is available. If phy is not ready
+ *  within 5 seconds of MAC indicating link, the function returns error.
+ **/
+static s32 ixgbe_validate_link_ready(struct ixgbe_hw *hw)
+{
+	u32 timeout;
+	u16 an_reg;
+
+	if (hw->device_id != IXGBE_DEV_ID_82598AT2)
+		return 0;
+
+	for (timeout = 0;
+	     timeout < IXGBE_VALIDATE_LINK_READY_TIMEOUT; timeout++) {
+		hw->phy.ops.read_reg(hw, MDIO_STAT1, MDIO_MMD_AN, &an_reg);
+
+		if ((an_reg & MDIO_AN_STAT1_COMPLETE) &&
+		    (an_reg & MDIO_STAT1_LSTATUS))
+			break;
+
+		msleep(100);
+	}
+
+	if (timeout == IXGBE_VALIDATE_LINK_READY_TIMEOUT) {
+		hw_dbg(hw, "Link was indicated but link is down\n");
+		return IXGBE_ERR_LINK_SETUP;
+	}
+
+	return 0;
+}
+
+/**
  *  ixgbe_check_mac_link_82598 - Get link/speed status
  *  @hw: pointer to hardware structure
  *  @speed: pointer to link speed
@@ -589,6 +623,10 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
 	else
 		*speed = IXGBE_LINK_SPEED_1GB_FULL;
 
+	if ((hw->device_id == IXGBE_DEV_ID_82598AT2) && (*link_up == true) &&
+	    (ixgbe_validate_link_ready(hw) != 0))
+		*link_up = false;
+
 	/* if link is down, zero out the current_mode */
 	if (*link_up == false) {
 		hw->fc.current_mode = ixgbe_fc_none;
drivers/net/ixgbe/ixgbe_type.h +2 -0
index f3e8d52..84650c6 100644
@@ -841,6 +841,8 @@
 #define IXGBE_MPVC      0x04318
 #define IXGBE_SGMIIC    0x04314
 
+#define IXGBE_VALIDATE_LINK_READY_TIMEOUT 50
+
 /* Omer CORECTL */
 #define IXGBE_CORECTL           0x014F00
 /* BARCTRL */
maintainer Applied
#2 lore raw

Re: [net-2.6 PATCH v2 2/2] ixgbe: Fix 82598 premature copper PHY link indicatation

From: Jeff Kirsher <[email protected]>
Date: Tue, 15 Dec 2009 13:57:20 -0800

Quoted 9 lines

From: Mallikarjuna R Chilakala <[email protected]>

Modified patch with Dave's comments to replace mdelay with proper msleep. Fix 82598 copper link issue, where the phy prematurely indicates link before it is ready to process packets. The new function looks for phy link and indicates that, when it is available. If phy is not ready within few seconds of MAC indicating link, the function will return failure which translates to link down indication.

Quoted 3 lines

Applied.

maintainer Applied
#3 lore raw
In reply to Jeff Kirsher

From: Jeff Kirsher <[email protected]>
Date: Tue, 15 Dec 2009 13:56:59 -0800

Quoted 10 lines

From: Mallikarjuna R Chilakala <[email protected]>

Fix the restart_queue and non_eop_desc counters from being double-counted. They are cumulative in each ring, so we don't want to add them to the cumulative result in the adapter's master counter. Otherwise, the stats will be inaccurate

Applied.

maintainer
#4 lore raw

From: David Miller <[email protected]>
Date: Tue, 15 Dec 2009 21:13:54 -0800 (PST)

Quoted 10 lines

From: Jeff Kirsher <[email protected]>
Date: Tue, 15 Dec 2009 13:56:59 -0800

Quoted 7 lines

From: Mallikarjuna R Chilakala <[email protected]>

Fix the restart_queue and non_eop_desc counters from being double-counted. They are cumulative in each ring, so we don't want to add them to the cumulative result in the adapter's master counter. Otherwise, the stats will be inaccurate

Quoted 5 lines
Quoted 3 lines

Applied.

So how did you build test this?

drivers/net/ixgbe/ixgbe_main.c: In function ‘ixgbe_update_stats’:
drivers/net/ixgbe/ixgbe_main.c:4532: error: invalid type argument of ‘->’ (have ‘struct ixgbe_ring’) drivers/net/ixgbe/ixgbe_main.c:4536: error: invalid type argument of ‘->’ (have ‘struct ixgbe_ring’)

maintainer
#5 lore raw

From: David Miller <[email protected]>
Date: Tue, 15 Dec 2009 23:16:51 -0800 (PST)

Quoted 17 lines

From: David Miller <[email protected]>
Date: Tue, 15 Dec 2009 21:13:54 -0800 (PST)

Quoted 14 lines

From: Jeff Kirsher <[email protected]>
Date: Tue, 15 Dec 2009 13:56:59 -0800

Quoted 10 lines

From: Mallikarjuna R Chilakala <[email protected]>

Fix the restart_queue and non_eop_desc counters from being double-counted. They are cumulative in each ring, so we don't want to add them to the cumulative result in the adapter's master counter. Otherwise, the stats will be inaccurate

Quoted 7 lines
Quoted 1 line

Applied.

So how did you build test this?

drivers/net/ixgbe/ixgbe_main.c: In function ‘ixgbe_update_stats’:
drivers/net/ixgbe/ixgbe_main.c:4532: error: invalid type argument of ‘->’ (have ‘struct ixgbe_ring’) drivers/net/ixgbe/ixgbe_main.c:4536: error: invalid type argument of ‘->’ (have ‘struct ixgbe_ring’)

I'm making the obvious fix "s/->/./", but really....

#6 lore raw
Quoted 36 lines

-----Original Message-----
From: David Miller [mailto:[email protected]]
Sent: Tuesday, December 15, 2009 11:19 PM
To: Kirsher, Jeffrey T
Cc: [email protected]; [email protected]; Chilakala, Mallikarjuna; Waskiewicz Jr, Peter P
Subject: Re: [net-2.6 PATCH v2 1/2] ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters

From: David Miller <[email protected]>
Date: Tue, 15 Dec 2009 23:16:51 -0800 (PST)

Quoted 14 lines

From: David Miller <[email protected]>
Date: Tue, 15 Dec 2009 21:13:54 -0800 (PST)

Quoted 11 lines

From: Jeff Kirsher <[email protected]>
Date: Tue, 15 Dec 2009 13:56:59 -0800

Quoted 8 lines

From: Mallikarjuna R Chilakala <[email protected]>

Fix the restart_queue and non_eop_desc counters from being double-counted. They are cumulative in each ring, so we don't want to add them to the cumulative result in the adapter's master counter. Otherwise, the stats will be inaccurate

Signed-off-by Mallikarjuna R Chilakala

<[email protected]>

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Applied.

So how did you build test this?

Quoted 7 lines
Quoted 2 lines

drivers/net/ixgbe/ixgbe_main.c: In function ‘ixgbe_update_stats’:
drivers/net/ixgbe/ixgbe_main.c:4532: error: invalid type argument of ‘->’

(have ‘struct ixgbe_ring’)

Quoted 1 line

drivers/net/ixgbe/ixgbe_main.c:4536: error: invalid type argument of ‘->’

(have ‘struct ixgbe_ring’)

I'm making the obvious fix "s/->/./", but really....

Thanks Dave for fixing the issue, some changes in Jeff's GIT tree has created this merge issue. Most likely the order of patches that were send out might have created this problem.