Skip to content

Commit

Permalink
netdev: Do not use TX lock to protect address lists.
Browse files Browse the repository at this point in the history 
Now that we have a specific lock to protect the network
device unicast and multicast lists, remove extraneous
grabs of the TX lock in cases where the code only needs
address list protection.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 15, 2008
1 parent e308a5d commit b9e4085
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 90 deletions.
2 changes: 0 additions & 2 deletions drivers/infiniband/ulp/ipoib/ipoib_multicast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,6 @@ void ipoib_mcast_restart_task(struct work_struct *work)
ipoib_mcast_stop_thread(dev, 0);

local_irq_save(flags);
netif_tx_lock(dev);
netif_addr_lock(dev);
spin_lock(&priv->lock);

Expand Down Expand Up @@ -853,7 +852,6 @@ void ipoib_mcast_restart_task(struct work_struct *work)

spin_unlock(&priv->lock);
netif_addr_unlock(dev);
netif_tx_unlock(dev);
local_irq_restore(flags);

/* We have to cancel outside of the spinlock */
Expand Down
6 changes: 2 additions & 4 deletions drivers/media/dvb/dvb-core/dvb_net.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1133,8 +1133,7 @@ static void wq_set_multicast_list (struct work_struct *work)

dvb_net_feed_stop(dev);
priv->rx_mode = RX_MODE_UNI;
netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);

if (dev->flags & IFF_PROMISC) {
dprintk("%s: promiscuous mode\n", dev->name);
Expand All @@ -1159,8 +1158,7 @@ static void wq_set_multicast_list (struct work_struct *work)
}
}

netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
dvb_net_feed_start(dev);
}

Expand Down
24 changes: 8 additions & 16 deletions drivers/net/bonding/bond_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1567,14 +1567,12 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
goto err_close;
}

netif_tx_lock_bh(bond_dev);
netif_addr_lock(bond_dev);
netif_addr_lock_bh(bond_dev);
/* upload master's mc_list to new slave */
for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
dev_mc_add (slave_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
}
netif_addr_unlock(bond_dev);
netif_tx_unlock_bh(bond_dev);
netif_addr_unlock_bh(bond_dev);
}

if (bond->params.mode == BOND_MODE_8023AD) {
Expand Down Expand Up @@ -1938,11 +1936,9 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
}

/* flush master's mc_list from slave */
netif_tx_lock_bh(bond_dev);
netif_addr_lock(bond_dev);
netif_addr_lock_bh(bond_dev);
bond_mc_list_flush(bond_dev, slave_dev);
netif_addr_unlock(bond_dev);
netif_tx_unlock_bh(bond_dev);
netif_addr_unlock_bh(bond_dev);
}

netdev_set_master(slave_dev, NULL);
Expand Down Expand Up @@ -2063,11 +2059,9 @@ static int bond_release_all(struct net_device *bond_dev)
}

/* flush master's mc_list from slave */
netif_tx_lock_bh(bond_dev);
netif_addr_lock(bond_dev);
netif_addr_lock_bh(bond_dev);
bond_mc_list_flush(bond_dev, slave_dev);
netif_addr_unlock(bond_dev);
netif_tx_unlock_bh(bond_dev);
netif_addr_unlock_bh(bond_dev);
}

netdev_set_master(slave_dev, NULL);
Expand Down Expand Up @@ -4679,11 +4673,9 @@ static void bond_free_all(void)
struct net_device *bond_dev = bond->dev;

bond_work_cancel_all(bond);
netif_tx_lock_bh(bond_dev);
netif_addr_lock(bond_dev);
netif_addr_lock_bh(bond_dev);
bond_mc_list_destroy(bond);
netif_addr_unlock(bond_dev);
netif_tx_unlock_bh(bond_dev);
netif_addr_unlock_bh(bond_dev);
/* Release the bonded slaves */
bond_release_all(bond_dev);
bond_destroy(bond);
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/sfc/efx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,10 +696,8 @@ static void efx_stop_port(struct efx_nic *efx)

/* Serialise against efx_set_multicast_list() */
if (efx_dev_registered(efx)) {
netif_tx_lock_bh(efx->net_dev);
netif_addr_lock(efx->net_dev);
netif_addr_unlock(efx->net_dev);
netif_tx_unlock_bh(efx->net_dev);
netif_addr_lock_bh(efx->net_dev);
netif_addr_unlock_bh(efx->net_dev);
}
}

Expand Down
6 changes: 2 additions & 4 deletions drivers/net/wireless/libertas/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,7 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST))
return nr_addrs;

netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);
for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) {
if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) {
lbs_deb_net("mcast address %s:%s skipped\n", dev->name,
Expand All @@ -609,8 +608,7 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
print_mac(mac, mc_list->dmi_addr));
i++;
}
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
if (mc_list)
return -EOVERFLOW;

Expand Down
38 changes: 12 additions & 26 deletions net/core/dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2981,11 +2981,9 @@ void __dev_set_rx_mode(struct net_device *dev)

void dev_set_rx_mode(struct net_device *dev)
{
netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);
__dev_set_rx_mode(dev);
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
}

int __dev_addr_delete(struct dev_addr_list **list, int *count,
Expand Down Expand Up @@ -3063,13 +3061,11 @@ int dev_unicast_delete(struct net_device *dev, void *addr, int alen)

ASSERT_RTNL();

netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);
err = __dev_addr_delete(&dev->uc_list, &dev->uc_count, addr, alen, 0);
if (!err)
__dev_set_rx_mode(dev);
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
return err;
}
EXPORT_SYMBOL(dev_unicast_delete);
Expand All @@ -3091,13 +3087,11 @@ int dev_unicast_add(struct net_device *dev, void *addr, int alen)

ASSERT_RTNL();

netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);
err = __dev_addr_add(&dev->uc_list, &dev->uc_count, addr, alen, 0);
if (!err)
__dev_set_rx_mode(dev);
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
return err;
}
EXPORT_SYMBOL(dev_unicast_add);
Expand Down Expand Up @@ -3164,14 +3158,12 @@ int dev_unicast_sync(struct net_device *to, struct net_device *from)
{
int err = 0;

netif_tx_lock_bh(to);
netif_addr_lock(to);
netif_addr_lock_bh(to);
err = __dev_addr_sync(&to->uc_list, &to->uc_count,
&from->uc_list, &from->uc_count);
if (!err)
__dev_set_rx_mode(to);
netif_addr_unlock(to);
netif_tx_unlock_bh(to);
netif_addr_unlock_bh(to);
return err;
}
EXPORT_SYMBOL(dev_unicast_sync);
Expand All @@ -3187,19 +3179,15 @@ EXPORT_SYMBOL(dev_unicast_sync);
*/
void dev_unicast_unsync(struct net_device *to, struct net_device *from)
{
netif_tx_lock_bh(from);
netif_addr_lock(from);
netif_tx_lock_bh(to);
netif_addr_lock_bh(from);
netif_addr_lock(to);

__dev_addr_unsync(&to->uc_list, &to->uc_count,
&from->uc_list, &from->uc_count);
__dev_set_rx_mode(to);

netif_addr_unlock(to);
netif_tx_unlock_bh(to);
netif_addr_unlock(from);
netif_tx_unlock_bh(from);
netif_addr_unlock_bh(from);
}
EXPORT_SYMBOL(dev_unicast_unsync);

Expand All @@ -3219,17 +3207,15 @@ static void __dev_addr_discard(struct dev_addr_list **list)

static void dev_addr_discard(struct net_device *dev)
{
netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);

__dev_addr_discard(&dev->uc_list);
dev->uc_count = 0;

__dev_addr_discard(&dev->mc_list);
dev->mc_count = 0;

netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
}

unsigned dev_get_flags(const struct net_device *dev)
Expand Down
32 changes: 10 additions & 22 deletions net/core/dev_mcast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ int dev_mc_delete(struct net_device *dev, void *addr, int alen, int glbl)
{
int err;

netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);
err = __dev_addr_delete(&dev->mc_list, &dev->mc_count,
addr, alen, glbl);
if (!err) {
Expand All @@ -84,8 +83,7 @@ int dev_mc_delete(struct net_device *dev, void *addr, int alen, int glbl)

__dev_set_rx_mode(dev);
}
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
return err;
}

Expand All @@ -97,13 +95,11 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
{
int err;

netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);
err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl);
if (!err)
__dev_set_rx_mode(dev);
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
return err;
}

Expand All @@ -123,14 +119,12 @@ int dev_mc_sync(struct net_device *to, struct net_device *from)
{
int err = 0;

netif_tx_lock_bh(to);
netif_addr_lock(to);
netif_addr_lock_bh(to);
err = __dev_addr_sync(&to->mc_list, &to->mc_count,
&from->mc_list, &from->mc_count);
if (!err)
__dev_set_rx_mode(to);
netif_addr_unlock(to);
netif_tx_unlock_bh(to);
netif_addr_unlock_bh(to);

return err;
}
Expand All @@ -149,19 +143,15 @@ EXPORT_SYMBOL(dev_mc_sync);
*/
void dev_mc_unsync(struct net_device *to, struct net_device *from)
{
netif_tx_lock_bh(from);
netif_addr_lock(from);
netif_tx_lock_bh(to);
netif_addr_lock_bh(from);
netif_addr_lock(to);

__dev_addr_unsync(&to->mc_list, &to->mc_count,
&from->mc_list, &from->mc_count);
__dev_set_rx_mode(to);

netif_addr_unlock(to);
netif_tx_unlock_bh(to);
netif_addr_unlock(from);
netif_tx_unlock_bh(from);
netif_addr_unlock_bh(from);
}
EXPORT_SYMBOL(dev_mc_unsync);

Expand All @@ -174,8 +164,7 @@ static int dev_mc_seq_show(struct seq_file *seq, void *v)
if (v == SEQ_START_TOKEN)
return 0;

netif_tx_lock_bh(dev);
netif_addr_lock(dev);
netif_addr_lock_bh(dev);
for (m = dev->mc_list; m; m = m->next) {
int i;

Expand All @@ -187,8 +176,7 @@ static int dev_mc_seq_show(struct seq_file *seq, void *v)

seq_putc(seq, '\n');
}
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
return 0;
}

Expand Down
12 changes: 4 additions & 8 deletions net/mac80211/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,9 @@ static int ieee80211_open(struct net_device *dev)
if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS)
local->fif_other_bss++;

netif_tx_lock_bh(local->mdev);
netif_addr_lock(local->mdev);
netif_addr_lock_bh(local->mdev);
ieee80211_configure_filter(local);
netif_addr_unlock(local->mdev);
netif_tx_unlock_bh(local->mdev);
netif_addr_unlock_bh(local->mdev);
break;
case IEEE80211_IF_TYPE_STA:
case IEEE80211_IF_TYPE_IBSS:
Expand Down Expand Up @@ -492,11 +490,9 @@ static int ieee80211_stop(struct net_device *dev)
if (sdata->u.mntr_flags & MONITOR_FLAG_OTHER_BSS)
local->fif_other_bss--;

netif_tx_lock_bh(local->mdev);
netif_addr_lock(local->mdev);
netif_addr_lock_bh(local->mdev);
ieee80211_configure_filter(local);
netif_addr_unlock(local->mdev);
netif_tx_unlock_bh(local->mdev);
netif_addr_unlock_bh(local->mdev);
break;
case IEEE80211_IF_TYPE_MESH_POINT:
case IEEE80211_IF_TYPE_STA:
Expand Down
6 changes: 2 additions & 4 deletions net/mac80211/mlme.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4064,16 +4064,14 @@ static int ieee80211_sta_start_scan(struct net_device *dev,
local->scan_band = IEEE80211_BAND_2GHZ;
local->scan_dev = dev;

netif_tx_lock_bh(local->mdev);
netif_addr_lock(local->mdev);
netif_addr_lock_bh(local->mdev);
local->filter_flags |= FIF_BCN_PRBRESP_PROMISC;
local->ops->configure_filter(local_to_hw(local),
FIF_BCN_PRBRESP_PROMISC,
&local->filter_flags,
local->mdev->mc_count,
local->mdev->mc_list);
netif_addr_unlock(local->mdev);
netif_tx_unlock_bh(local->mdev);
netif_addr_unlock_bh(local->mdev);

/* TODO: start scan as soon as all nullfunc frames are ACKed */
queue_delayed_work(local->hw.workqueue, &local->scan_work,
Expand Down

0 comments on commit b9e4085

Please sign in to comment.