Skip to contentSkip to conversation

tg3: fix deadlock in tg3_change_mtu()

PATCH In review David Vrabel 2 participants 3 messages Feb 4, 2014 – Feb 6, 2014

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

PATCH 1/1 tg3: fix deadlock in tg3_change_mtu()

5780 cards cannot have jumbo frames and TSO enabled together. When jumbo frames are enabled by setting the MTU, the TSO feature must be cleared. This is done indirectly by calling netdev_update_features() which will call tg3_fix_features() to actually clear the flags.

netdev_update_features() will also trigger a new netlink message for the feature change event which will result in a call to tg3_get_stats64() which deadlocks on the tg3 lock.

Fix this by dropping the tg3 lock while calling netdev_update_features(). This is safe as the device is down and the hardware is stopped.

---
 drivers/net/ethernet/broadcom/tg3.c |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +11 -7
index e2ca03e..0b344c0 100644
@@ -14077,17 +14077,13 @@ static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp,
 	dev->mtu = new_mtu;
 
 	if (new_mtu > ETH_DATA_LEN) {
-		if (tg3_flag(tp, 5780_CLASS)) {
-			netdev_update_features(dev);
+		if (tg3_flag(tp, 5780_CLASS))
 			tg3_flag_clear(tp, TSO_CAPABLE);
-		} else {
+		else
 			tg3_flag_set(tp, JUMBO_RING_ENABLE);
-		}
 	} else {
-		if (tg3_flag(tp, 5780_CLASS)) {
+		if (tg3_flag(tp, 5780_CLASS))
 			tg3_flag_set(tp, TSO_CAPABLE);
-			netdev_update_features(dev);
-		}
 		tg3_flag_clear(tp, JUMBO_RING_ENABLE);
 	}
 }
@@ -14119,6 +14115,14 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
 
 	tg3_set_mtu(dev, tp, new_mtu);
 
+	tg3_full_unlock(tp);
+
+	/* Adjusting MTU may add/remove TSO feature. */
+	if (tg3_flag(tp, 5780_CLASS))
+		netdev_update_features(dev);
+
+	tg3_full_lock(tp, 0);
+
 	/* Reset PHY, otherwise the read DMA engine will be in a mode that
 	 * breaks all requests to 256 bytes.
 	 */
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 49 lines · David Vrabel

5780 cards cannot have jumbo frames and TSO enabled together. When jumbo frames are enabled by setting the MTU, the TSO feature must be cleared. This is done indirectly by calling netdev_update_features() which will call tg3_fix_features() to actually clear the flags.

netdev_update_features() will also trigger a new netlink message for the feature change event which will result in a call to tg3_get_stats64() which deadlocks on the tg3 lock.

Fix this by dropping the tg3 lock while calling netdev_update_features(). This is safe as the device is down and the hardware is stopped.

---
  drivers/net/ethernet/broadcom/tg3.c |   18 +++++++++++-------
  1 files changed, 11 insertions(+), 7 deletions(-)
drivers/net/ethernet/broadcom/tg3.c +4 -7
index e2ca03e..0b344c0 100644
@@ -14077,17 +14077,13 @@ static inline void tg3_set_mtu(struct net_device *dev, struct tg3 *tp,
  	dev->mtu = new_mtu;
 
  	if (new_mtu > ETH_DATA_LEN) {
-		if (tg3_flag(tp, 5780_CLASS)) {
-			netdev_update_features(dev);
+		if (tg3_flag(tp, 5780_CLASS))
  			tg3_flag_clear(tp, TSO_CAPABLE);
-		} else {
+		else
  			tg3_flag_set(tp, JUMBO_RING_ENABLE);
-		}
  	} else {
-		if (tg3_flag(tp, 5780_CLASS)) {
+		if (tg3_flag(tp, 5780_CLASS))
  			tg3_flag_set(tp, TSO_CAPABLE);
-			netdev_update_features(dev);
-		}
  		tg3_flag_clear(tp, JUMBO_RING_ENABLE);
  	}
  }
@@ -14119,6 +14115,14 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
 
  	tg3_set_mtu(dev, tp, new_mtu);
 
+	tg3_full_unlock(tp);

drivers/net/ethernet/broadcom/tg3.c static int tg3_change_mtu(struct net_device *dev, int new_mtu) · line 14128

Quoted 10 lines
drivers/net/ethernet/broadcom/tg3.c +7 -0
+
+	/* Adjusting MTU may add/remove TSO feature. */
+	if (tg3_flag(tp, 5780_CLASS))
+		netdev_update_features(dev);
+
+	tg3_full_lock(tp, 0);
+
  	/* Reset PHY, otherwise the read DMA engine will be in a mode that
  	 * breaks all requests to 256 bytes.
  	 */

David,
Rather than doing it this way, I think it's sufficient to move the call to tg3_set_mtu() between tg3_netif_stop() and tg3_full_lock().

Before tg3 started using set_bit() for flags, tg3_set_mtu() needed to be under a lock, but that's not the case anymore.

Can you try this patch?

drivers/net/ethernet/broadcom/tg3.c +2 -2
index e2ca03e..0bb79b8 100644
@@ -14113,12 +14113,12 @@ static int tg3_change_mtu(struct net_device *dev, int new_mtu)
 
        tg3_netif_stop(tp);
 
+       tg3_set_mtu(dev, tp, new_mtu);
+
        tg3_full_lock(tp, 1);
 
        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
 
-       tg3_set_mtu(dev, tp, new_mtu);
-
        /* Reset PHY, otherwise the read DMA engine will be in a mode that
         * breaks all requests to 256 bytes.
         */

Nithin.

author Tested-by
#2 lore raw
Quoted 9 lines · Nithin Nayak Sujir

David,
Rather than doing it this way, I think it's sufficient to move the call to tg3_set_mtu() between tg3_netif_stop() and tg3_full_lock().

Before tg3 started using set_bit() for flags, tg3_set_mtu() needed to be under a lock, but that's not the case anymore.

Can you try this patch?

That looks better.

Thanks.

David

Quoted 23 lines
drivers/net/ethernet/broadcom/tg3.c +2 -2
index e2ca03e..0bb79b8 100644
@@ -14113,12 +14113,12 @@ static int tg3_change_mtu(struct net_device
 *dev, int new_mtu)
 
        tg3_netif_stop(tp);
 
+       tg3_set_mtu(dev, tp, new_mtu);
+
        tg3_full_lock(tp, 1);
 
        tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
 
-       tg3_set_mtu(dev, tp, new_mtu);
-
        /* Reset PHY, otherwise the read DMA engine will be in a mode that
         * breaks all requests to 256 bytes.
         */

Nithin.