net: convert unicast addr list
This patch converts unicast address list to standard list_head using previously introduced struct netdev_hw_addr. It also relaxes the locking. Original spinlock (still used for multicast addresses) is not needed and is no longer used for a protection of this list. All reading and writing takes place under rtnl (with no changes). I also removed a possibility to specify the length of the address while adding or deleting unicast address. It's always dev->addr_len. The convertion touched especially e1000 and ixgbe codes when the change is not so trivial. Signed-off-by: Jiri Pirko <jpirko@redhat.com> drivers/net/bnx2.c | 13 +-- drivers/net/e1000/e1000_main.c | 24 +++-- drivers/net/ixgbe/ixgbe_common.c | 14 ++-- drivers/net/ixgbe/ixgbe_common.h | 4 +- drivers/net/ixgbe/ixgbe_main.c | 6 +- drivers/net/ixgbe/ixgbe_type.h | 4 +- drivers/net/macvlan.c | 11 +- drivers/net/mv643xx_eth.c | 11 +- drivers/net/niu.c | 7 +- drivers/net/virtio_net.c | 7 +- drivers/s390/net/qeth_l2_main.c | 6 +- drivers/scsi/fcoe/fcoe.c | 16 ++-- include/linux/netdevice.h | 18 ++-- net/8021q/vlan.c | 4 +- net/8021q/vlan_dev.c | 10 +- net/core/dev.c | 195 +++++++++++++++++++++++++++----------- net/dsa/slave.c | 10 +- net/packet/af_packet.c | 4 +- 18 files changed, 227 insertions(+), 137 deletions(-) Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko
committed by
David S. Miller
David S. Miller
parent
ae63e808f5
commit
ccffad25b5
195
net/core/dev.c
195
net/core/dev.c
@ -3473,8 +3473,9 @@ void dev_set_rx_mode(struct net_device *dev)
|
||||
|
||||
/* hw addresses list handling functions */
|
||||
|
||||
static int __hw_addr_add(struct list_head *list, unsigned char *addr,
|
||||
int addr_len, unsigned char addr_type)
|
||||
static int __hw_addr_add(struct list_head *list, int *delta,
|
||||
unsigned char *addr, int addr_len,
|
||||
unsigned char addr_type)
|
||||
{
|
||||
struct netdev_hw_addr *ha;
|
||||
int alloc_size;
|
||||
@ -3482,6 +3483,15 @@ static int __hw_addr_add(struct list_head *list, unsigned char *addr,
|
||||
if (addr_len > MAX_ADDR_LEN)
|
||||
return -EINVAL;
|
||||
|
||||
list_for_each_entry(ha, list, list) {
|
||||
if (!memcmp(ha->addr, addr, addr_len) &&
|
||||
ha->type == addr_type) {
|
||||
ha->refcount++;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
alloc_size = sizeof(*ha);
|
||||
if (alloc_size < L1_CACHE_BYTES)
|
||||
alloc_size = L1_CACHE_BYTES;
|
||||
@ -3490,7 +3500,11 @@ static int __hw_addr_add(struct list_head *list, unsigned char *addr,
|
||||
return -ENOMEM;
|
||||
memcpy(ha->addr, addr, addr_len);
|
||||
ha->type = addr_type;
|
||||
ha->refcount = 1;
|
||||
ha->synced = false;
|
||||
list_add_tail_rcu(&ha->list, list);
|
||||
if (delta)
|
||||
(*delta)++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -3502,29 +3516,30 @@ static void ha_rcu_free(struct rcu_head *head)
|
||||
kfree(ha);
|
||||
}
|
||||
|
||||
static int __hw_addr_del_ii(struct list_head *list, unsigned char *addr,
|
||||
int addr_len, unsigned char addr_type,
|
||||
int ignore_index)
|
||||
static int __hw_addr_del(struct list_head *list, int *delta,
|
||||
unsigned char *addr, int addr_len,
|
||||
unsigned char addr_type)
|
||||
{
|
||||
struct netdev_hw_addr *ha;
|
||||
int i = 0;
|
||||
|
||||
list_for_each_entry(ha, list, list) {
|
||||
if (i++ != ignore_index &&
|
||||
!memcmp(ha->addr, addr, addr_len) &&
|
||||
if (!memcmp(ha->addr, addr, addr_len) &&
|
||||
(ha->type == addr_type || !addr_type)) {
|
||||
if (--ha->refcount)
|
||||
return 0;
|
||||
list_del_rcu(&ha->list);
|
||||
call_rcu(&ha->rcu_head, ha_rcu_free);
|
||||
if (delta)
|
||||
(*delta)--;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
static int __hw_addr_add_multiple_ii(struct list_head *to_list,
|
||||
struct list_head *from_list,
|
||||
int addr_len, unsigned char addr_type,
|
||||
int ignore_index)
|
||||
static int __hw_addr_add_multiple(struct list_head *to_list, int *to_delta,
|
||||
struct list_head *from_list, int addr_len,
|
||||
unsigned char addr_type)
|
||||
{
|
||||
int err;
|
||||
struct netdev_hw_addr *ha, *ha2;
|
||||
@ -3532,7 +3547,8 @@ static int __hw_addr_add_multiple_ii(struct list_head *to_list,
|
||||
|
||||
list_for_each_entry(ha, from_list, list) {
|
||||
type = addr_type ? addr_type : ha->type;
|
||||
err = __hw_addr_add(to_list, ha->addr, addr_len, type);
|
||||
err = __hw_addr_add(to_list, to_delta, ha->addr,
|
||||
addr_len, type);
|
||||
if (err)
|
||||
goto unroll;
|
||||
}
|
||||
@ -3543,27 +3559,69 @@ unroll:
|
||||
if (ha2 == ha)
|
||||
break;
|
||||
type = addr_type ? addr_type : ha2->type;
|
||||
__hw_addr_del_ii(to_list, ha2->addr, addr_len, type,
|
||||
ignore_index);
|
||||
__hw_addr_del(to_list, to_delta, ha2->addr,
|
||||
addr_len, type);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __hw_addr_del_multiple_ii(struct list_head *to_list,
|
||||
struct list_head *from_list,
|
||||
int addr_len, unsigned char addr_type,
|
||||
int ignore_index)
|
||||
static void __hw_addr_del_multiple(struct list_head *to_list, int *to_delta,
|
||||
struct list_head *from_list, int addr_len,
|
||||
unsigned char addr_type)
|
||||
{
|
||||
struct netdev_hw_addr *ha;
|
||||
unsigned char type;
|
||||
|
||||
list_for_each_entry(ha, from_list, list) {
|
||||
type = addr_type ? addr_type : ha->type;
|
||||
__hw_addr_del_ii(to_list, ha->addr, addr_len, addr_type,
|
||||
ignore_index);
|
||||
__hw_addr_del(to_list, to_delta, ha->addr,
|
||||
addr_len, addr_type);
|
||||
}
|
||||
}
|
||||
|
||||
static int __hw_addr_sync(struct list_head *to_list, int *to_delta,
|
||||
struct list_head *from_list, int *from_delta,
|
||||
int addr_len)
|
||||
{
|
||||
int err = 0;
|
||||
struct netdev_hw_addr *ha, *tmp;
|
||||
|
||||
list_for_each_entry_safe(ha, tmp, from_list, list) {
|
||||
if (!ha->synced) {
|
||||
err = __hw_addr_add(to_list, to_delta, ha->addr,
|
||||
addr_len, ha->type);
|
||||
if (err)
|
||||
break;
|
||||
ha->synced = true;
|
||||
ha->refcount++;
|
||||
} else if (ha->refcount == 1) {
|
||||
__hw_addr_del(to_list, to_delta, ha->addr,
|
||||
addr_len, ha->type);
|
||||
__hw_addr_del(from_list, from_delta, ha->addr,
|
||||
addr_len, ha->type);
|
||||
}
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __hw_addr_unsync(struct list_head *to_list, int *to_delta,
|
||||
struct list_head *from_list, int *from_delta,
|
||||
int addr_len)
|
||||
{
|
||||
struct netdev_hw_addr *ha, *tmp;
|
||||
|
||||
list_for_each_entry_safe(ha, tmp, from_list, list) {
|
||||
if (ha->synced) {
|
||||
__hw_addr_del(to_list, to_delta, ha->addr,
|
||||
addr_len, ha->type);
|
||||
ha->synced = false;
|
||||
__hw_addr_del(from_list, from_delta, ha->addr,
|
||||
addr_len, ha->type);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void __hw_addr_flush(struct list_head *list)
|
||||
{
|
||||
struct netdev_hw_addr *ha, *tmp;
|
||||
@ -3594,7 +3652,7 @@ static int dev_addr_init(struct net_device *dev)
|
||||
|
||||
INIT_LIST_HEAD(&dev->dev_addr_list);
|
||||
memset(addr, 0, sizeof(*addr));
|
||||
err = __hw_addr_add(&dev->dev_addr_list, addr, sizeof(*addr),
|
||||
err = __hw_addr_add(&dev->dev_addr_list, NULL, addr, sizeof(*addr),
|
||||
NETDEV_HW_ADDR_T_LAN);
|
||||
if (!err) {
|
||||
/*
|
||||
@ -3626,7 +3684,7 @@ int dev_addr_add(struct net_device *dev, unsigned char *addr,
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
err = __hw_addr_add(&dev->dev_addr_list, addr, dev->addr_len,
|
||||
err = __hw_addr_add(&dev->dev_addr_list, NULL, addr, dev->addr_len,
|
||||
addr_type);
|
||||
if (!err)
|
||||
call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
|
||||
@ -3649,11 +3707,20 @@ int dev_addr_del(struct net_device *dev, unsigned char *addr,
|
||||
unsigned char addr_type)
|
||||
{
|
||||
int err;
|
||||
struct netdev_hw_addr *ha;
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
err = __hw_addr_del_ii(&dev->dev_addr_list, addr, dev->addr_len,
|
||||
addr_type, 0);
|
||||
/*
|
||||
* We can not remove the first address from the list because
|
||||
* dev->dev_addr points to that.
|
||||
*/
|
||||
ha = list_first_entry(&dev->dev_addr_list, struct netdev_hw_addr, list);
|
||||
if (ha->addr == dev->dev_addr && ha->refcount == 1)
|
||||
return -ENOENT;
|
||||
|
||||
err = __hw_addr_del(&dev->dev_addr_list, NULL, addr, dev->addr_len,
|
||||
addr_type);
|
||||
if (!err)
|
||||
call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
|
||||
return err;
|
||||
@ -3680,9 +3747,9 @@ int dev_addr_add_multiple(struct net_device *to_dev,
|
||||
|
||||
if (from_dev->addr_len != to_dev->addr_len)
|
||||
return -EINVAL;
|
||||
err = __hw_addr_add_multiple_ii(&to_dev->dev_addr_list,
|
||||
&from_dev->dev_addr_list,
|
||||
to_dev->addr_len, addr_type, 0);
|
||||
err = __hw_addr_add_multiple(&to_dev->dev_addr_list, NULL,
|
||||
&from_dev->dev_addr_list,
|
||||
to_dev->addr_len, addr_type);
|
||||
if (!err)
|
||||
call_netdevice_notifiers(NETDEV_CHANGEADDR, to_dev);
|
||||
return err;
|
||||
@ -3707,9 +3774,9 @@ int dev_addr_del_multiple(struct net_device *to_dev,
|
||||
|
||||
if (from_dev->addr_len != to_dev->addr_len)
|
||||
return -EINVAL;
|
||||
__hw_addr_del_multiple_ii(&to_dev->dev_addr_list,
|
||||
&from_dev->dev_addr_list,
|
||||
to_dev->addr_len, addr_type, 0);
|
||||
__hw_addr_del_multiple(&to_dev->dev_addr_list, NULL,
|
||||
&from_dev->dev_addr_list,
|
||||
to_dev->addr_len, addr_type);
|
||||
call_netdevice_notifiers(NETDEV_CHANGEADDR, to_dev);
|
||||
return 0;
|
||||
}
|
||||
@ -3779,24 +3846,22 @@ int __dev_addr_add(struct dev_addr_list **list, int *count,
|
||||
* dev_unicast_delete - Release secondary unicast address.
|
||||
* @dev: device
|
||||
* @addr: address to delete
|
||||
* @alen: length of @addr
|
||||
*
|
||||
* Release reference to a secondary unicast address and remove it
|
||||
* from the device if the reference count drops to zero.
|
||||
*
|
||||
* The caller must hold the rtnl_mutex.
|
||||
*/
|
||||
int dev_unicast_delete(struct net_device *dev, void *addr, int alen)
|
||||
int dev_unicast_delete(struct net_device *dev, void *addr)
|
||||
{
|
||||
int err;
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
netif_addr_lock_bh(dev);
|
||||
err = __dev_addr_delete(&dev->uc_list, &dev->uc_count, addr, alen, 0);
|
||||
err = __hw_addr_del(&dev->uc_list, &dev->uc_count, addr,
|
||||
dev->addr_len, NETDEV_HW_ADDR_T_UNICAST);
|
||||
if (!err)
|
||||
__dev_set_rx_mode(dev);
|
||||
netif_addr_unlock_bh(dev);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(dev_unicast_delete);
|
||||
@ -3805,24 +3870,22 @@ EXPORT_SYMBOL(dev_unicast_delete);
|
||||
* dev_unicast_add - add a secondary unicast address
|
||||
* @dev: device
|
||||
* @addr: address to add
|
||||
* @alen: length of @addr
|
||||
*
|
||||
* Add a secondary unicast address to the device or increase
|
||||
* the reference count if it already exists.
|
||||
*
|
||||
* The caller must hold the rtnl_mutex.
|
||||
*/
|
||||
int dev_unicast_add(struct net_device *dev, void *addr, int alen)
|
||||
int dev_unicast_add(struct net_device *dev, void *addr)
|
||||
{
|
||||
int err;
|
||||
|
||||
ASSERT_RTNL();
|
||||
|
||||
netif_addr_lock_bh(dev);
|
||||
err = __dev_addr_add(&dev->uc_list, &dev->uc_count, addr, alen, 0);
|
||||
err = __hw_addr_add(&dev->uc_list, &dev->uc_count, addr,
|
||||
dev->addr_len, NETDEV_HW_ADDR_T_UNICAST);
|
||||
if (!err)
|
||||
__dev_set_rx_mode(dev);
|
||||
netif_addr_unlock_bh(dev);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(dev_unicast_add);
|
||||
@ -3879,8 +3942,7 @@ void __dev_addr_unsync(struct dev_addr_list **to, int *to_count,
|
||||
* @from: source device
|
||||
*
|
||||
* Add newly added addresses to the destination device and release
|
||||
* addresses that have no users left. The source device must be
|
||||
* locked by netif_tx_lock_bh.
|
||||
* addresses that have no users left.
|
||||
*
|
||||
* This function is intended to be called from the dev->set_rx_mode
|
||||
* function of layered software devices.
|
||||
@ -3889,12 +3951,15 @@ int dev_unicast_sync(struct net_device *to, struct net_device *from)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
netif_addr_lock_bh(to);
|
||||
err = __dev_addr_sync(&to->uc_list, &to->uc_count,
|
||||
&from->uc_list, &from->uc_count);
|
||||
ASSERT_RTNL();
|
||||
|
||||
if (to->addr_len != from->addr_len)
|
||||
return -EINVAL;
|
||||
|
||||
err = __hw_addr_sync(&to->uc_list, &to->uc_count,
|
||||
&from->uc_list, &from->uc_count, to->addr_len);
|
||||
if (!err)
|
||||
__dev_set_rx_mode(to);
|
||||
netif_addr_unlock_bh(to);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(dev_unicast_sync);
|
||||
@ -3910,18 +3975,33 @@ EXPORT_SYMBOL(dev_unicast_sync);
|
||||
*/
|
||||
void dev_unicast_unsync(struct net_device *to, struct net_device *from)
|
||||
{
|
||||
netif_addr_lock_bh(from);
|
||||
netif_addr_lock(to);
|
||||
ASSERT_RTNL();
|
||||
|
||||
__dev_addr_unsync(&to->uc_list, &to->uc_count,
|
||||
&from->uc_list, &from->uc_count);
|
||||
if (to->addr_len != from->addr_len)
|
||||
return;
|
||||
|
||||
__hw_addr_unsync(&to->uc_list, &to->uc_count,
|
||||
&from->uc_list, &from->uc_count, to->addr_len);
|
||||
__dev_set_rx_mode(to);
|
||||
|
||||
netif_addr_unlock(to);
|
||||
netif_addr_unlock_bh(from);
|
||||
}
|
||||
EXPORT_SYMBOL(dev_unicast_unsync);
|
||||
|
||||
static void dev_unicast_flush(struct net_device *dev)
|
||||
{
|
||||
/* rtnl_mutex must be held here */
|
||||
|
||||
__hw_addr_flush(&dev->uc_list);
|
||||
dev->uc_count = 0;
|
||||
}
|
||||
|
||||
static void dev_unicast_init(struct net_device *dev)
|
||||
{
|
||||
/* rtnl_mutex must be held here */
|
||||
|
||||
INIT_LIST_HEAD(&dev->uc_list);
|
||||
}
|
||||
|
||||
|
||||
static void __dev_addr_discard(struct dev_addr_list **list)
|
||||
{
|
||||
struct dev_addr_list *tmp;
|
||||
@ -3940,9 +4020,6 @@ static void dev_addr_discard(struct net_device *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;
|
||||
|
||||
@ -4535,6 +4612,7 @@ static void rollback_registered(struct net_device *dev)
|
||||
/*
|
||||
* Flush the unicast and multicast chains
|
||||
*/
|
||||
dev_unicast_flush(dev);
|
||||
dev_addr_discard(dev);
|
||||
|
||||
if (dev->netdev_ops->ndo_uninit)
|
||||
@ -5020,6 +5098,8 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
|
||||
if (dev_addr_init(dev))
|
||||
goto free_tx;
|
||||
|
||||
dev_unicast_init(dev);
|
||||
|
||||
dev_net_set(dev, &init_net);
|
||||
|
||||
dev->_tx = tx;
|
||||
@ -5223,6 +5303,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
|
||||
/*
|
||||
* Flush the unicast and multicast chains
|
||||
*/
|
||||
dev_unicast_flush(dev);
|
||||
dev_addr_discard(dev);
|
||||
|
||||
netdev_unregister_kobject(dev);
|
||||
|
||||
Reference in New Issue
Block a user