[VLAN]: Cleaner module interface.

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 3fbf27dcc20e8d5a29fbecb67b161941a59a7d56..026cf2d5b20bd9a5f12261a433e0d30cd5182dca 100644 (file)
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -54,8 +54,8 @@ struct vlan_hdr {
 
 #define VLAN_VID_MASK  0xfff
 
-/* found in af_inet.c */
-extern int (*vlan_ioctl_hook)(unsigned long arg);
+/* found in socket.c */
+extern void vlan_ioctl_set(int (*hook)(unsigned long));
 
 #define VLAN_NAME "vlan"
 

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 4b614e9efe51115a81b6071fde4be9618e64e2ab..dca49f3d367b10b86226e3c9dd749da6580d0372 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -49,6 +49,8 @@ static char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>";
 static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>";
 
 static int vlan_device_event(struct notifier_block *, unsigned long, void *);
+static int vlan_ioctl_handler(unsigned long);
+static int unregister_vlan_dev(struct net_device *, unsigned short );
 
 struct notifier_block vlan_notifier_block = {
        .notifier_call = vlan_device_event,
@@ -100,11 +102,32 @@ static int __init vlan_proto_init(void)
        /* Register us to receive netdevice events */
        register_netdevice_notifier(&vlan_notifier_block);
 
-       vlan_ioctl_hook = vlan_ioctl_handler;
+       vlan_ioctl_set(vlan_ioctl_handler);
 
        return 0;
 }
 
+/* Cleanup all vlan devices 
+ * Note: devices that have been registered that but not
+ * brought up will exist but have no module ref count.
+ */
+static void __exit vlan_cleanup_devices(void)
+{
+       struct net_device *dev, *nxt;
+
+       rtnl_lock();
+       for (dev = dev_base; dev; dev = nxt) {
+               nxt = dev->next;
+               if (dev->priv_flags & IFF_802_1Q_VLAN) {
+                       unregister_vlan_dev(VLAN_DEV_INFO(dev)->real_dev,
+                                           VLAN_DEV_INFO(dev)->vlan_id);
+
+                       unregister_netdevice(dev);
+               }
+       }
+       rtnl_unlock();
+}
+
 /*
  *     Module 'remove' entry point.
  *     o delete /proc/net/router directory and static entries.
@@ -113,6 +136,14 @@ static void __exit vlan_cleanup_module(void)
 {
        int i;
 
+       vlan_ioctl_set(NULL);
+
+       /* Un-register us from receiving netdevice events */
+       unregister_netdevice_notifier(&vlan_notifier_block);
+
+       dev_remove_pack(&vlan_packet_type);
+       vlan_cleanup_devices();
+
        /* This table must be empty if there are no module
         * references left.
         */
@@ -120,13 +151,9 @@ static void __exit vlan_cleanup_module(void)
                if (vlan_group_hash[i] != NULL)
                        BUG();
        }
-
-       /* Un-register us from receiving netdevice events */
-       unregister_netdevice_notifier(&vlan_notifier_block);
-
-       dev_remove_pack(&vlan_packet_type);
        vlan_proc_cleanup();
-       vlan_ioctl_hook = NULL;
+
+       synchronize_net();
 }
 
 module_init(vlan_proto_init);
@@ -262,8 +289,6 @@ static int unregister_vlan_dev(struct net_device *real_dev,
 
                                ret = 1;
                        }
-
-                       module_put(THIS_MODULE);
                }
        }
 
@@ -504,12 +529,6 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
        if (register_netdevice(new_dev))
                goto out_free_newdev_priv;
 
-       /* NOTE:  We have a reference to the real device,
-        * so hold on to the reference. May fail if we are being removed
-        */
-       if (!try_module_get(THIS_MODULE))
-               goto out_free_unregister;
-
        /* So, got the sucker initialized, now lets place
         * it into our local structure.
         */
@@ -523,7 +542,7 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
        if (!grp) { /* need to add a new group */
                grp = kmalloc(sizeof(struct vlan_group), GFP_KERNEL);
                if (!grp)
-                       goto out_free_put;
+                       goto out_free_unregister;
                                        
                /* printk(KERN_ALERT "VLAN REGISTER:  Allocated new group.\n"); */
                memset(grp, 0, sizeof(struct vlan_group));
@@ -551,8 +570,6 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
        printk(VLAN_DBG "Allocated new device successfully, returning.\n");
 #endif
        return new_dev;
-out_free_put:
-       module_put(THIS_MODULE);
 
 out_free_unregister:
        unregister_netdev(new_dev);
@@ -658,7 +675,7 @@ out:
  *     o execute requested action or pass command to the device driver
  *   arg is really a void* to a vlan_ioctl_args structure.
  */
-int vlan_ioctl_handler(unsigned long arg)
+static int vlan_ioctl_handler(unsigned long arg)
 {
        int err = 0;
        struct vlan_ioctl_args args;

diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index b81d7f6b9238d07b592f3d56b46d0d0f4f57134b..540b3a90fc09290ddb2af001e3f76040c7a48343 100644 (file)
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -30,8 +30,6 @@ I'll bet they might prove useful again... --Ben
 
 extern unsigned short vlan_name_type;
 
-int vlan_ioctl_handler(unsigned long arg);
-
 #define VLAN_GRP_HASH_SHIFT    5
 #define VLAN_GRP_HASH_SIZE     (1 << VLAN_GRP_HASH_SHIFT)
 #define VLAN_GRP_HASH_MASK     (VLAN_GRP_HASH_SIZE - 1)

diff --git a/net/netsyms.c b/net/netsyms.c
index d52085580dd3c8ca9011fd89a2016198a01fe7f6..881e6ca329026c07e57ca5e3008c55e2e541b953 100644 (file)
--- a/net/netsyms.c
+++ b/net/netsyms.c
@@ -228,7 +228,7 @@ EXPORT_SYMBOL(destroy_EII_client);
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 EXPORT_SYMBOL(dev_change_flags);
 #endif
-EXPORT_SYMBOL(vlan_ioctl_hook);
+EXPORT_SYMBOL(vlan_ioctl_set);
 
 EXPORT_SYMBOL(scm_detach_fds);
 

diff --git a/net/socket.c b/net/socket.c
index 0d549c4602b5e69bdeabc27ce0eea29ae633a229..1e2d9463c34df52e67e75a7187e4d290547d4f9a 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -714,6 +714,11 @@ static ssize_t sock_writev(struct file *file, const struct iovec *vector,
 }
 
 
+/*
+ * Atomic setting of ioctl hooks to avoid race
+ * with module unload.
+ */
+
 static DECLARE_MUTEX(br_ioctl_mutex);
 static int (*br_ioctl_hook)(unsigned long arg) = NULL;
 
@@ -724,8 +729,15 @@ void brioctl_set(int (*hook)(unsigned long))
        up(&br_ioctl_mutex);
 }
 
+static DECLARE_MUTEX(vlan_ioctl_mutex);
+static int (*vlan_ioctl_hook)(unsigned long arg);
 
-int (*vlan_ioctl_hook)(unsigned long arg);
+void vlan_ioctl_set(int (*hook)(unsigned long))
+{
+       down(&vlan_ioctl_mutex);
+       vlan_ioctl_hook = hook;
+       up(&vlan_ioctl_mutex);
+}
 
 #ifdef CONFIG_DLCI
 extern int dlci_ioctl(unsigned int, void *);
@@ -789,8 +801,10 @@ static int sock_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                        if (!vlan_ioctl_hook)
                                request_module("8021q");
 #endif
+                       down(&vlan_ioctl_mutex);
                        if (vlan_ioctl_hook)
                                err = vlan_ioctl_hook(arg);
+                       up(&vlan_ioctl_mutex);
                        break;
                case SIOCGIFDIVERT:
                case SIOCSIFDIVERT: