Setting tag sliver-openvswitch-2.2.90-1

[sliver-openvswitch.git] / datapath / dp_notify.c

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 48023a9..f9a0375 100644 (file)
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2012 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -18,52 +18,82 @@
 
 #include <linux/netdevice.h>
 #include <net/genetlink.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
 
 #include "datapath.h"
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
+static void dp_detach_port_notify(struct vport *vport)
+{
+       struct sk_buff *notify;
+       struct datapath *dp;
+
+       dp = vport->dp;
+       notify = ovs_vport_cmd_build_info(vport, 0, 0, OVS_VPORT_CMD_DEL);
+       ovs_dp_detach_port(vport);
+       if (IS_ERR(notify)) {
+               genl_set_err(&dp_vport_genl_family, ovs_dp_get_net(dp), 0,
+                            GROUP_ID(&ovs_dp_vport_multicast_group),
+                            PTR_ERR(notify));
+               return;
+       }
+
+       genlmsg_multicast_netns(&dp_vport_genl_family,
+                               ovs_dp_get_net(dp), notify, 0,
+                               GROUP_ID(&ovs_dp_vport_multicast_group),
+                               GFP_KERNEL);
+}
+
+void ovs_dp_notify_wq(struct work_struct *work)
+{
+       struct ovs_net *ovs_net = container_of(work, struct ovs_net, dp_notify_work);
+       struct datapath *dp;
+
+       ovs_lock();
+       list_for_each_entry(dp, &ovs_net->dps, list_node) {
+               int i;
+
+               for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) {
+                       struct vport *vport;
+                       struct hlist_node *n;
+
+                       hlist_for_each_entry_safe(vport, n, &dp->ports[i], dp_hash_node) {
+                               struct netdev_vport *netdev_vport;
+
+                               if (vport->ops->type != OVS_VPORT_TYPE_NETDEV)
+                                       continue;
+
+                               netdev_vport = netdev_vport_priv(vport);
+                               if (!(ovs_netdev_get_vport(netdev_vport->dev)))
+                                       dp_detach_port_notify(vport);
+                       }
+               }
+       }
+       ovs_unlock();
+}
+
 static int dp_device_event(struct notifier_block *unused, unsigned long event,
                           void *ptr)
 {
-       struct net_device *dev = ptr;
-       struct vport *vport;
+       struct ovs_net *ovs_net;
+       struct net_device *dev = netdev_notifier_info_to_dev(ptr);
+       struct vport *vport = NULL;
 
-       if (ovs_is_internal_dev(dev))
-               vport = ovs_internal_dev_get_vport(dev);
-       else
+       if (!ovs_is_internal_dev(dev))
                vport = ovs_netdev_get_vport(dev);
 
        if (!vport)
                return NOTIFY_DONE;
 
-       switch (event) {
-       case NETDEV_UNREGISTER:
-               if (!ovs_is_internal_dev(dev)) {
-                       struct sk_buff *notify;
-
-                       notify = ovs_vport_cmd_build_info(vport, 0, 0,
-                                                         OVS_VPORT_CMD_DEL);
-                       ovs_dp_detach_port(vport);
-                       if (IS_ERR(notify)) {
-                               netlink_set_err(GENL_SOCK(ovs_dp_get_net(vport->dp)), 0,
-                                               ovs_dp_vport_multicast_group.id,
-                                               PTR_ERR(notify));
-                               break;
-                       }
+       if (event == NETDEV_UNREGISTER) {
+               /* upper_dev_unlink and decrement promisc immediately */
+               ovs_netdev_detach_dev(vport);
 
-                       genlmsg_multicast_netns(ovs_dp_get_net(vport->dp), notify, 0,
-                                               ovs_dp_vport_multicast_group.id,
-                                               GFP_KERNEL);
-               }
-               break;
-
-       case NETDEV_CHANGENAME:
-               if (vport->port_no != OVSP_LOCAL) {
-                       ovs_dp_sysfs_del_if(vport);
-                       ovs_dp_sysfs_add_if(vport);
-               }
-               break;
+               /* schedule vport destroy, dev_put and genl notification */
+               ovs_net = net_generic(dev_net(dev), ovs_net_id);
+               queue_work(system_wq, &ovs_net->dp_notify_work);
        }
 
        return NOTIFY_DONE;