X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=f9a037510d0d877c0355efc5e7355f854dfc6320;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=942d628cb72242e4fd914177aaad21eafd2876a0;hpb=9197df76b46ff6fbe1f7a522961730ffc55a860d;p=sliver-openvswitch.git

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 942d628cb..f9a037510 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,68 +1,104 @@
 /*
- * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
-/* Handle changes to managed devices */
-
 #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 int dp_device_event(struct notifier_block *unused, unsigned long event,
-		void *ptr)
+static void dp_detach_port_notify(struct vport *vport)
 {
-	struct net_device *dev = ptr;
-	struct vport *vport;
+	struct sk_buff *notify;
 	struct datapath *dp;
 
-	if (is_internal_dev(dev))
-		vport = internal_dev_get_vport(dev);
-	else
-		vport = netdev_get_vport(dev);
+	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;
+	}
 
-	if (!vport)
-		return NOTIFY_DONE;
+	genlmsg_multicast_netns(&dp_vport_genl_family,
+				ovs_dp_get_net(dp), notify, 0,
+				GROUP_ID(&ovs_dp_vport_multicast_group),
+				GFP_KERNEL);
+}
 
-	dp = vport->dp;
+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;
 
-	switch (event) {
-	case NETDEV_UNREGISTER:
-		if (!is_internal_dev(dev)) {
-			struct sk_buff *reply;
-
-			dp_detach_port(vport);
-			reply = ovs_vport_cmd_build_info(vport, 0, 0,
-							 OVS_VPORT_CMD_DEL);
-			if (IS_ERR(reply)) {
-				netlink_set_err(INIT_NET_GENL_SOCK, 0,
-						dp_vport_multicast_group.id,
-						PTR_ERR(reply));
-				break;
-			}
+	ovs_lock();
+	list_for_each_entry(dp, &ovs_net->dps, list_node) {
+		int i;
 
-			genl_notify(reply, dev_net(dev), 0,
-				    dp_vport_multicast_group.id, NULL,
-				    GFP_KERNEL);
-		}
-		break;
+		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;
 
-	case NETDEV_CHANGENAME:
-		if (vport->port_no != OVSP_LOCAL) {
-			dp_sysfs_del_if(vport);
-			dp_sysfs_add_if(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);
+			}
 		}
-		break;
 	}
+	ovs_unlock();
+}
+
+static int dp_device_event(struct notifier_block *unused, unsigned long event,
+			   void *ptr)
+{
+	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_netdev_get_vport(dev);
+
+	if (!vport)
+		return NOTIFY_DONE;
+
+	if (event == NETDEV_UNREGISTER) {
+		/* upper_dev_unlink and decrement promisc immediately */
+		ovs_netdev_detach_dev(vport);
+
+		/* 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;
 }
 
-struct notifier_block dp_device_notifier = {
+struct notifier_block ovs_dp_device_notifier = {
 	.notifier_call = dp_device_event
 };