hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: bonding: constify and use dev_addr_set() 

Commit 406f42fa0d ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it go through appropriate helpers.

Make sure local references to netdev->dev_addr are constant.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2021-10-22 16:20:59 -07:00 committed by David S. Miller
parent 86466cbed1
commit 6f238100d0
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/bonding/bond_alb.c
View File

@ -50,7 +50,7 @@ struct arp_pkt {
#pragma pack() #pragma pack()
/* Forward declaration */ /* Forward declaration */
static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[], static void alb_send_learning_packets(struct slave *slave, const u8 mac_addr[],
bool strict_match); bool strict_match);
static void rlb_purge_src_ip(struct bonding *bond, struct arp_pkt *arp); static void rlb_purge_src_ip(struct bonding *bond, struct arp_pkt *arp);
static void rlb_src_unlink(struct bonding *bond, u32 index); static void rlb_src_unlink(struct bonding *bond, u32 index);
@ -353,7 +353,8 @@ static struct slave *rlb_next_rx_slave(struct bonding *bond)
* *
* Caller must hold RTNL * Caller must hold RTNL
*/ */
static void rlb_teach_disabled_mac_on_primary(struct bonding *bond, u8 addr[]) static void rlb_teach_disabled_mac_on_primary(struct bonding *bond,
const u8 addr[])
{ {
struct slave *curr_active = rtnl_dereference(bond->curr_active_slave); struct slave *curr_active = rtnl_dereference(bond->curr_active_slave);
@ -904,7 +905,7 @@ static void rlb_clear_vlan(struct bonding *bond, unsigned short vlan_id)
/*********************** tlb/rlb shared functions *********************/ /*********************** tlb/rlb shared functions *********************/
static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[], static void alb_send_lp_vid(struct slave *slave, const u8 mac_addr[],
__be16 vlan_proto, u16 vid) __be16 vlan_proto, u16 vid)
{ {
struct learning_pkt pkt; struct learning_pkt pkt;
@ -940,7 +941,7 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],
struct alb_walk_data { struct alb_walk_data {
struct bonding *bond; struct bonding *bond;
struct slave *slave; struct slave *slave;
u8 *mac_addr; const u8 *mac_addr;
bool strict_match; bool strict_match;
}; };
@ -949,9 +950,9 @@ static int alb_upper_dev_walk(struct net_device *upper,
{ {
struct alb_walk_data *data = (struct alb_walk_data *)priv->data; struct alb_walk_data *data = (struct alb_walk_data *)priv->data;
bool strict_match = data->strict_match; bool strict_match = data->strict_match;
const u8 *mac_addr = data->mac_addr;
struct bonding *bond = data->bond; struct bonding *bond = data->bond;
struct slave *slave = data->slave; struct slave *slave = data->slave;
u8 *mac_addr = data->mac_addr;
struct bond_vlan_tag *tags; struct bond_vlan_tag *tags;
if (is_vlan_dev(upper) && if (is_vlan_dev(upper) &&
@ -982,7 +983,7 @@ static int alb_upper_dev_walk(struct net_device *upper,
return 0; return 0;
} }
static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[], static void alb_send_learning_packets(struct slave *slave, const u8 mac_addr[],
bool strict_match) bool strict_match)
{ {
struct bonding *bond = bond_get_bond_by_slave(slave); struct bonding *bond = bond_get_bond_by_slave(slave);
@ -1006,14 +1007,14 @@ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[],
rcu_read_unlock(); rcu_read_unlock();
} }
static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], static int alb_set_slave_mac_addr(struct slave *slave, const u8 addr[],
unsigned int len) unsigned int len)
{ {
struct net_device *dev = slave->dev; struct net_device *dev = slave->dev;
struct sockaddr_storage ss; struct sockaddr_storage ss;
if (BOND_MODE(slave->bond) == BOND_MODE_TLB) { if (BOND_MODE(slave->bond) == BOND_MODE_TLB) {
memcpy(dev->dev_addr, addr, len); __dev_addr_set(dev, addr, len);
return 0; return 0;
} }
@ -1242,8 +1243,7 @@ static int alb_set_mac_address(struct bonding *bond, void *addr)
res = dev_set_mac_address(slave->dev, addr, NULL); res = dev_set_mac_address(slave->dev, addr, NULL);
/* restore net_device's hw address */ /* restore net_device's hw address */
bond_hw_addr_copy(slave->dev->dev_addr, tmp_addr, dev_addr_set(slave->dev, tmp_addr);
slave->dev->addr_len);
if (res) if (res)
goto unwind; goto unwind;
@ -1263,8 +1263,7 @@ unwind:
rollback_slave->dev->addr_len); rollback_slave->dev->addr_len);
dev_set_mac_address(rollback_slave->dev, dev_set_mac_address(rollback_slave->dev,
(struct sockaddr *)&ss, NULL); (struct sockaddr *)&ss, NULL);
bond_hw_addr_copy(rollback_slave->dev->dev_addr, tmp_addr, dev_addr_set(rollback_slave->dev, tmp_addr);
rollback_slave->dev->addr_len);
} }
return res; return res;
@ -1727,8 +1726,7 @@ void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave
dev_set_mac_address(new_slave->dev, (struct sockaddr *)&ss, dev_set_mac_address(new_slave->dev, (struct sockaddr *)&ss,
NULL); NULL);
bond_hw_addr_copy(new_slave->dev->dev_addr, tmp_addr, dev_addr_set(new_slave->dev, tmp_addr);
new_slave->dev->addr_len);
} }
/* curr_active_slave must be set before calling alb_swap_mac_addr */ /* curr_active_slave must be set before calling alb_swap_mac_addr */
@ -1761,7 +1759,7 @@ int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
if (res) if (res)
return res; return res;
bond_hw_addr_copy(bond_dev->dev_addr, ss->__data, bond_dev->addr_len); dev_addr_set(bond_dev, ss->__data);
/* If there is no curr_active_slave there is nothing else to do. /* If there is no curr_active_slave there is nothing else to do.
* Otherwise we'll need to pass the new address to it and handle * Otherwise we'll need to pass the new address to it and handle

2
drivers/net/bonding/bond_main.c
View File

@ -923,7 +923,7 @@ static int bond_set_dev_addr(struct net_device *bond_dev,
if (err) if (err)
return err; return err;
memcpy(bond_dev->dev_addr, slave_dev->dev_addr, slave_dev->addr_len); __dev_addr_set(bond_dev, slave_dev->dev_addr, slave_dev->addr_len);
bond_dev->addr_assign_type = NET_ADDR_STOLEN; bond_dev->addr_assign_type = NET_ADDR_STOLEN;
call_netdevice_notifiers(NETDEV_CHANGEADDR, bond_dev); call_netdevice_notifiers(NETDEV_CHANGEADDR, bond_dev);
return 0; return 0;