GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 16:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[IPV6] ADDRCONF: Convert addrconf_lock to RCU.

Browse source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2006-09-22 14:44:24 -07:00 • committed by David S. Miller
parent fbea49e1e2
commit 8814c4b533
7 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/net/addrconf.h
View file

@ -133,20 +133,18 @@ extern int unregister_inet6addr_notifier(struct notifier_block *nb);
static inline struct inet6_dev * static inline struct inet6_dev *
__in6_dev_get(struct net_device *dev) __in6_dev_get(struct net_device *dev)
{ {
return (struct inet6_dev *)dev->ip6_ptr; return rcu_dereference(dev->ip6_ptr);
} }
extern rwlock_t addrconf_lock;
static inline struct inet6_dev * static inline struct inet6_dev *
in6_dev_get(struct net_device *dev) in6_dev_get(struct net_device *dev)
{ {
struct inet6_dev *idev = NULL; struct inet6_dev *idev = NULL;
read_lock(&addrconf_lock); rcu_read_lock();
idev = dev->ip6_ptr; idev = __in6_dev_get(dev);
if (idev) if (idev)
atomic_inc(&idev->refcnt); atomic_inc(&idev->refcnt);
read_unlock(&addrconf_lock); rcu_read_unlock();
return idev; return idev;
} }

1
include/net/if_inet6.h
View file

@ -189,6 +189,7 @@ struct inet6_dev
struct ipv6_devconf cnf; struct ipv6_devconf cnf;
struct ipv6_devstat stats; struct ipv6_devstat stats;
unsigned long tstamp; /* ipv6InterfaceTable update timestamp */ unsigned long tstamp; /* ipv6InterfaceTable update timestamp */
struct rcu_head rcu;
}; };
extern struct ipv6_devconf ipv6_devconf; extern struct ipv6_devconf ipv6_devconf;

4
net/core/pktgen.c
View file

@ -1786,7 +1786,7 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
* use ipv6_get_lladdr if/when it's get exported * use ipv6_get_lladdr if/when it's get exported
*/ */
read_lock(&addrconf_lock); rcu_read_lock();
if ((idev = __in6_dev_get(pkt_dev->odev)) != NULL) { if ((idev = __in6_dev_get(pkt_dev->odev)) != NULL) {
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
@ -1805,7 +1805,7 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
} }
read_unlock_bh(&idev->lock); read_unlock_bh(&idev->lock);
} }
read_unlock(&addrconf_lock); rcu_read_unlock();
if (err) if (err)
printk("pktgen: ERROR: IPv6 link address not availble.\n"); printk("pktgen: ERROR: IPv6 link address not availble.\n");
} }

46
net/ipv6/addrconf.c
View file

@ -119,9 +119,6 @@ static int ipv6_count_addresses(struct inet6_dev *idev);
static struct inet6_ifaddr *inet6_addr_lst[IN6_ADDR_HSIZE]; static struct inet6_ifaddr *inet6_addr_lst[IN6_ADDR_HSIZE];
static DEFINE_RWLOCK(addrconf_hash_lock); static DEFINE_RWLOCK(addrconf_hash_lock);
/* Protects inet6 devices */
DEFINE_RWLOCK(addrconf_lock);
static void addrconf_verify(unsigned long); static void addrconf_verify(unsigned long);
static DEFINE_TIMER(addr_chk_timer, addrconf_verify, 0, 0); static DEFINE_TIMER(addr_chk_timer, addrconf_verify, 0, 0);
@ -318,6 +315,12 @@ static void addrconf_mod_timer(struct inet6_ifaddr *ifp,
/* Nobody refers to this device, we may destroy it. */ /* Nobody refers to this device, we may destroy it. */
static void in6_dev_finish_destroy_rcu(struct rcu_head *head)
{
struct inet6_dev *idev = container_of(head, struct inet6_dev, rcu);
kfree(idev);
}
void in6_dev_finish_destroy(struct inet6_dev *idev) void in6_dev_finish_destroy(struct inet6_dev *idev)
{ {
struct net_device *dev = idev->dev; struct net_device *dev = idev->dev;
@ -332,7 +335,7 @@ void in6_dev_finish_destroy(struct inet6_dev *idev)
return; return;
} }
snmp6_free_dev(idev); snmp6_free_dev(idev);
kfree(idev); call_rcu(&idev->rcu, in6_dev_finish_destroy_rcu);
} }
static struct inet6_dev * ipv6_add_dev(struct net_device *dev) static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
@ -408,9 +411,8 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev)
if (netif_carrier_ok(dev)) if (netif_carrier_ok(dev))
ndev->if_flags |= IF_READY; ndev->if_flags |= IF_READY;
write_lock_bh(&addrconf_lock); /* protected by rtnl_lock */
dev->ip6_ptr = ndev; rcu_assign_pointer(dev->ip6_ptr, ndev);
write_unlock_bh(&addrconf_lock);
ipv6_mc_init_dev(ndev); ipv6_mc_init_dev(ndev);
ndev->tstamp = jiffies; ndev->tstamp = jiffies;
@ -474,7 +476,7 @@ static void addrconf_forward_change(void)
read_lock(&dev_base_lock); read_lock(&dev_base_lock);
for (dev=dev_base; dev; dev=dev->next) { for (dev=dev_base; dev; dev=dev->next) {
read_lock(&addrconf_lock); rcu_read_lock();
idev = __in6_dev_get(dev); idev = __in6_dev_get(dev);
if (idev) { if (idev) {
int changed = (!idev->cnf.forwarding) ^ (!ipv6_devconf.forwarding); int changed = (!idev->cnf.forwarding) ^ (!ipv6_devconf.forwarding);
@ -482,7 +484,7 @@ static void addrconf_forward_change(void)
if (changed) if (changed)
dev_forward_change(idev); dev_forward_change(idev);
} }
read_unlock(&addrconf_lock); rcu_read_unlock();
} }
read_unlock(&dev_base_lock); read_unlock(&dev_base_lock);
} }
@ -543,7 +545,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
int hash; int hash;
int err = 0; int err = 0;
read_lock_bh(&addrconf_lock); rcu_read_lock_bh();
if (idev->dead) { if (idev->dead) {
err = -ENODEV; /*XXX*/ err = -ENODEV; /*XXX*/
goto out2; goto out2;
@ -612,7 +614,7 @@ ipv6_add_addr(struct inet6_dev *idev, const struct in6_addr *addr, int pfxlen,
in6_ifa_hold(ifa); in6_ifa_hold(ifa);
write_unlock(&idev->lock); write_unlock(&idev->lock);
out2: out2:
read_unlock_bh(&addrconf_lock); rcu_read_unlock_bh();
if (likely(err == 0)) if (likely(err == 0))
atomic_notifier_call_chain(&inet6addr_chain, NETDEV_UP, ifa); atomic_notifier_call_chain(&inet6addr_chain, NETDEV_UP, ifa);
@ -915,7 +917,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
memset(&hiscore, 0, sizeof(hiscore)); memset(&hiscore, 0, sizeof(hiscore));
read_lock(&dev_base_lock); read_lock(&dev_base_lock);
read_lock(&addrconf_lock); rcu_read_lock();
for (dev = dev_base; dev; dev=dev->next) { for (dev = dev_base; dev; dev=dev->next) {
struct inet6_dev *idev; struct inet6_dev *idev;
@ -1127,7 +1129,7 @@ record_it:
} }
read_unlock_bh(&idev->lock); read_unlock_bh(&idev->lock);
} }
read_unlock(&addrconf_lock); rcu_read_unlock();
read_unlock(&dev_base_lock); read_unlock(&dev_base_lock);
if (!ifa_result) if (!ifa_result)
@ -1151,7 +1153,7 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr)
struct inet6_dev *idev; struct inet6_dev *idev;
int err = -EADDRNOTAVAIL; int err = -EADDRNOTAVAIL;
read_lock(&addrconf_lock); rcu_read_lock();
if ((idev = __in6_dev_get(dev)) != NULL) { if ((idev = __in6_dev_get(dev)) != NULL) {
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
@ -1165,7 +1167,7 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr)
} }
read_unlock_bh(&idev->lock); read_unlock_bh(&idev->lock);
} }
read_unlock(&addrconf_lock); rcu_read_unlock();
return err; return err;
} }
@ -1466,7 +1468,7 @@ static void ipv6_regen_rndid(unsigned long data)
struct inet6_dev *idev = (struct inet6_dev *) data; struct inet6_dev *idev = (struct inet6_dev *) data;
unsigned long expires; unsigned long expires;
read_lock_bh(&addrconf_lock); rcu_read_lock_bh();
write_lock_bh(&idev->lock); write_lock_bh(&idev->lock);
if (idev->dead) if (idev->dead)
@ -1490,7 +1492,7 @@ static void ipv6_regen_rndid(unsigned long data)
out: out:
write_unlock_bh(&idev->lock); write_unlock_bh(&idev->lock);
read_unlock_bh(&addrconf_lock); rcu_read_unlock_bh();
in6_dev_put(idev); in6_dev_put(idev);
} }
@ -2342,10 +2344,10 @@ static int addrconf_ifdown(struct net_device *dev, int how)
Do not dev_put! Do not dev_put!
*/ */
if (how == 1) { if (how == 1) {
write_lock_bh(&addrconf_lock);
dev->ip6_ptr = NULL;
idev->dead = 1; idev->dead = 1;
write_unlock_bh(&addrconf_lock);
/* protected by rtnl_lock */
rcu_assign_pointer(dev->ip6_ptr, NULL);
/* Step 1.5: remove snmp6 entry */ /* Step 1.5: remove snmp6 entry */
snmp6_unregister_dev(idev); snmp6_unregister_dev(idev);
@ -3573,10 +3575,10 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp) static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
{ {
read_lock_bh(&addrconf_lock); rcu_read_lock_bh();
if (likely(ifp->idev->dead == 0)) if (likely(ifp->idev->dead == 0))
__ipv6_ifa_notify(event, ifp); __ipv6_ifa_notify(event, ifp);
read_unlock_bh(&addrconf_lock); rcu_read_unlock_bh();
} }
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL

4
net/ipv6/anycast.c
View file

@ -56,7 +56,7 @@ ip6_onlink(struct in6_addr *addr, struct net_device *dev)
int onlink; int onlink;
onlink = 0; onlink = 0;
read_lock(&addrconf_lock); rcu_read_lock();
idev = __in6_dev_get(dev); idev = __in6_dev_get(dev);
if (idev) { if (idev) {
read_lock_bh(&idev->lock); read_lock_bh(&idev->lock);
@ -68,7 +68,7 @@ ip6_onlink(struct in6_addr *addr, struct net_device *dev)
} }
read_unlock_bh(&idev->lock); read_unlock_bh(&idev->lock);
} }
read_unlock(&addrconf_lock); rcu_read_unlock();
return onlink; return onlink;
} }

1
net/ipv6/ipv6_syms.c
View file

@ -14,7 +14,6 @@ EXPORT_SYMBOL(ndisc_mc_map);
EXPORT_SYMBOL(register_inet6addr_notifier); EXPORT_SYMBOL(register_inet6addr_notifier);
EXPORT_SYMBOL(unregister_inet6addr_notifier); EXPORT_SYMBOL(unregister_inet6addr_notifier);
EXPORT_SYMBOL(ip6_route_output); EXPORT_SYMBOL(ip6_route_output);
EXPORT_SYMBOL(addrconf_lock);
EXPORT_SYMBOL(ipv6_setsockopt); EXPORT_SYMBOL(ipv6_setsockopt);
EXPORT_SYMBOL(ipv6_getsockopt); EXPORT_SYMBOL(ipv6_getsockopt);
EXPORT_SYMBOL(inet6_register_protosw); EXPORT_SYMBOL(inet6_register_protosw);

6
net/sctp/ipv6.c
View file

@ -321,9 +321,9 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
struct sctp_sockaddr_entry *addr; struct sctp_sockaddr_entry *addr;
read_lock(&addrconf_lock); rcu_read_lock();
if ((in6_dev = __in6_dev_get(dev)) == NULL) { if ((in6_dev = __in6_dev_get(dev)) == NULL) {
read_unlock(&addrconf_lock); rcu_read_unlock();
return; return;
} }
@ -342,7 +342,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
} }
read_unlock(&in6_dev->lock); read_unlock(&in6_dev->lock);
read_unlock(&addrconf_lock); rcu_read_unlock();
} }
/* Initialize a sockaddr_storage from in incoming skb. */ /* Initialize a sockaddr_storage from in incoming skb. */