Thread (12 messages) 12 messages, 2 authors, 2013-01-19

[net-next 08/10] ixgbevf: Fix statistics corruption

flat view
STALE5022d SUPERSEDED: 1 (0M)

From: Jeff Kirsher <hidden>
Date: 2013-01-19 13:15:09
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 149 in this series; 1 review trailer.

Revisions (149)
  1. v1
  2. v2 [diff vs current]
  3. v1
  4. v1
  5. v1
  6. v1
  7. v1
  8. v1
  9. v1
  10. v2 [diff vs current]
  11. v1
  12. v3 [diff vs current]
  13. v1
  14. v1
  15. v1
  16. v2 [diff vs current]
  17. v2 [diff vs current]
  18. v1
  19. v1
  20. v1
  21. v2 [diff vs current]
  22. v1
  23. v1
  24. v1
  25. v1
  26. v1
  27. v2 [diff vs current]
  28. v1
  29. v1
  30. v1
  31. v1
  32. v1
  33. v1
  34. v1
  35. v1
  36. v1
  37. v1
  38. v1
  39. v1
  40. v1
  41. v1
  42. v1
  43. v1
  44. v1
  45. v1
  46. v1
  47. v1
  48. v1
  49. v1
  50. v1
  51. v1
  52. v1
  53. v2 [diff vs current]
  54. v1
  55. v1
  56. v1
  57. v1
  58. v2 [diff vs current]
  59. v1
  60. v1
  61. v2 [diff vs current]
  62. v1
  63. v2 [diff vs current]
  64. v1 current
  65. v1
  66. v1
  67. v1
  68. v1
  69. v1
  70. v1
  71. v1
  72. v2 [diff vs current]
  73. v1
  74. v1
  75. v2 [diff vs current]
  76. v1
  77. v1
  78. v1
  79. v1
  80. v1
  81. v1
  82. v2 [diff vs current]
  83. v1
  84. v2 [diff vs current]
  85. v2 [diff vs current]
  86. v1
  87. v2 [diff vs current]
  88. v3 [diff vs current]
  89. v1
  90. v4 [diff vs current]
  91. v1
  92. v5 [diff vs current]
  93. v6 [diff vs current]
  94. v7 [diff vs current]
  95. v1
  96. v1
  97. v1
  98. v2 [diff vs current]
  99. v1
  100. v1
  101. v1
  102. v1
  103. v1
  104. v1
  105. v1
  106. v2 [diff vs current]
  107. v1
  108. v1
  109. v2 [diff vs current]
  110. v3 [diff vs current]
  111. v4 [diff vs current]
  112. v1
  113. v1
  114. v2 [diff vs current]
  115. v5 [diff vs current]
  116. v1
  117. v1
  118. v1
  119. v2 [diff vs current]
  120. v1
  121. v1
  122. v2 [diff vs current]
  123. v3 [diff vs current]
  124. v1
  125. v2 [diff vs current]
  126. v1
  127. v1
  128. v2 [diff vs current]
  129. v1
  130. v2 [diff vs current]
  131. v1
  132. v2 [diff vs current]
  133. v3 [diff vs current]
  134. v1
  135. v1
  136. v1
  137. v2 [diff vs current]
  138. v1
  139. v1
  140. v1
  141. v1
  142. v1
  143. v2 [diff vs current]
  144. v1
  145. v1
  146. v1
  147. v2 [diff vs current]
  148. v1
  149. v1 
From: Greg Rose <redacted>

When the physical function (PF) is reset for any reason the statistics
collection in ixgbevf_update_stats needs to wait to update until after
the reset synchronization ensures that the PF driver is up and running
and is finished with its own reset.  Go ahead and clear the link flag to
indicate this when the control message from the PF is received.  The
reset synchronization and recovery in the watchdog task will eventually
set the link flag up when the PF has resumed.

Signed-off-by: Greg Rose <redacted>
Tested-by: Sibai Li <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 3fbf0d2..551e31d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -762,9 +762,11 @@ static irqreturn_t ixgbevf_msix_other(int irq, void *data)
 	if (!hw->mbx.ops.check_for_msg(hw)) {
 		hw->mbx.ops.read(hw, &msg, 1);
 
-		if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG)
+		if ((msg & IXGBE_MBVFICR_VFREQ_MASK) == IXGBE_PF_CONTROL_MSG) {
 			mod_timer(&adapter->watchdog_timer,
 				  round_jiffies(jiffies + 1));
+			adapter->link_up = false;
+		}
 
 		if (msg & IXGBE_VT_MSGTYPE_NACK)
 			dev_info(&pdev->dev,
@@ -2118,6 +2120,9 @@ void ixgbevf_update_stats(struct ixgbevf_adapter *adapter)
 	struct ixgbe_hw *hw = &adapter->hw;
 	int i;
 
+	if (!adapter->link_up)
+		return;
+
 	UPDATE_VF_COUNTER_32bit(IXGBE_VFGPRC, adapter->stats.last_vfgprc,
 				adapter->stats.vfgprc);
 	UPDATE_VF_COUNTER_32bit(IXGBE_VFGPTC, adapter->stats.last_vfgptc,
-- 
1.7.11.7
Other recent patches touching these files
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help