NET: ASSERT_RTNL in __dev_set_promiscuity makes debug warning

[Joonwoo Park]

Hi,
dev_set_rx_mode calls __dev_set_rx_mode with softirq disabled (by netif_tx_lock_bh)
therefore __dev_set_promiscuity can be called with softirq disabled.
It will cause in_interrupt() to return true and ASSERT_RTNL warning.
Is there a good solution to fix it besides blowing ASSERT_RTNL up?

Thanks.
Joonwoo

---
diff --git a/net/core/dev.c b/net/core/dev.c
index 86d6261..6f8e72f 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2747,8 +2747,6 @@ static void __dev_set_promiscuity(struct net_device *dev, int inc)
 {
 	unsigned short old_flags = dev->flags;
 
-	ASSERT_RTNL();
-
 	if ((dev->promiscuity += inc) == 0)
 		dev->flags &= ~IFF_PROMISC;
 	else
---

message from e1000 (netdev->set_rx_mode is NULL) + vlan device mac address chage.

WARNING: at kernel/mutex.c:324 __mutex_trylock_slowpath()
Pid: 4523, comm: ifconfig Not tainted 2.6.24-rc3 #179
 [<c400544a>] show_trace_log_lvl+0x1a/0x30
 [<c4005fa2>] show_trace+0x12/0x20
 [<c400679e>] dump_stack+0x6e/0x80
 [<c43b084d>] mutex_trylock+0xcd/0x130
 [<c42dccfd>] rtnl_trylock+0xd/0x10
 [<c42d1f49>] __dev_set_promiscuity+0x19/0x130
 [<c42d20b4>] __dev_set_rx_mode+0x54/0x90
 [<c42d2151>] dev_unicast_add+0x61/0xb0
 [<c438c764>] vlan_set_mac_address+0x104/0x150
 [<c42d2ee1>] dev_set_mac_address+0x51/0x70
 [<c42d3dca>] dev_ifsioc+0x11a/0x270
 [<c42d4131>] dev_ioctl+0x211/0x510
 [<c42c699a>] sock_ioctl+0xea/0x220
 [<c408a468>] do_ioctl+0x28/0x80
 [<c408a517>] vfs_ioctl+0x57/0x280
 [<c408a779>] sys_ioctl+0x39/0x60
 [<c40043ee>] sysenter_past_esp+0x5f/0x85
 =======================

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/