UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipvlan: do not use rcu operations for address list 

All accesses to ipvlan->addrs are under rtnl.

Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Benc 2015-03-28 19:13:24 +01:00 committed by David S. Miller
parent 2afa650ce2
commit 40891e8ad6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ipvlan/ipvlan_main.c
View File

@ -505,7 +505,7 @@ static void ipvlan_link_delete(struct net_device *dev, struct list_head *head)
if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) { if (ipvlan->ipv6cnt > 0 || ipvlan->ipv4cnt > 0) {
list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) { list_for_each_entry_safe(addr, next, &ipvlan->addrs, anode) {
ipvlan_ht_addr_del(addr, !dev->dismantle); ipvlan_ht_addr_del(addr, !dev->dismantle);
list_del_rcu(&addr->anode); list_del(&addr->anode);
} }
} }
list_del_rcu(&ipvlan->pnode); list_del_rcu(&ipvlan->pnode);
@ -620,7 +620,7 @@ static int ipvlan_add_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
addr->master = ipvlan; addr->master = ipvlan;
memcpy(&addr->ip6addr, ip6_addr, sizeof(struct in6_addr)); memcpy(&addr->ip6addr, ip6_addr, sizeof(struct in6_addr));
addr->atype = IPVL_IPV6; addr->atype = IPVL_IPV6;
list_add_tail_rcu(&addr->anode, &ipvlan->addrs); list_add_tail(&addr->anode, &ipvlan->addrs);
ipvlan->ipv6cnt++; ipvlan->ipv6cnt++;
/* If the interface is not up, the address will be added to the hash /* If the interface is not up, the address will be added to the hash
* list by ipvlan_open. * list by ipvlan_open.
@ -640,7 +640,7 @@ static void ipvlan_del_addr6(struct ipvl_dev *ipvlan, struct in6_addr *ip6_addr)
return; return;
ipvlan_ht_addr_del(addr, true); ipvlan_ht_addr_del(addr, true);
list_del_rcu(&addr->anode); list_del(&addr->anode);
ipvlan->ipv6cnt--; ipvlan->ipv6cnt--;
WARN_ON(ipvlan->ipv6cnt < 0); WARN_ON(ipvlan->ipv6cnt < 0);
kfree_rcu(addr, rcu); kfree_rcu(addr, rcu);
@ -692,7 +692,7 @@ static int ipvlan_add_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
addr->master = ipvlan; addr->master = ipvlan;
memcpy(&addr->ip4addr, ip4_addr, sizeof(struct in_addr)); memcpy(&addr->ip4addr, ip4_addr, sizeof(struct in_addr));
addr->atype = IPVL_IPV4; addr->atype = IPVL_IPV4;
list_add_tail_rcu(&addr->anode, &ipvlan->addrs); list_add_tail(&addr->anode, &ipvlan->addrs);
ipvlan->ipv4cnt++; ipvlan->ipv4cnt++;
/* If the interface is not up, the address will be added to the hash /* If the interface is not up, the address will be added to the hash
* list by ipvlan_open. * list by ipvlan_open.
@ -713,7 +713,7 @@ static void ipvlan_del_addr4(struct ipvl_dev *ipvlan, struct in_addr *ip4_addr)
return; return;
ipvlan_ht_addr_del(addr, true); ipvlan_ht_addr_del(addr, true);
list_del_rcu(&addr->anode); list_del(&addr->anode);
ipvlan->ipv4cnt--; ipvlan->ipv4cnt--;
WARN_ON(ipvlan->ipv4cnt < 0); WARN_ON(ipvlan->ipv4cnt < 0);
if (!ipvlan->ipv4cnt) if (!ipvlan->ipv4cnt)