ixgbe: reinit_locked() should be called with rtnl_lock

John Fastabend · davem330 · commit 8f4c5c9fb87a · 2014-01-16T15:34:24.000-08:00
ixgbe_service_task() is calling ixgbe_reinit_locked() without
the rtnl_lock being held. This is because it is being called
from a worker thread and not a rtnl netlink or dcbnl path.

Add rtnl_{un}lock() semantics. I found this during code review.

Signed-off-by: John Fastabend &lt;john.r.fastabend@intel.com&gt;
Tested-by: Phil Schmitt &lt;phillip.j.schmitt@intel.com&gt;
Signed-off-by: Aaron Brown &lt;aaron.f.brown@intel.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6392,7 +6392,9 @@ static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter)
 	netdev_err(adapter->netdev, "Reset adapter\n");
 	adapter->tx_timeout_count++;
 
+	rtnl_lock();
 	ixgbe_reinit_locked(adapter);
+	rtnl_unlock();
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -6392,7 +6392,9 @@ static void ixgbe_reset_subtask(struct ixgbe_adapter *adapter)`
`6392`	`6392`	`netdev_err(adapter->netdev, "Reset adapter\n");`
`6393`	`6393`	`adapter->tx_timeout_count++;`
`6394`	`6394`
	`6395`	`+ rtnl_lock();`
`6395`	`6396`	`ixgbe_reinit_locked(adapter);`
	`6397`	`+ rtnl_unlock();`
`6396`	`6398`	`}`
`6397`	`6399`
`6398`	`6400`	`/**`