Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6640e673 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by David S. Miller
Browse files

ipvlan: unhash addresses without synchronize_rcu 



All structures used in traffic forwarding are rcu-protected:
ipvl_addr, ipvl_dev and ipvl_port. Thus we can unhash addresses
without synchronization. We'll anyway hash it back into the same
bucket: in worst case lockless lookup will scan hash once again.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a725497

drivers/net/ipvlan/ipvlan.h

+1 −1
Original line number Diff line number Diff line
@@ -122,5 +122,5 @@ struct ipvl_addr *ipvlan_find_addr(const struct ipvl_dev *ipvlan, 
bool ipvlan_addr_busy(struct ipvl_port *port, void *iaddr, bool is_v6);

struct ipvl_addr *ipvlan_ht_addr_lookup(const struct ipvl_port *port,

					const void *iaddr, bool is_v6);

void ipvlan_ht_addr_del(struct ipvl_addr *addr, bool sync);

void ipvlan_ht_addr_del(struct ipvl_addr *addr);

#endif /* __IPVLAN_H */

drivers/net/ipvlan/ipvlan_core.c

+1 −3
Original line number Diff line number Diff line
@@ -85,11 +85,9 @@ void ipvlan_ht_addr_add(struct ipvl_dev *ipvlan, struct ipvl_addr *addr) 
		hlist_add_head_rcu(&addr->hlnode, &port->hlhead[hash]);

}



void ipvlan_ht_addr_del(struct ipvl_addr *addr, bool sync)

void ipvlan_ht_addr_del(struct ipvl_addr *addr)

{

	hlist_del_init_rcu(&addr->hlnode);

	if (sync)

		synchronize_rcu();

}



struct ipvl_addr *ipvlan_find_addr(const struct ipvl_dev *ipvlan,

drivers/net/ipvlan/ipvlan_main.c

+4 −4
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int ipvlan_stop(struct net_device *dev) 
	dev_uc_del(phy_dev, phy_dev->dev_addr);



	list_for_each_entry(addr, &ipvlan->addrs, anode)

		ipvlan_ht_addr_del(addr, !dev->dismantle);

		ipvlan_ht_addr_del(addr);



	return 0;

}
@@ -505,7 +505,7 @@ static void ipvlan_link_delete(struct net_device *dev, struct list_head *head) 
	struct ipvl_addr *addr, *next;



	list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) {

		ipvlan_ht_addr_del(addr, !dev->dismantle);

		ipvlan_ht_addr_del(addr);

		list_del(&addr->anode);

		kfree_rcu(addr, rcu);

	}
@@ -641,7 +641,7 @@ static void ipvlan_del_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr) 
	if (!addr)

		return;



	ipvlan_ht_addr_del(addr, true);

	ipvlan_ht_addr_del(addr);

	list_del(&addr->anode);

	kfree_rcu(addr, rcu);
@@ -711,7 +711,7 @@ static void ipvlan_del_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr) 
	if (!addr)

		return;



	ipvlan_ht_addr_del(addr, true);

	ipvlan_ht_addr_del(addr);

	list_del(&addr->anode);

	kfree_rcu(addr, rcu);