evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vxlan: fix crash from work pending on module removal

Browse source 
Switch to using a per module work queue so that all the socket
deletion callbacks are done when module is removed.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2013-06-17 14:16:09 -07:00
parent b715398407
commit 758c57d16a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/vxlan.c
View file

@ -148,6 +148,7 @@ struct vxlan_dev {
/* salt for hash table */ /* salt for hash table */
static u32 vxlan_salt __read_mostly; static u32 vxlan_salt __read_mostly;
static struct workqueue_struct *vxlan_wq;
/* Virtual Network hash table head */ /* Virtual Network hash table head */
static inline struct hlist_head *vni_head(struct vxlan_sock *vs, u32 id) static inline struct hlist_head *vni_head(struct vxlan_sock *vs, u32 id)
@ -1631,7 +1632,7 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head)
if (--vs->refcnt == 0) { if (--vs->refcnt == 0) {
hlist_del_rcu(&vs->hlist); hlist_del_rcu(&vs->hlist);
schedule_work(&vs->del_work); queue_work(vxlan_wq, &vs->del_work);
} }
} }
@ -1750,6 +1751,10 @@ static int __init vxlan_init_module(void)
{ {
int rc; int rc;
vxlan_wq = alloc_workqueue("vxlan", 0, 0);
if (!vxlan_wq)
return -ENOMEM;
get_random_bytes(&vxlan_salt, sizeof(vxlan_salt)); get_random_bytes(&vxlan_salt, sizeof(vxlan_salt));
rc = register_pernet_device(&vxlan_net_ops); rc = register_pernet_device(&vxlan_net_ops);
@ -1765,6 +1770,7 @@ static int __init vxlan_init_module(void)
out2: out2:
unregister_pernet_device(&vxlan_net_ops); unregister_pernet_device(&vxlan_net_ops);
out1: out1:
destroy_workqueue(vxlan_wq);
return rc; return rc;
} }
late_initcall(vxlan_init_module); late_initcall(vxlan_init_module);
@ -1773,6 +1779,7 @@ static void __exit vxlan_cleanup_module(void)
{ {
unregister_pernet_device(&vxlan_net_ops); unregister_pernet_device(&vxlan_net_ops);
rtnl_link_unregister(&vxlan_link_ops); rtnl_link_unregister(&vxlan_link_ops);
destroy_workqueue(vxlan_wq);
rcu_barrier(); rcu_barrier();
} }
module_exit(vxlan_cleanup_module); module_exit(vxlan_cleanup_module);