X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_sysfs_dp.c;h=3ecacd779a869489007260518b0dc525eac034e7;hb=a8643e447601201aabd1159966bd716e48378f97;hp=a83f5f7fddadc6f7ab1e0f58b03264b8be311465;hpb=a9a29d22d8f485bb90bb49ae9ddff8c3c1ab04f5;p=sliver-openvswitch.git

diff --git a/datapath/dp_sysfs_dp.c b/datapath/dp_sysfs_dp.c
index a83f5f7fd..3ecacd779 100644
--- a/datapath/dp_sysfs_dp.c
+++ b/datapath/dp_sysfs_dp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2011 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
@@ -55,7 +55,7 @@
 
 static struct datapath *sysfs_get_dp(struct net_device *netdev)
 {
-	struct vport *vport = internal_dev_get_vport(netdev);
+	struct vport *vport = ovs_internal_dev_get_vport(netdev);
 	return vport ? vport->dp : NULL;
 }
 /*
@@ -88,7 +88,7 @@ static ssize_t store_bridge_parm(DEVICE_PARAMS,
 		dp = sysfs_get_dp(to_net_dev(d));
 		if (dp)
 			pr_warning("%s: xxx writing dp parms not supported yet!\n",
-			       dp_name(dp));
+			       ovs_dp_name(dp));
 		else
 			result = -ENODEV;
 
@@ -106,7 +106,7 @@ static ssize_t show_forward_delay(DEVICE_PARAMS, char *buf)
 
 static void set_forward_delay(struct datapath *dp, unsigned long val)
 {
-	pr_info("%s: xxx attempt to set_forward_delay()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_forward_delay()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_forward_delay(DEVICE_PARAMS,
@@ -124,7 +124,7 @@ static ssize_t show_hello_time(DEVICE_PARAMS, char *buf)
 
 static void set_hello_time(struct datapath *dp, unsigned long val)
 {
-	pr_info("%s: xxx attempt to set_hello_time()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_hello_time()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_hello_time(DEVICE_PARAMS,
@@ -143,7 +143,7 @@ static ssize_t show_max_age(DEVICE_PARAMS, char *buf)
 
 static void set_max_age(struct datapath *dp, unsigned long val)
 {
-	pr_info("%s: xxx attempt to set_max_age()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_max_age()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_max_age(DEVICE_PARAMS,
@@ -160,7 +160,7 @@ static ssize_t show_ageing_time(DEVICE_PARAMS, char *buf)
 
 static void set_ageing_time(struct datapath *dp, unsigned long val)
 {
-	pr_info("%s: xxx attempt to set_ageing_time()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_ageing_time()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_ageing_time(DEVICE_PARAMS,
@@ -188,7 +188,7 @@ static ssize_t store_stp_state(DEVICE_PARAMS,
 
 	dp = sysfs_get_dp(to_net_dev(d));
 	if (dp)
-		pr_info("%s: xxx attempt to set_stp_state()\n", dp_name(dp));
+		pr_info("%s: xxx attempt to set_stp_state()\n", ovs_dp_name(dp));
 	else
 		result = -ENODEV;
 
@@ -206,7 +206,7 @@ static ssize_t show_priority(DEVICE_PARAMS, char *buf)
 
 static void set_priority(struct datapath *dp, unsigned long val)
 {
-	pr_info("%s: xxx attempt to set_priority()\n", dp_name(dp));
+	pr_info("%s: xxx attempt to set_priority()\n", ovs_dp_name(dp));
 }
 
 static ssize_t store_priority(DEVICE_PARAMS,
@@ -229,7 +229,7 @@ static ssize_t show_bridge_id(DEVICE_PARAMS, char *buf)
 
 	rcu_read_lock();
 
-	vport = internal_dev_get_vport(to_net_dev(d));
+	vport = ovs_internal_dev_get_vport(to_net_dev(d));
 	if (vport) {
 		const unsigned char *addr;
 
@@ -312,7 +312,7 @@ static ssize_t store_group_addr(DEVICE_PARAMS,
 	dp = sysfs_get_dp(to_net_dev(d));
 	if (dp)
 		pr_info("%s: xxx attempt to store_group_addr()\n",
-		       dp_name(dp));
+		       ovs_dp_name(dp));
 	else
 		result = -ENODEV;
 
@@ -360,17 +360,23 @@ static struct attribute_group bridge_group = {
  *   to hold links.  The ifobj exists in the same data structure
  *   as its parent the bridge so reference counting works.
  */
-int dp_sysfs_add_dp(struct datapath *dp)
+int ovs_dp_sysfs_add_dp(struct datapath *dp)
 {
-	struct vport *vport = rtnl_dereference(dp->ports[OVSP_LOCAL]);
+	struct vport *vport = ovs_vport_rtnl(dp, OVSP_LOCAL);
 	struct kobject *kobj = vport->ops->get_kobj(vport);
 	int err;
 
+#ifdef CONFIG_NET_NS
+	/* Due to bug in 2.6.32 kernel, sysfs_create_group() could panic
+	 * in other namespace than init_net. Following check is to avoid it. */
+	if (!kobj->sd)
+		return -ENOENT;
+#endif
 	/* Create /sys/class/net/<devname>/bridge directory. */
 	err = sysfs_create_group(kobj, &bridge_group);
 	if (err) {
 		pr_info("%s: can't create group %s/%s\n",
-			__func__, dp_name(dp), bridge_group.name);
+			__func__, ovs_dp_name(dp), bridge_group.name);
 		goto out1;
 	}
 
@@ -378,7 +384,7 @@ int dp_sysfs_add_dp(struct datapath *dp)
 	err = kobject_add(&dp->ifobj, kobj, SYSFS_BRIDGE_PORT_SUBDIR);
 	if (err) {
 		pr_info("%s: can't add kobject (directory) %s/%s\n",
-			__func__, dp_name(dp), kobject_name(&dp->ifobj));
+			__func__, ovs_dp_name(dp), kobject_name(&dp->ifobj));
 		goto out2;
 	}
 	kobject_uevent(&dp->ifobj, KOBJ_ADD);
@@ -390,19 +396,24 @@ int dp_sysfs_add_dp(struct datapath *dp)
 	return err;
 }
 
-int dp_sysfs_del_dp(struct datapath *dp)
+int ovs_dp_sysfs_del_dp(struct datapath *dp)
 {
-	struct vport *vport = rtnl_dereference(dp->ports[OVSP_LOCAL]);
+	struct vport *vport = ovs_vport_rtnl(dp, OVSP_LOCAL);
 	struct kobject *kobj = vport->ops->get_kobj(vport);
 
+#ifdef CONFIG_NET_NS
+	if (!kobj->sd)
+		return 0;
+#endif
+
 	kobject_del(&dp->ifobj);
 	sysfs_remove_group(kobj, &bridge_group);
 
 	return 0;
 }
 #else /* !CONFIG_SYSFS */
-int dp_sysfs_add_dp(struct datapath *dp) { return 0; }
-int dp_sysfs_del_dp(struct datapath *dp) { return 0; }
+int ovs_dp_sysfs_add_dp(struct datapath *dp) { return 0; }
+int ovs_dp_sysfs_del_dp(struct datapath *dp) { return 0; }
 int dp_sysfs_add_if(struct vport *p) { return 0; }
 int dp_sysfs_del_if(struct vport *p) { return 0; }
 #endif /* !CONFIG_SYSFS */